Title: [182285] trunk/Source/WebKit2
- Revision
- 182285
- Author
- [email protected]
- Date
- 2015-04-02 12:53:32 -0700 (Thu, 02 Apr 2015)
Log Message
Make checkURLReceivedFromWebProcess not rely on details of platform URL implementation.
https://bugs.webkit.org/show_bug.cgi?id=143222
rdar://problem/19978997
Reviewed by Sam Weinig.
* UIProcess/WebProcessProxy.cpp:
(WebKit::WebProcessProxy::checkURLReceivedFromWebProcess):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (182284 => 182285)
--- trunk/Source/WebKit2/ChangeLog 2015-04-02 19:50:13 UTC (rev 182284)
+++ trunk/Source/WebKit2/ChangeLog 2015-04-02 19:53:32 UTC (rev 182285)
@@ -1,3 +1,14 @@
+2015-04-02 Alexey Proskuryakov <[email protected]>
+
+ Make checkURLReceivedFromWebProcess not rely on details of platform URL implementation.
+ https://bugs.webkit.org/show_bug.cgi?id=143222
+ rdar://problem/19978997
+
+ Reviewed by Sam Weinig.
+
+ * UIProcess/WebProcessProxy.cpp:
+ (WebKit::WebProcessProxy::checkURLReceivedFromWebProcess):
+
2015-04-02 Yusuke Suzuki <[email protected]>
Clean up EnumerationMode to easily extend
Modified: trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp (182284 => 182285)
--- trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp 2015-04-02 19:50:13 UTC (rev 182284)
+++ trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp 2015-04-02 19:53:32 UTC (rev 182285)
@@ -352,9 +352,11 @@
// One case where we don't have sandbox extensions for file URLs in b/f list is if the list has been reinstated after a crash or a browser restart.
String path = url.fileSystemPath();
for (WebBackForwardListItemMap::iterator iter = m_backForwardListItemMap.begin(), end = m_backForwardListItemMap.end(); iter != end; ++iter) {
- if (URL(URL(), iter->value->url()).fileSystemPath() == path)
+ URL itemURL(URL(), iter->value->url());
+ if (itemURL.isLocalFile() && itemURL.fileSystemPath() == path)
return true;
- if (URL(URL(), iter->value->originalURL()).fileSystemPath() == path)
+ URL itemOriginalURL(URL(), iter->value->originalURL());
+ if (itemOriginalURL.isLocalFile() && itemOriginalURL.fileSystemPath() == path)
return true;
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
