Title: [210888] trunk/Source/WebCore
- Revision
- 210888
- Author
- mcatanz...@igalia.com
- Date
- 2017-01-18 14:44:00 -0800 (Wed, 18 Jan 2017)
Log Message
REGRESSION(r210531): Broke local resource loads from custom local protocols
https://bugs.webkit.org/show_bug.cgi?id=167058
Reviewed by Brent Fulgham.
Allow local protocols to access resources on different volumes unless the protocol is
"file".
* page/SecurityOrigin.cpp:
(WebCore::SecurityOrigin::canDisplay):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (210887 => 210888)
--- trunk/Source/WebCore/ChangeLog 2017-01-18 22:43:22 UTC (rev 210887)
+++ trunk/Source/WebCore/ChangeLog 2017-01-18 22:44:00 UTC (rev 210888)
@@ -1,3 +1,16 @@
+2017-01-18 Michael Catanzaro <mcatanz...@igalia.com>
+
+ REGRESSION(r210531): Broke local resource loads from custom local protocols
+ https://bugs.webkit.org/show_bug.cgi?id=167058
+
+ Reviewed by Brent Fulgham.
+
+ Allow local protocols to access resources on different volumes unless the protocol is
+ "file".
+
+ * page/SecurityOrigin.cpp:
+ (WebCore::SecurityOrigin::canDisplay):
+
2017-01-18 Alex Christensen <achristen...@webkit.org>
Fix CMake build.
Modified: trunk/Source/WebCore/page/SecurityOrigin.cpp (210887 => 210888)
--- trunk/Source/WebCore/page/SecurityOrigin.cpp 2017-01-18 22:43:22 UTC (rev 210887)
+++ trunk/Source/WebCore/page/SecurityOrigin.cpp 2017-01-18 22:44:00 UTC (rev 210888)
@@ -304,10 +304,8 @@
if (m_universalAccess)
return true;
- if (isLocal() && url.isLocalFile()) {
- if (!filesHaveSameVolume(m_filePath, url.path()))
- return false;
- }
+ if (m_protocol == "file" && url.isLocalFile() && !filesHaveSameVolume(m_filePath, url.path()))
+ return false;
if (isFeedWithNestedProtocolInHTTPFamily(url))
return true;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
