Changeset 182703 in webkit

Timestamp:

Apr 13, 2015, 3:41:51 AM (10 years ago)

Author:

Carlos Garcia Campos

Message:

Merge r182285 - 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):

Location:

releases/WebKitGTK/webkit-2.8/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/WebProcessProxy.cpp (modified) (1 diff)

releases/WebKitGTK/webkit-2.8/Source/WebKit2/ChangeLog

@@ +1 @@
+2015-04-02  Alexey Proskuryakov  <ap@apple.com>
+
+        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-03-31  Carlos Garcia Campos  <cgarcia@igalia.com>
 

releases/WebKitGTK/webkit-2.8/Source/WebKit2/UIProcess/WebProcessProxy.cpp

@@ -329 +329 @@
     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;
     }