Title: [267311] trunk/Source
Revision
267311
Author
wei...@apple.com
Date
2020-09-19 07:20:18 -0700 (Sat, 19 Sep 2020)

Log Message

Remove runtime setting for enabling/disabling the CrossOriginResourcePolicy API
https://bugs.webkit.org/show_bug.cgi?id=216561

Reviewed by Darin Adler.

Remove runtime setting for enabling/disabling CrossOriginResourcePolicy. It has been
enabled by default for a while and there are no known reasons one would need to
disable it.

Source/WebCore:

* page/RuntimeEnabledFeatures.h:
(WebCore::RuntimeEnabledFeatures::setCrossOriginResourcePolicyEnabled): Deleted.
(WebCore::RuntimeEnabledFeatures::crossOriginResourcePolicyEnabled const): Deleted.

Source/WebKit:

* Shared/WebPreferences.yaml:
* UIProcess/API/C/WKPreferences.cpp:
(WKPreferencesSetCrossOriginResourcePolicyEnabled):
(WKPreferencesGetCrossOriginResourcePolicyEnabled):
* UIProcess/API/C/WKPreferencesRef.h:
* WebProcess/Network/WebLoaderStrategy.cpp:
(WebKit::WebLoaderStrategy::scheduleLoadFromNetworkProcess):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (267310 => 267311)


--- trunk/Source/WebCore/ChangeLog	2020-09-19 12:54:52 UTC (rev 267310)
+++ trunk/Source/WebCore/ChangeLog	2020-09-19 14:20:18 UTC (rev 267311)
@@ -1,3 +1,18 @@
+2020-09-19  Sam Weinig  <wei...@apple.com>
+
+        Remove runtime setting for enabling/disabling the CrossOriginResourcePolicy API
+        https://bugs.webkit.org/show_bug.cgi?id=216561
+
+        Reviewed by Darin Adler.
+
+        Remove runtime setting for enabling/disabling CrossOriginResourcePolicy. It has been
+        enabled by default for a while and there are no known reasons one would need to
+        disable it.
+
+        * page/RuntimeEnabledFeatures.h:
+        (WebCore::RuntimeEnabledFeatures::setCrossOriginResourcePolicyEnabled): Deleted.
+        (WebCore::RuntimeEnabledFeatures::crossOriginResourcePolicyEnabled const): Deleted.
+
 2020-09-19  Simon Fraser  <simon.fra...@apple.com>
 
         ASSERTION FAILED: &formattingContextRoot == m_rootContainer.get() in WebCore::Layout::LayoutState::establishedInlineFormattingState

Modified: trunk/Source/WebCore/page/RuntimeEnabledFeatures.h (267310 => 267311)


--- trunk/Source/WebCore/page/RuntimeEnabledFeatures.h	2020-09-19 12:54:52 UTC (rev 267310)
+++ trunk/Source/WebCore/page/RuntimeEnabledFeatures.h	2020-09-19 14:20:18 UTC (rev 267311)
@@ -105,9 +105,6 @@
     void setRestrictedHTTPResponseAccess(bool isEnabled) { m_isRestrictedHTTPResponseAccess = isEnabled; }
     bool restrictedHTTPResponseAccess() const { return m_isRestrictedHTTPResponseAccess; }
 
-    void setCrossOriginResourcePolicyEnabled(bool isEnabled) { m_crossOriginResourcePolicyEnabled = isEnabled; }
-    bool crossOriginResourcePolicyEnabled() const { return m_crossOriginResourcePolicyEnabled; }
-
     void setServerTimingEnabled(bool isEnabled) { m_isServerTimingEnabled = isEnabled; }
     bool serverTimingEnabled() const { return m_isServerTimingEnabled; }
 
@@ -294,7 +291,6 @@
     bool m_ariaReflectionEnabled { true };
     bool m_itpDebugMode { false };
     bool m_isRestrictedHTTPResponseAccess { true };
-    bool m_crossOriginResourcePolicyEnabled { true };
     bool m_isServerTimingEnabled { false };
     bool m_experimentalPlugInSandboxProfilesEnabled { false };
     bool m_attrStyleEnabled { false };

Modified: trunk/Source/WebKit/ChangeLog (267310 => 267311)


--- trunk/Source/WebKit/ChangeLog	2020-09-19 12:54:52 UTC (rev 267310)
+++ trunk/Source/WebKit/ChangeLog	2020-09-19 14:20:18 UTC (rev 267311)
@@ -1,3 +1,22 @@
+2020-09-19  Sam Weinig  <wei...@apple.com>
+
+        Remove runtime setting for enabling/disabling the CrossOriginResourcePolicy API
+        https://bugs.webkit.org/show_bug.cgi?id=216561
+
+        Reviewed by Darin Adler.
+
+        Remove runtime setting for enabling/disabling CrossOriginResourcePolicy. It has been
+        enabled by default for a while and there are no known reasons one would need to
+        disable it.
+
+        * Shared/WebPreferences.yaml:
+        * UIProcess/API/C/WKPreferences.cpp:
+        (WKPreferencesSetCrossOriginResourcePolicyEnabled):
+        (WKPreferencesGetCrossOriginResourcePolicyEnabled):
+        * UIProcess/API/C/WKPreferencesRef.h:
+        * WebProcess/Network/WebLoaderStrategy.cpp:
+        (WebKit::WebLoaderStrategy::scheduleLoadFromNetworkProcess):
+
 2020-09-18  Wenson Hsieh  <wenson_hs...@apple.com>
 
         [macOS] REGRESSION (r265702): System Services receive 0 bytes when extracting selected content as rich text data

