Skip to content

GitLab

T
tangled
Commit 16f81534 authored by Ehsan Karamad's avatar Ehsan Karamad Committed by Commit Bot
Browse files
Options

Rename Feature Policy: document-stream-insertion 

It was proposed here https://github.com/WICG/feature-policy/pull/172
that "document-write" is a better name for this feature. This CL makes
the naming change correspondingly.

Bug: 841605
Change-Id: Id0a928fd3f6669eb3700736ff5770d4717d2b414
Reviewed-on: https://chromium-review.googlesource.com/1095328
Commit-Queue: Ehsan Karamad <ekaramad@chromium.org>
Reviewed-by: default avatarIan Clelland <iclelland@chromium.org>
Reviewed-by: default avatarKent Tamura <tkent@chromium.org>
Reviewed-by: default avatarNasko Oskov <nasko@chromium.org>
Cr-Commit-Position: refs/heads/master@{#566829}
parent 12669c48
Hide whitespace changes
Inline Side-by-side
Showing with 69 additions and 71 deletions
content/browser/frame_host/render_frame_host_feature_policy_unittest.cc
View file @ 16f81534
...@@ -30,7 +30,7 @@ class RenderFrameHostFeaturePolicyTest ...@@ -30,7 +30,7 @@ class RenderFrameHostFeaturePolicyTest
static constexpr const char* kOrigin4 = "https://test.com"; static constexpr const char* kOrigin4 = "https://test.com";
static const blink::mojom::FeaturePolicyFeature kDefaultEnabledFeature = static const blink::mojom::FeaturePolicyFeature kDefaultEnabledFeature =
blink::mojom::FeaturePolicyFeature::kDocumentStreamInsertion; blink::mojom::FeaturePolicyFeature::kDocumentWrite;
static const blink::mojom::FeaturePolicyFeature kDefaultSelfFeature = static const blink::mojom::FeaturePolicyFeature kDefaultSelfFeature =
blink::mojom::FeaturePolicyFeature::kGeolocation; blink::mojom::FeaturePolicyFeature::kGeolocation;
......
third_party/WebKit/LayoutTests/external/wpt/feature-policy/experimental-features/document-stream-insertion.tentative.html → third_party/WebKit/LayoutTests/external/wpt/feature-policy/experimental-features/document-write.tentative.html
View file @ 16f81534
<!doctype html> <!doctype html>
<title>'document-stream-insertion' tests</title> <title>'document-write' tests</title>
<script src="/resources/testharness.js"></script> <script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script> <script src="/resources/testharnessreport.js"></script>
<script src="/feature-policy/experimental-features/resources/common.js"></script> <script src="/feature-policy/experimental-features/resources/common.js"></script>
...@@ -14,7 +14,7 @@ html, body { ...@@ -14,7 +14,7 @@ html, body {
"use strict"; "use strict";
let iframeElement = document.querySelector("iframe"); let iframeElement = document.querySelector("iframe");
let url = url_base + "document-stream-insertion.html"; let url = url_base + "document-write.html";
let text_to_write = "<div>FOO<\/div>"; let text_to_write = "<div>FOO<\/div>";
let test_cases = [{ let test_cases = [{
...@@ -38,7 +38,7 @@ html, body { ...@@ -38,7 +38,7 @@ html, body {
expected_value_enabled: "FOO" expected_value_enabled: "FOO"
}]; }];
// The feature 'document-stream-insertion' is enabled by default and when it // The feature 'document-write' is enabled by default and when it
// is enabled, all dynamic markup insertion API work as intended. // is enabled, all dynamic markup insertion API work as intended.
test_cases.forEach((tc) => { test_cases.forEach((tc) => {
promise_test(async() => { promise_test(async() => {
...@@ -59,10 +59,10 @@ html, body { ...@@ -59,10 +59,10 @@ html, body {
}); });
// Disabling 'document-stream-insertion' throws exception on the included API. // Disabling 'document-write' throws exception on the included API.
test_cases.forEach((tc) => { test_cases.forEach((tc) => {
promise_test(async() => { promise_test(async() => {
setFeatureState(iframeElement, "document-stream-insertion", "'none'"); setFeatureState(iframeElement, "document-write", "'none'");
await loadUrlInIframe(iframeElement, url); await loadUrlInIframe(iframeElement, url);
await sendMessageAndGetResponse(iframeElement.contentWindow, tc).then((response) => { await sendMessageAndGetResponse(iframeElement.contentWindow, tc).then((response) => {
assert_true( assert_true(
......
third_party/blink/common/feature_policy/feature_policy.cc
View file @ 16f81534
...@@ -251,64 +251,63 @@ void FeaturePolicy::AddContainerPolicy( ...@@ -251,64 +251,63 @@ void FeaturePolicy::AddContainerPolicy(
// See third_party/blink/public/common/feature_policy/feature_policy.h for // See third_party/blink/public/common/feature_policy/feature_policy.h for
// status of each feature (in spec, implemented, etc). // status of each feature (in spec, implemented, etc).
const FeaturePolicy::FeatureList& FeaturePolicy::GetDefaultFeatureList() { const FeaturePolicy::FeatureList& FeaturePolicy::GetDefaultFeatureList() {
CR_DEFINE_STATIC_LOCAL( CR_DEFINE_STATIC_LOCAL(FeatureList, default_feature_list,
FeatureList, default_feature_list, ({{mojom::FeaturePolicyFeature::kAccelerometer,
({{mojom::FeaturePolicyFeature::kAccelerometer, FeaturePolicy::FeatureDefault::EnableForSelf},
FeaturePolicy::FeatureDefault::EnableForSelf}, {mojom::FeaturePolicyFeature::kAccessibilityEvents,
{mojom::FeaturePolicyFeature::kAccessibilityEvents, FeaturePolicy::FeatureDefault::EnableForSelf},
FeaturePolicy::FeatureDefault::EnableForSelf}, {mojom::FeaturePolicyFeature::kAmbientLightSensor,
{mojom::FeaturePolicyFeature::kAmbientLightSensor, FeaturePolicy::FeatureDefault::EnableForSelf},
FeaturePolicy::FeatureDefault::EnableForSelf}, {mojom::FeaturePolicyFeature::kAnimations,
{mojom::FeaturePolicyFeature::kAnimations, FeaturePolicy::FeatureDefault::EnableForAll},
FeaturePolicy::FeatureDefault::EnableForAll}, {mojom::FeaturePolicyFeature::kAutoplay,
{mojom::FeaturePolicyFeature::kAutoplay, FeaturePolicy::FeatureDefault::EnableForSelf},
FeaturePolicy::FeatureDefault::EnableForSelf}, {mojom::FeaturePolicyFeature::kCamera,
{mojom::FeaturePolicyFeature::kCamera, FeaturePolicy::FeatureDefault::EnableForSelf},
FeaturePolicy::FeatureDefault::EnableForSelf}, {mojom::FeaturePolicyFeature::kDocumentCookie,
{mojom::FeaturePolicyFeature::kDocumentCookie, FeaturePolicy::FeatureDefault::EnableForAll},
FeaturePolicy::FeatureDefault::EnableForAll}, {mojom::FeaturePolicyFeature::kDocumentDomain,
{mojom::FeaturePolicyFeature::kDocumentDomain, FeaturePolicy::FeatureDefault::EnableForAll},
FeaturePolicy::FeatureDefault::EnableForAll}, {mojom::FeaturePolicyFeature::kDocumentWrite,
{mojom::FeaturePolicyFeature::kDocumentStreamInsertion, FeaturePolicy::FeatureDefault::EnableForAll},
FeaturePolicy::FeatureDefault::EnableForAll}, {mojom::FeaturePolicyFeature::kEncryptedMedia,
{mojom::FeaturePolicyFeature::kEncryptedMedia, FeaturePolicy::FeatureDefault::EnableForSelf},
FeaturePolicy::FeatureDefault::EnableForSelf}, {mojom::FeaturePolicyFeature::kFullscreen,
{mojom::FeaturePolicyFeature::kFullscreen, FeaturePolicy::FeatureDefault::EnableForSelf},
FeaturePolicy::FeatureDefault::EnableForSelf}, {mojom::FeaturePolicyFeature::kGeolocation,
{mojom::FeaturePolicyFeature::kGeolocation, FeaturePolicy::FeatureDefault::EnableForSelf},
FeaturePolicy::FeatureDefault::EnableForSelf}, {mojom::FeaturePolicyFeature::kGyroscope,
{mojom::FeaturePolicyFeature::kGyroscope, FeaturePolicy::FeatureDefault::EnableForSelf},
FeaturePolicy::FeatureDefault::EnableForSelf}, {mojom::FeaturePolicyFeature::kImageCompression,
{mojom::FeaturePolicyFeature::kImageCompression, FeaturePolicy::FeatureDefault::EnableForAll},
FeaturePolicy::FeatureDefault::EnableForAll}, {mojom::FeaturePolicyFeature::kLegacyImageFormats,
{mojom::FeaturePolicyFeature::kLegacyImageFormats, FeaturePolicy::FeatureDefault::EnableForAll},
FeaturePolicy::FeatureDefault::EnableForAll}, {mojom::FeaturePolicyFeature::kMagnetometer,
{mojom::FeaturePolicyFeature::kMagnetometer, FeaturePolicy::FeatureDefault::EnableForSelf},
FeaturePolicy::FeatureDefault::EnableForSelf}, {mojom::FeaturePolicyFeature::kMaxDownscalingImage,
{mojom::FeaturePolicyFeature::kMaxDownscalingImage, FeaturePolicy::FeatureDefault::EnableForAll},
FeaturePolicy::FeatureDefault::EnableForAll}, {mojom::FeaturePolicyFeature::kMicrophone,
{mojom::FeaturePolicyFeature::kMicrophone, FeaturePolicy::FeatureDefault::EnableForSelf},
FeaturePolicy::FeatureDefault::EnableForSelf}, {mojom::FeaturePolicyFeature::kMidiFeature,
{mojom::FeaturePolicyFeature::kMidiFeature, FeaturePolicy::FeatureDefault::EnableForSelf},
FeaturePolicy::FeatureDefault::EnableForSelf}, {mojom::FeaturePolicyFeature::kPayment,
{mojom::FeaturePolicyFeature::kPayment, FeaturePolicy::FeatureDefault::EnableForSelf},
FeaturePolicy::FeatureDefault::EnableForSelf}, {mojom::FeaturePolicyFeature::kPictureInPicture,
{mojom::FeaturePolicyFeature::kPictureInPicture, FeaturePolicy::FeatureDefault::EnableForAll},
FeaturePolicy::FeatureDefault::EnableForAll}, {mojom::FeaturePolicyFeature::kSpeaker,
{mojom::FeaturePolicyFeature::kSpeaker, FeaturePolicy::FeatureDefault::EnableForSelf},
FeaturePolicy::FeatureDefault::EnableForSelf}, {mojom::FeaturePolicyFeature::kSyncScript,
{mojom::FeaturePolicyFeature::kSyncScript, FeaturePolicy::FeatureDefault::EnableForAll},
FeaturePolicy::FeatureDefault::EnableForAll}, {mojom::FeaturePolicyFeature::kSyncXHR,
{mojom::FeaturePolicyFeature::kSyncXHR, FeaturePolicy::FeatureDefault::EnableForAll},
FeaturePolicy::FeatureDefault::EnableForAll}, {mojom::FeaturePolicyFeature::kUnsizedMedia,
{mojom::FeaturePolicyFeature::kUnsizedMedia, FeaturePolicy::FeatureDefault::EnableForAll},
FeaturePolicy::FeatureDefault::EnableForAll}, {mojom::FeaturePolicyFeature::kUsb,
{mojom::FeaturePolicyFeature::kUsb, FeaturePolicy::FeatureDefault::EnableForSelf},
FeaturePolicy::FeatureDefault::EnableForSelf}, {mojom::FeaturePolicyFeature::kVerticalScroll,
{mojom::FeaturePolicyFeature::kVerticalScroll, FeaturePolicy::FeatureDefault::EnableForAll},
FeaturePolicy::FeatureDefault::EnableForAll}, {mojom::FeaturePolicyFeature::kWebVr,
{mojom::FeaturePolicyFeature::kWebVr, FeaturePolicy::FeatureDefault::EnableForSelf}}));
FeaturePolicy::FeatureDefault::EnableForSelf}}));
return default_feature_list; return default_feature_list;
} }
......
third_party/blink/public/mojom/feature_policy/feature_policy.mojom
View file @ 16f81534
...@@ -94,7 +94,7 @@ enum FeaturePolicyFeature { ...@@ -94,7 +94,7 @@ enum FeaturePolicyFeature {
// Controls the ability of the document to use several dynamic markup API // Controls the ability of the document to use several dynamic markup API
// which interfere with document's input stream (document.write(), // which interfere with document's input stream (document.write(),
// document.close(), etc.). // document.close(), etc.).
kDocumentStreamInsertion, kDocumentWrite,
}; };
// This struct holds feature policy whitelist data that needs to be replicated // This struct holds feature policy whitelist data that needs to be replicated
......
third_party/blink/renderer/core/dom/document.cc
View file @ 16f81534
...@@ -6106,8 +6106,8 @@ bool Document::AllowedToUseDynamicMarkUpInsertion( ...@@ -6106,8 +6106,8 @@ bool Document::AllowedToUseDynamicMarkUpInsertion(
if (!RuntimeEnabledFeatures::ExperimentalProductivityFeaturesEnabled()) { if (!RuntimeEnabledFeatures::ExperimentalProductivityFeaturesEnabled()) {
return true; return true;
} }
if (!frame_ || frame_->IsFeatureEnabled( if (!frame_ ||
mojom::FeaturePolicyFeature::kDocumentStreamInsertion)) { frame_->IsFeatureEnabled(mojom::FeaturePolicyFeature::kDocumentWrite)) {
return true; return true;
} }
...@@ -6120,7 +6120,7 @@ bool Document::AllowedToUseDynamicMarkUpInsertion( ...@@ -6120,7 +6120,7 @@ bool Document::AllowedToUseDynamicMarkUpInsertion(
String::Format( String::Format(
"The use of method '%s' has been blocked by feature policy. The " "The use of method '%s' has been blocked by feature policy. The "
"feature " "feature "
"'document-stream-insertion' is disabled in this document.", "'document-write' is disabled in this document.",
api_name)); api_name));
return false; return false;
} }
......
third_party/blink/renderer/platform/feature_policy/feature_policy.cc
View file @ 16f81534
...@@ -172,9 +172,8 @@ const FeatureNameMap& GetDefaultFeatureNameMap() { ...@@ -172,9 +172,8 @@ const FeatureNameMap& GetDefaultFeatureNameMap() {
"picture-in-picture", mojom::FeaturePolicyFeature::kPictureInPicture); "picture-in-picture", mojom::FeaturePolicyFeature::kPictureInPicture);
} }
if (RuntimeEnabledFeatures::ExperimentalProductivityFeaturesEnabled()) { if (RuntimeEnabledFeatures::ExperimentalProductivityFeaturesEnabled()) {
default_feature_name_map.Set( default_feature_name_map.Set("document-write",
"document-stream-insertion", mojom::FeaturePolicyFeature::kDocumentWrite);
mojom::FeaturePolicyFeature::kDocumentStreamInsertion);
default_feature_name_map.Set( default_feature_name_map.Set(
"image-compression", mojom::FeaturePolicyFeature::kImageCompression); "image-compression", mojom::FeaturePolicyFeature::kImageCompression);
default_feature_name_map.Set( default_feature_name_map.Set(
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment