Changeset 165604 in webkit

Timestamp:

Mar 14, 2014 12:27:25 AM (10 years ago)

Author:

mitz@apple.com

Message:

<rdar://problem/16319722> [Cocoa] WKHistoryDelegate is being called for subframes
​https://bugs.webkit.org/show_bug.cgi?id=130228

Reviewed by Mark Rowe.

• UIProcess/Cocoa/HistoryClient.mm:

(WebKit::HistoryClient::didNavigateWithNavigationData): Bail out if the frame is not the
main frame.
(WebKit::HistoryClient::didPerformClientRedirect): Ditto.
(WebKit::HistoryClient::didPerformServerRedirect): Ditto.
(WebKit::HistoryClient::didUpdateHistoryTitle): Ditto.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/Cocoa/HistoryClient.mm (modified) (4 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-03-14  Dan Bernstein  <mitz@apple.com>
+
+        <rdar://problem/16319722> [Cocoa] WKHistoryDelegate is being called for subframes
+        https://bugs.webkit.org/show_bug.cgi?id=130228
+
+        Reviewed by Mark Rowe.
+
+        * UIProcess/Cocoa/HistoryClient.mm:
+        (WebKit::HistoryClient::didNavigateWithNavigationData): Bail out if the frame is not the
+        main frame.
+        (WebKit::HistoryClient::didPerformClientRedirect): Ditto.
+        (WebKit::HistoryClient::didPerformServerRedirect): Ditto.
+        (WebKit::HistoryClient::didUpdateHistoryTitle): Ditto.
+
 2014-03-13  Jinwoo Jeong  <jw00.jeong@samsung.com>
 

trunk/Source/WebKit2/UIProcess/Cocoa/HistoryClient.mm

@@ -45 +45 @@
 void HistoryClient::didNavigateWithNavigationData(WebContext*, WebPageProxy* webPageProxy, const WebNavigationDataStore& navigationDataStore, WebFrameProxy* webFrameProxy)
 {
+    if (!webFrameProxy->isMainFrame())
+        return;
+
     auto& navigationState = NavigationState::fromWebPage(*webPageProxy);
 
@@ -52 +55 @@
 void HistoryClient::didPerformClientRedirect(WebContext*, WebPageProxy* webPageProxy, const WTF::String& sourceURL, const WTF::String& destinationURL, WebFrameProxy* webFrameProxy)
 {
+    if (!webFrameProxy->isMainFrame())
+        return;
+
     auto& navigationState = NavigationState::fromWebPage(*webPageProxy);
 
@@ -59 +65 @@
 void HistoryClient::didPerformServerRedirect(WebContext*, WebPageProxy* webPageProxy, const WTF::String& sourceURL, const WTF::String& destinationURL, WebFrameProxy* webFrameProxy)
 {
+    if (!webFrameProxy->isMainFrame())
+        return;
+
     auto& navigationState = NavigationState::fromWebPage(*webPageProxy);
 
@@ -66 +75 @@
 void HistoryClient::didUpdateHistoryTitle(WebContext*, WebPageProxy* webPageProxy, const WTF::String& title, const WTF::String& url, WebFrameProxy* webFrameProxy)
 {
+    if (!webFrameProxy->isMainFrame())
+        return;
+
     auto& navigationState = NavigationState::fromWebPage(*webPageProxy);