Modified: trunk/Source/WebKit/Shared/WebPreferences.yaml (267310 => 267311)


--- trunk/Source/WebKit/Shared/WebPreferences.yaml	2020-09-19 12:54:52 UTC (rev 267310)
+++ trunk/Source/WebKit/Shared/WebPreferences.yaml	2020-09-19 14:20:18 UTC (rev 267311)
@@ -923,11 +923,6 @@
   type: bool
   defaultValue: true
 
-CrossOriginResourcePolicyEnabled:
-  type: bool
-  defaultValue: true
-  webcoreBinding: RuntimeEnabledFeatures
-
 DisabledAdaptationsMetaTagEnabled:
   type: bool
   defaultValue: DISABLED_ADAPTATIONS_META_TAG_ENABLED

Modified: trunk/Source/WebKit/UIProcess/API/C/WKPreferences.cpp (267310 => 267311)


--- trunk/Source/WebKit/UIProcess/API/C/WKPreferences.cpp	2020-09-19 12:54:52 UTC (rev 267310)
+++ trunk/Source/WebKit/UIProcess/API/C/WKPreferences.cpp	2020-09-19 14:20:18 UTC (rev 267311)
@@ -1960,16 +1960,6 @@
     return toImpl(preferencesRef)->allowCrossOriginSubresourcesToAskForCredentials();
 }
 
-void WKPreferencesSetCrossOriginResourcePolicyEnabled(WKPreferencesRef preferencesRef, bool flag)
-{
-    toImpl(preferencesRef)->setCrossOriginResourcePolicyEnabled(flag);
-}
-
-bool WKPreferencesGetCrossOriginResourcePolicyEnabled(WKPreferencesRef preferencesRef)
-{
-    return toImpl(preferencesRef)->crossOriginResourcePolicyEnabled();
-}
-
 void WKPreferencesSetRestrictedHTTPResponseAccess(WKPreferencesRef preferencesRef, bool flag)
 {
     toImpl(preferencesRef)->setRestrictedHTTPResponseAccess(flag);
@@ -2223,3 +2213,12 @@
 {
     return true;
 }
+
+void WKPreferencesSetCrossOriginResourcePolicyEnabled(WKPreferencesRef, bool)
+{
+}
+
+bool WKPreferencesGetCrossOriginResourcePolicyEnabled(WKPreferencesRef)
+{
+    return true;
+}

Modified: trunk/Source/WebKit/UIProcess/API/C/WKPreferencesRef.h (267310 => 267311)


--- trunk/Source/WebKit/UIProcess/API/C/WKPreferencesRef.h	2020-09-19 12:54:52 UTC (rev 267310)
+++ trunk/Source/WebKit/UIProcess/API/C/WKPreferencesRef.h	2020-09-19 14:20:18 UTC (rev 267311)
@@ -327,9 +327,9 @@
 WK_EXPORT bool WKPreferencesGetRestrictedHTTPResponseAccess(WKPreferencesRef preferencesRef);
 WK_EXPORT void WKPreferencesSetRestrictedHTTPResponseAccess(WKPreferencesRef preferencesRef, bool allow);
 
-// Defaults to false.
-WK_EXPORT bool WKPreferencesGetCrossOriginResourcePolicyEnabled(WKPreferencesRef preferencesRef);
-WK_EXPORT void WKPreferencesSetCrossOriginResourcePolicyEnabled(WKPreferencesRef preferencesRef, bool allow);
+// Obsolete. Always returns true.
+WK_EXPORT bool WKPreferencesGetCrossOriginResourcePolicyEnabled(WKPreferencesRef preferencesRef) WK_C_API_DEPRECATED;
+WK_EXPORT void WKPreferencesSetCrossOriginResourcePolicyEnabled(WKPreferencesRef preferencesRef, bool allow) WK_C_API_DEPRECATED;
 
 // Defaults to false.
 WK_EXPORT bool WKPreferencesGetProcessSwapOnNavigationEnabled(WKPreferencesRef preferencesRef);

Modified: trunk/Source/WebKit/WebProcess/Network/WebLoaderStrategy.cpp (267310 => 267311)


--- trunk/Source/WebKit/WebProcess/Network/WebLoaderStrategy.cpp	2020-09-19 12:54:52 UTC (rev 267310)
+++ trunk/Source/WebKit/WebProcess/Network/WebLoaderStrategy.cpp	2020-09-19 14:20:18 UTC (rev 267311)
@@ -387,7 +387,7 @@
 
     loadParameters.isMainResourceNavigationForAnyFrame = resourceLoader.frame() && resourceLoader.options().mode == FetchOptions::Mode::Navigate;
 
-    loadParameters.shouldEnableCrossOriginResourcePolicy = RuntimeEnabledFeatures::sharedFeatures().crossOriginResourcePolicyEnabled() && !loadParameters.isMainFrameNavigation;
+    loadParameters.shouldEnableCrossOriginResourcePolicy = !loadParameters.isMainFrameNavigation;
 
     if (resourceLoader.options().mode == FetchOptions::Mode::Navigate) {
         Vector<RefPtr<SecurityOrigin>> frameAncestorOrigins;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to