Diff
Modified: trunk/Source/WebCore/ChangeLog (232310 => 232311)
--- trunk/Source/WebCore/ChangeLog 2018-05-30 21:30:21 UTC (rev 232310)
+++ trunk/Source/WebCore/ChangeLog 2018-05-30 21:38:06 UTC (rev 232311)
@@ -1,3 +1,18 @@
+2018-05-30 Youenn Fablet <[email protected]>
+
+ Rename FromOrigin runtime flag to CrossOriginResourcePolicy and enable it by default
+ https://bugs.webkit.org/show_bug.cgi?id=186082
+
+ Reviewed by Chris Dumez.
+
+ No change of behavior.
+
+ * page/RuntimeEnabledFeatures.h:
+ (WebCore::RuntimeEnabledFeatures::setCrossOriginResourcePolicyEnabled):
+ (WebCore::RuntimeEnabledFeatures::crossOriginResourcePolicyEnabled const):
+ (WebCore::RuntimeEnabledFeatures::setFromOriginResponseHeaderEnabled): Deleted.
+ (WebCore::RuntimeEnabledFeatures::fromOriginResponseHeaderEnabled const): Deleted.
+
2018-05-30 Chris Dumez <[email protected]>
Referrer-Policy response header is ignored
Modified: trunk/Source/WebCore/page/RuntimeEnabledFeatures.h (232310 => 232311)
--- trunk/Source/WebCore/page/RuntimeEnabledFeatures.h 2018-05-30 21:30:21 UTC (rev 232310)
+++ trunk/Source/WebCore/page/RuntimeEnabledFeatures.h 2018-05-30 21:38:06 UTC (rev 232311)
@@ -250,8 +250,8 @@
void setRestrictedHTTPResponseAccess(bool isEnabled) { m_isRestrictedHTTPResponseAccess = isEnabled; }
bool restrictedHTTPResponseAccess() const { return m_isRestrictedHTTPResponseAccess; }
- void setFromOriginResponseHeaderEnabled(bool isEnabled) { m_fromOriginResponseHeaderEnabled = isEnabled; }
- bool fromOriginResponseHeaderEnabled() const { return m_fromOriginResponseHeaderEnabled; }
+ void setCrossOriginResourcePolicyEnabled(bool isEnabled) { m_crossOriginResourcePolicyEnabled = isEnabled; }
+ bool crossOriginResourcePolicyEnabled() const { return m_crossOriginResourcePolicyEnabled; }
void setWebGLCompressedTextureASTCSupportEnabled(bool isEnabled) { m_isWebGLCompressedTextureASTCSupportEnabled = isEnabled; }
bool webGLCompressedTextureASTCSupportEnabled() const { return m_isWebGLCompressedTextureASTCSupportEnabled; }
@@ -399,7 +399,7 @@
bool m_isRestrictedHTTPResponseAccess { true };
- bool m_fromOriginResponseHeaderEnabled { false };
+ bool m_crossOriginResourcePolicyEnabled { true };
bool m_isWebGLCompressedTextureASTCSupportEnabled { false };
Modified: trunk/Source/WebKit/ChangeLog (232310 => 232311)
--- trunk/Source/WebKit/ChangeLog 2018-05-30 21:30:21 UTC (rev 232310)
+++ trunk/Source/WebKit/ChangeLog 2018-05-30 21:38:06 UTC (rev 232311)
@@ -1,5 +1,26 @@
2018-05-30 Youenn Fablet <[email protected]>
+ Rename FromOrigin runtime flag to CrossOriginResourcePolicy and enable it by default
+ https://bugs.webkit.org/show_bug.cgi?id=186082
+
+ Reviewed by Chris Dumez.
+
+ * NetworkProcess/NetworkResourceLoadParameters.cpp:
+ (WebKit::NetworkResourceLoadParameters::encode const):
+ (WebKit::NetworkResourceLoadParameters::decode):
+ * NetworkProcess/NetworkResourceLoadParameters.h:
+ * Shared/WebPreferences.yaml:
+ * UIProcess/API/C/WKPreferences.cpp:
+ (WKPreferencesSetCrossOriginResourcePolicyEnabled):
+ (WKPreferencesGetCrossOriginResourcePolicyEnabled):
+ (WKPreferencesSetFromOriginResponseHeaderEnabled): Deleted.
+ (WKPreferencesGetFromOriginResponseHeaderEnabled): Deleted.
+ * UIProcess/API/C/WKPreferencesRef.h:
+ * WebProcess/Network/WebLoaderStrategy.cpp:
+ (WebKit::WebLoaderStrategy::scheduleLoadFromNetworkProcess):
+
+2018-05-30 Youenn Fablet <[email protected]>
+
Rename CrossOriginResourcePolicy same to same-origin
https://bugs.webkit.org/show_bug.cgi?id=186080
Modified: trunk/Source/WebKit/NetworkProcess/NetworkResourceLoadParameters.cpp (232310 => 232311)
--- trunk/Source/WebKit/NetworkProcess/NetworkResourceLoadParameters.cpp 2018-05-30 21:30:21 UTC (rev 232310)
+++ trunk/Source/WebKit/NetworkProcess/NetworkResourceLoadParameters.cpp 2018-05-30 21:38:06 UTC (rev 232311)
@@ -97,7 +97,7 @@
encoder.encodeEnum(preflightPolicy);
- encoder << shouldEnableFromOriginResponseHeader;
+ encoder << shouldEnableCrossOriginResourcePolicy;
encoder << frameAncestorOrigins;
@@ -205,11 +205,11 @@
if (!decoder.decodeEnum(result.preflightPolicy))
return false;
- std::optional<bool> shouldEnableFromOriginResponseHeader;
- decoder >> shouldEnableFromOriginResponseHeader;
- if (!shouldEnableFromOriginResponseHeader)
+ std::optional<bool> shouldEnableCrossOriginResourcePolicy;
+ decoder >> shouldEnableCrossOriginResourcePolicy;
+ if (!shouldEnableCrossOriginResourcePolicy)
return false;
- result.shouldEnableFromOriginResponseHeader = *shouldEnableFromOriginResponseHeader;
+ result.shouldEnableCrossOriginResourcePolicy = *shouldEnableCrossOriginResourcePolicy;
if (!decoder.decode(result.frameAncestorOrigins))
return false;
Modified: trunk/Source/WebKit/NetworkProcess/NetworkResourceLoadParameters.h (232310 => 232311)
--- trunk/Source/WebKit/NetworkProcess/NetworkResourceLoadParameters.h 2018-05-30 21:30:21 UTC (rev 232310)
+++ trunk/Source/WebKit/NetworkProcess/NetworkResourceLoadParameters.h 2018-05-30 21:38:06 UTC (rev 232311)
@@ -61,7 +61,7 @@
WebCore::HTTPHeaderMap originalRequestHeaders;
bool shouldRestrictHTTPResponseAccess { false };
WebCore::PreflightPolicy preflightPolicy { WebCore::PreflightPolicy::Consider };
- bool shouldEnableFromOriginResponseHeader { false };
+ bool shouldEnableCrossOriginResourcePolicy { false };
Vector<RefPtr<WebCore::SecurityOrigin>> frameAncestorOrigins;
#if ENABLE(CONTENT_EXTENSIONS)
Modified: trunk/Source/WebKit/Shared/WebPreferences.yaml (232310 => 232311)
--- trunk/Source/WebKit/Shared/WebPreferences.yaml 2018-05-30 21:30:21 UTC (rev 232310)
+++ trunk/Source/WebKit/Shared/WebPreferences.yaml 2018-05-30 21:38:06 UTC (rev 232311)
@@ -1253,11 +1253,11 @@
category: experimental
webcoreBinding: RuntimeEnabledFeatures
-FromOriginResponseHeaderEnabled:
+CrossOriginResourcePolicyEnabled:
type: bool
- defaultValue: false
- humanReadableName: "From-Origin Response Header"
- humanReadableDescription: "Support for the From-Origin Response Header"
+ defaultValue: true
+ humanReadableName: "Cross-Origin-Resource-Policy Response Header"
+ humanReadableDescription: "Support for the Cross-Origin-Resource-Policy Response Header"
category: experimental
webcoreBinding: RuntimeEnabledFeatures
Modified: trunk/Source/WebKit/UIProcess/API/C/WKPreferences.cpp (232310 => 232311)
--- trunk/Source/WebKit/UIProcess/API/C/WKPreferences.cpp 2018-05-30 21:30:21 UTC (rev 232310)
+++ trunk/Source/WebKit/UIProcess/API/C/WKPreferences.cpp 2018-05-30 21:38:06 UTC (rev 232311)
@@ -1974,14 +1974,14 @@
return toImpl(preferencesRef)->allowCrossOriginSubresourcesToAskForCredentials();
}
-void WKPreferencesSetFromOriginResponseHeaderEnabled(WKPreferencesRef preferencesRef, bool flag)
+void WKPreferencesSetCrossOriginResourcePolicyEnabled(WKPreferencesRef preferencesRef, bool flag)
{
- toImpl(preferencesRef)->setFromOriginResponseHeaderEnabled(flag);
+ toImpl(preferencesRef)->setCrossOriginResourcePolicyEnabled(flag);
}
-bool WKPreferencesGetFromOriginResponseHeaderEnabled(WKPreferencesRef preferencesRef)
+bool WKPreferencesGetCrossOriginResourcePolicyEnabled(WKPreferencesRef preferencesRef)
{
- return toImpl(preferencesRef)->fromOriginResponseHeaderEnabled();
+ return toImpl(preferencesRef)->crossOriginResourcePolicyEnabled();
}
void WKPreferencesSetRestrictedHTTPResponseAccess(WKPreferencesRef preferencesRef, bool flag)
Modified: trunk/Source/WebKit/UIProcess/API/C/WKPreferencesRef.h (232310 => 232311)
--- trunk/Source/WebKit/UIProcess/API/C/WKPreferencesRef.h 2018-05-30 21:30:21 UTC (rev 232310)
+++ trunk/Source/WebKit/UIProcess/API/C/WKPreferencesRef.h 2018-05-30 21:38:06 UTC (rev 232311)
@@ -320,8 +320,8 @@
WK_EXPORT void WKPreferencesSetRestrictedHTTPResponseAccess(WKPreferencesRef preferencesRef, bool allow);
// Defaults to false.
-WK_EXPORT bool WKPreferencesGetFromOriginResponseHeaderEnabled(WKPreferencesRef preferencesRef);
-WK_EXPORT void WKPreferencesSetFromOriginResponseHeaderEnabled(WKPreferencesRef preferencesRef, bool allow);
+WK_EXPORT bool WKPreferencesGetCrossOriginResourcePolicyEnabled(WKPreferencesRef preferencesRef);
+WK_EXPORT void WKPreferencesSetCrossOriginResourcePolicyEnabled(WKPreferencesRef preferencesRef, bool allow);
#ifdef __cplusplus
}
Modified: trunk/Source/WebKit/WebProcess/Network/WebLoaderStrategy.cpp (232310 => 232311)
--- trunk/Source/WebKit/WebProcess/Network/WebLoaderStrategy.cpp 2018-05-30 21:30:21 UTC (rev 232310)
+++ trunk/Source/WebKit/WebProcess/Network/WebLoaderStrategy.cpp 2018-05-30 21:38:06 UTC (rev 232311)
@@ -327,7 +327,7 @@
loadParameters.isMainFrameNavigation = resourceLoader.frame() && resourceLoader.frame()->isMainFrame() && resourceLoader.options().mode == FetchOptions::Mode::Navigate;
- loadParameters.shouldEnableFromOriginResponseHeader = RuntimeEnabledFeatures::sharedFeatures().fromOriginResponseHeaderEnabled() && !loadParameters.isMainFrameNavigation;
+ loadParameters.shouldEnableCrossOriginResourcePolicy = RuntimeEnabledFeatures::sharedFeatures().crossOriginResourcePolicyEnabled() && !loadParameters.isMainFrameNavigation;
if (resourceLoader.options().mode == FetchOptions::Mode::Navigate) {
Vector<RefPtr<SecurityOrigin>> frameAncestorOrigins;
