Title: [204798] releases/WebKitGTK/webkit-2.12/Source/WebCore
- Revision
- 204798
- Author
- [email protected]
- Date
- 2016-08-23 03:45:16 -0700 (Tue, 23 Aug 2016)
Log Message
Revert "Unreviewed. Fix compatibility issue with 2.12.1 regarding local storage access from file URLs."
This reverts commit 6df4cefb055caf694b9939dd5bbe94595bd52c9b.
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog (204797 => 204798)
--- releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog 2016-08-23 10:41:07 UTC (rev 204797)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog 2016-08-23 10:45:16 UTC (rev 204798)
@@ -1662,13 +1662,6 @@
(WebCore::RenderThemeGtk::popupInternalPaddingBox): Ditto.
(WebCore::RenderThemeGtk::paintMenuList): Ditto.
-2016-04-27 Carlos Garcia Campos <[email protected]>
-
- Unreviewed. Fix compatibility issue with 2.12.1 regarding local storage access from file URLs.
-
- * page/SecurityOrigin.cpp:
- (WebCore::SecurityOrigin::canAccessStorage):
-
2016-04-25 Alberto Garcia <[email protected]>
[GTK] Crashes if DISPLAY is unset
Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/page/SecurityOrigin.cpp (204797 => 204798)
--- releases/WebKitGTK/webkit-2.12/Source/WebCore/page/SecurityOrigin.cpp 2016-08-23 10:41:07 UTC (rev 204797)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/page/SecurityOrigin.cpp 2016-08-23 10:45:16 UTC (rev 204798)
@@ -375,9 +375,7 @@
if (m_storageBlockingPolicy == BlockAllStorage)
return false;
- // We allow access to local storage from file URLs also when allowFileAccessFromFileURLs setting is enabled,
- // for backwards compatibility only in WebKitGTK+ 2.12 branch, this should not be backported to any other branch, nor trunk.
- if (isLocal() && !m_universalAccess && m_enforceFilePathSeparation && shouldAllowFromThirdParty != AlwaysAllowFromThirdParty)
+ if (isLocal() && !m_universalAccess && shouldAllowFromThirdParty != AlwaysAllowFromThirdParty)
return false;
// FIXME: This check should be replaced with an ASSERT once we can guarantee that topOrigin is not null.
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
