Attachment 347185 Details for Bug 188604 – Patch

[patch] Patch

bug-188604-20180815114930.patch (text/plain), 9.05 KB, created by Alex Christensen on 2018-08-15 11:49:31 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Christensen

Created: 2018-08-15 11:49:31 PDT

Size: 9.05 KB

patch

obsolete

>Index: Source/WebCore/ChangeLog
>===================================================================
>--- Source/WebCore/ChangeLog	(revision 234890)
>+++ Source/WebCore/ChangeLog	(working copy)
>@@ -1,3 +1,19 @@
>+2018-08-15  Alex Christensen  <achristensen@webkit.org>
>+
>+        Remove unused subresourceIntegrityEnabled setting/preference
>+        https://bugs.webkit.org/show_bug.cgi?id=188604
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * dom/ScriptElement.cpp:
>+        (WebCore::ScriptElement::requestClassicScript):
>+        (WebCore::ScriptElement::requestModuleScript):
>+        * html/HTMLLinkElement.cpp:
>+        (WebCore::HTMLLinkElement::process):
>+        * html/HTMLLinkElement.idl:
>+        * html/HTMLScriptElement.idl:
>+        * page/Settings.yaml:
>+
> 2018-08-15  Alex Christensen  <achristensen@webkit.org>
> 
>         Remove failing assertion introduced in r234873
>Index: Source/WebCore/dom/ScriptElement.cpp
>===================================================================
>--- Source/WebCore/dom/ScriptElement.cpp	(revision 234881)
>+++ Source/WebCore/dom/ScriptElement.cpp	(working copy)
>@@ -283,7 +283,7 @@ bool ScriptElement::requestClassicScript
>     if (!stripLeadingAndTrailingHTMLSpaces(sourceURL).isEmpty()) {
>         auto script = LoadableClassicScript::create(
>             m_element.attributeWithoutSynchronization(HTMLNames::nonceAttr),
>-            m_element.document().settings().subresourceIntegrityEnabled() ? m_element.attributeWithoutSynchronization(HTMLNames::integrityAttr).string() : emptyString(),
>+            m_element.attributeWithoutSynchronization(HTMLNames::integrityAttr).string(),
>             m_element.attributeWithoutSynchronization(HTMLNames::crossoriginAttr),
>             scriptCharset(),
>             m_element.localName(),
>@@ -334,7 +334,7 @@ bool ScriptElement::requestModuleScript(
>         m_isExternalScript = true;
>         auto script = LoadableModuleScript::create(
>             nonce,
>-            m_element.document().settings().subresourceIntegrityEnabled() ? m_element.attributeWithoutSynchronization(HTMLNames::integrityAttr).string() : emptyString(),
>+            m_element.attributeWithoutSynchronization(HTMLNames::integrityAttr).string(),
>             crossOriginMode,
>             scriptCharset(),
>             m_element.localName(),
>Index: Source/WebCore/html/HTMLLinkElement.cpp
>===================================================================
>--- Source/WebCore/html/HTMLLinkElement.cpp	(revision 234881)
>+++ Source/WebCore/html/HTMLLinkElement.cpp	(working copy)
>@@ -306,8 +306,7 @@ void HTMLLinkElement::process()
>         if (!isActive)
>             priority = ResourceLoadPriority::VeryLow;
> 
>-        if (document().settings().subresourceIntegrityEnabled())
>-            m_integrityMetadataForPendingSheetRequest = attributeWithoutSynchronization(HTMLNames::integrityAttr);
>+        m_integrityMetadataForPendingSheetRequest = attributeWithoutSynchronization(HTMLNames::integrityAttr);
> 
>         ResourceLoaderOptions options = CachedResourceLoader::defaultCachedResourceOptions();
>         options.sameOriginDataURLFlag = SameOriginDataURLFlag::Set;
>Index: Source/WebCore/html/HTMLLinkElement.idl
>===================================================================
>--- Source/WebCore/html/HTMLLinkElement.idl	(revision 234881)
>+++ Source/WebCore/html/HTMLLinkElement.idl	(working copy)
>@@ -42,6 +42,6 @@
>     [PutForwards=value] readonly attribute DOMTokenList relList;
> 
>     [Reflect] attribute DOMString nonce;
>-    [Reflect, EnabledBySetting=SubresourceIntegrity] attribute DOMString integrity;
>+    [Reflect] attribute DOMString integrity;
> };
> 
>Index: Source/WebCore/html/HTMLScriptElement.idl
>===================================================================
>--- Source/WebCore/html/HTMLScriptElement.idl	(revision 234881)
>+++ Source/WebCore/html/HTMLScriptElement.idl	(working copy)
>@@ -30,5 +30,5 @@ interface HTMLScriptElement : HTMLElemen
>     attribute DOMString? crossOrigin;
>     [Reflect] attribute DOMString nonce;
>     [Reflect] attribute boolean noModule;
>-    [Reflect, EnabledBySetting=SubresourceIntegrity] attribute DOMString integrity;
>+    [Reflect] attribute DOMString integrity;
> };
>Index: Source/WebCore/page/Settings.yaml
>===================================================================
>--- Source/WebCore/page/Settings.yaml	(revision 234881)
>+++ Source/WebCore/page/Settings.yaml	(working copy)
>@@ -583,9 +583,6 @@ shouldSuppressTextInputFromEditingDuring
> langAttributeAwareFormControlUIEnabled:
>   initial: false
> 
>-subresourceIntegrityEnabled:
>-  initial: true
>-
> linkPreconnectEnabled:
>   initial: false
> 
>Index: Source/WebKit/ChangeLog
>===================================================================
>--- Source/WebKit/ChangeLog	(revision 234891)
>+++ Source/WebKit/ChangeLog	(working copy)
>@@ -1,3 +1,12 @@
>+2018-08-15  Alex Christensen  <achristensen@webkit.org>
>+
>+        Remove unused subresourceIntegrityEnabled setting/preference
>+        https://bugs.webkit.org/show_bug.cgi?id=188604
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * Shared/WebPreferences.yaml:
>+
> 2018-08-15  Michael Catanzaro  <mcatanzaro@igalia.com>
> 
>         [WPE][GTK] WaylandCompositor fails to properly remove surface from its page map
>Index: Source/WebKit/Shared/WebPreferences.yaml
>===================================================================
>--- Source/WebKit/Shared/WebPreferences.yaml	(revision 234881)
>+++ Source/WebKit/Shared/WebPreferences.yaml	(working copy)
>@@ -1053,10 +1053,6 @@ CrossOriginWindowPolicySupportEnabled:
>   type: bool
>   defaultValue: false
> 
>-SubresourceIntegrityEnabled:
>-  type: bool
>-  defaultValue: true
>-
> RestrictedHTTPResponseAccess:
>   type: bool
>   defaultValue: true
>Index: Tools/WebKitTestRunner/TestController.cpp
>===================================================================
>--- Tools/WebKitTestRunner/TestController.cpp	(revision 234881)
>+++ Tools/WebKitTestRunner/TestController.cpp	(working copy)
>@@ -757,7 +757,6 @@ void TestController::resetPreferencesToC
>     WKPreferencesSetMediaPreloadingEnabled(preferences, true);
>     WKPreferencesSetMediaPlaybackAllowsInline(preferences, true);
>     WKPreferencesSetInlineMediaPlaybackRequiresPlaysInlineAttribute(preferences, false);
>-    WKPreferencesSetBeaconAPIEnabled(preferences, true);
>     WKPreferencesSetDirectoryUploadEnabled(preferences, true);
> 
>     WKCookieManagerDeleteAllCookies(WKContextGetCookieManager(m_context.get()));
>Index: LayoutTests/ChangeLog
>===================================================================
>--- LayoutTests/ChangeLog	(revision 234891)
>+++ LayoutTests/ChangeLog	(working copy)
>@@ -1,3 +1,14 @@
>+2018-08-15  Alex Christensen  <achristensen@webkit.org>
>+
>+        Remove unused subresourceIntegrityEnabled setting/preference
>+        https://bugs.webkit.org/show_bug.cgi?id=188604
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * http/tests/subresource-integrity/sri-disabled-with-setting.html: Removed.
>+        We don't need to test what happens when subresource integrity is disabled any more.
>+        It's enabled everywhere.
>+
> 2018-08-15  Per Arne Vollan  <pvollan@apple.com>
> 
>         Layout Test editing/input/press-tab-during-ime-composition.html is failing
>Index: LayoutTests/http/tests/subresource-integrity/sri-disabled-with-setting.html
>===================================================================
>--- LayoutTests/http/tests/subresource-integrity/sri-disabled-with-setting.html	(revision 234881)
>+++ LayoutTests/http/tests/subresource-integrity/sri-disabled-with-setting.html	(nonexistent)
>@@ -1,49 +0,0 @@
>-<!DOCTYPE html>
>-<html>
>-<head>
>-    <meta charset="utf-8">
>-    <script>
>-        if (window.internals)
>-            window.internals.settings.setSubresourceIntegrityEnabled(false);
>-    </script>
>-    <script src="/js-test-resources/testharness.js"></script>
>-    <script src="/js-test-resources/testharnessreport.js"></script>
>-    <script src="resources/sri-utilities.js"></script>
>-</head>
>-<body>
>-    <div id="log"></div>
>-    <div id="container"></div>
>-<script>
>-
>-test(function() {
>-    var linkElement = document.createElement("link");
>-    assert_false("integrity" in linkElement, "integrity", "The 'integrity' property is not exposed on the link element.");
>-}, "Test that Subresource Integrity's 'integrity' property is not exposed on the <link> element.");
>-
>-test(function() {
>-    var scriptElement = document.createElement("script");
>-    assert_false("integrity" in scriptElement, "The 'integrity' property is not exposed on the script element.");
>-    
>-}, "Test that Subresource Integrity's 'integrity' property is not exposed on the <script> element.");
>-
>-new SRIScriptTest(
>-    true,
>-    "Same-origin with incorrect hash, but should evaluate successfully due to Subresource Integrity being disabled.",
>-    "resources/non-matching-digest.js",
>-    "sha256-deadbeefdeadbeefdeadbeefdeadbeefdeadbeefdead"
>-);
>-
>-new SRIStyleTest(
>-    true,
>-    "Same-origin with incorrect hash, but should evaluate successfully due to Subresource Integrity being disabled.",
>-    {
>-        href: "resources/style.css",
>-        integrity: "sha256-deadbeefdeadbeefdeadbeefdeadbeefdeadbeefdead"
>-    }
>-);
>-
>-SRITests.execute();
>-
>-</script>
>-</body>
>-</html>

Flags:

achristensen: review-
ews-watchlist: commit-queue-

Actions: View | Formatted Diff | Diff

Attachments on bug 188604: 347165 | 347167 | 347174 | 347176 | 347179 | 347181 | 347185 | 347197 | 347200 | 347202 | 347208