REGRESSION (r171239): Much more time spent taking snapshots during the PLT

https://bugs.webkit.org/show_bug.cgi?id=135177
<rdar://problem/17764847>

Reviewed by Dan Bernstein.

* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::willChangeCurrentHistoryItemForMainFrame):
(WebKit::WebPageProxy::willChangeCurrentHistoryItem): Deleted.
* UIProcess/WebPageProxy.h:
* UIProcess/WebPageProxy.messages.in:
* WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
(WebKit::WebFrameLoaderClient::willChangeCurrentHistoryItem):
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::willChangeCurrentHistoryItemForMainFrame):
(WebKit::WebPage::willChangeCurrentHistoryItem): Deleted.
* WebProcess/WebPage/WebPage.h:
Rename WillChangeCurrentHistoryItem to WillChangeCurrentHistoryItemForMainFrame.
Only send it when the current history item for the main frame changes.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@171471 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
index 24b3638496446ce3a49570b2523ecfce06715743..ac1ab97e3602f81256eb37b573c559c7a4fa5a2e 100644 (file)
--- a/Source/WebKit2/ChangeLog
+++ b/Source/WebKit2/ChangeLog
@@ -1,3 +1,25 @@
+2014-07-23  Timothy Horton  <timothy_horton@apple.com>
+
+        REGRESSION (r171239): Much more time spent taking snapshots during the PLT
+        https://bugs.webkit.org/show_bug.cgi?id=135177
+        <rdar://problem/17764847>
+
+        Reviewed by Dan Bernstein.
+
+        * UIProcess/WebPageProxy.cpp:
+        (WebKit::WebPageProxy::willChangeCurrentHistoryItemForMainFrame):
+        (WebKit::WebPageProxy::willChangeCurrentHistoryItem): Deleted.
+        * UIProcess/WebPageProxy.h:
+        * UIProcess/WebPageProxy.messages.in:
+        * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
+        (WebKit::WebFrameLoaderClient::willChangeCurrentHistoryItem):
+        * WebProcess/WebPage/WebPage.cpp:
+        (WebKit::WebPage::willChangeCurrentHistoryItemForMainFrame):
+        (WebKit::WebPage::willChangeCurrentHistoryItem): Deleted.
+        * WebProcess/WebPage/WebPage.h:
+        Rename WillChangeCurrentHistoryItem to WillChangeCurrentHistoryItemForMainFrame.
+        Only send it when the current history item for the main frame changes.
+
 2014-07-23  Ryuan Choi  <ryuan.choi@samsung.com>
 
         [EFL] EWebKit2.h should contain version information

diff --git a/Source/WebKit2/UIProcess/WebPageProxy.cpp b/Source/WebKit2/UIProcess/WebPageProxy.cpp
index 7f584a3ded24263c34b84cc00939bb805cb4ed87..b5af385291272b0f452ecbd2e174c298253f8493 100644 (file)
--- a/Source/WebKit2/UIProcess/WebPageProxy.cpp
+++ b/Source/WebKit2/UIProcess/WebPageProxy.cpp
@@ -5171,7 +5171,7 @@ void WebPageProxy::navigationGestureSnapshotWasRemoved()
     m_isShowingNavigationGestureSnapshot = false;
 }
 
-void WebPageProxy::willChangeCurrentHistoryItem()
+void WebPageProxy::willChangeCurrentHistoryItemForMainFrame()
 {
     recordNavigationSnapshot();
 }

diff --git a/Source/WebKit2/UIProcess/WebPageProxy.h b/Source/WebKit2/UIProcess/WebPageProxy.h
index 79e395190f64a01b79226ebcdaa665d70b859050..fa3d008730c3ec281d166ed4b01001a9ea238d20 100644 (file)
--- a/Source/WebKit2/UIProcess/WebPageProxy.h
+++ b/Source/WebKit2/UIProcess/WebPageProxy.h
@@ -1033,7 +1033,7 @@ private:
     void didBlockInsecurePluginVersion(const String& mimeType, const String& pluginURLString, const String& frameURLString, const String& pageURLString, bool replacementObscured);
 #endif // ENABLE(NETSCAPE_PLUGIN_API)
     void setCanShortCircuitHorizontalWheelEvents(bool canShortCircuitHorizontalWheelEvents) { m_canShortCircuitHorizontalWheelEvents = canShortCircuitHorizontalWheelEvents; }
-    void willChangeCurrentHistoryItem();
+    void willChangeCurrentHistoryItemForMainFrame();
 
     void reattachToWebProcess();
     uint64_t reattachToWebProcessWithItem(WebBackForwardListItem*);

diff --git a/Source/WebKit2/UIProcess/WebPageProxy.messages.in b/Source/WebKit2/UIProcess/WebPageProxy.messages.in
index b0f19bfad12e979660d4948bf573d8621d37ce40..f80252f1db5e201f02bd7bcc8b590f506c4ad7a2 100644 (file)
--- a/Source/WebKit2/UIProcess/WebPageProxy.messages.in
+++ b/Source/WebKit2/UIProcess/WebPageProxy.messages.in
@@ -404,7 +404,7 @@ messages -> WebPageProxy {
     DidFinishLoadForQuickLookDocumentInMainFrame(WebKit::QuickLookDocumentData data)
 #endif
 
-    WillChangeCurrentHistoryItem()
+    WillChangeCurrentHistoryItemForMainFrame()
 
 #if USE(CONTENT_FILTERING)
     ContentFilterDidBlockLoadForFrame(WebCore::ContentFilter contentFilter, uint64_t frameID)

diff --git a/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp b/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp
index f550eb581c7628ce9549bae5a8a3d3010ef890c2..6dc288c53eed6942796a6b9c8c9c52d4c1cf09cd 100644 (file)
--- a/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp
+++ b/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp
@@ -1626,8 +1626,10 @@ void WebFrameLoaderClient::willChangeCurrentHistoryItem()
     WebPage* webPage = m_frame->page();
     if (!webPage)
         return;
+    if (!m_frame->isMainFrame())
+        return;
 
-    webPage->willChangeCurrentHistoryItem();
+    webPage->willChangeCurrentHistoryItemForMainFrame();
 }
 
 #if USE(CONTENT_FILTERING)

diff --git a/Source/WebKit2/WebProcess/WebPage/WebPage.cpp b/Source/WebKit2/WebProcess/WebPage/WebPage.cpp
index 1c2ed8ae086fb01947bf5fa11a95f45278370457..3f010aee7609754e9f0c9f33bb407b559283456c 100644 (file)
--- a/Source/WebKit2/WebProcess/WebPage/WebPage.cpp
+++ b/Source/WebKit2/WebProcess/WebPage/WebPage.cpp
@@ -4848,9 +4848,9 @@ void WebPage::didChangeScrollOffsetForFrame(Frame* frame)
     updateMainFrameScrollOffsetPinning();
 }
 
-void WebPage::willChangeCurrentHistoryItem()
+void WebPage::willChangeCurrentHistoryItemForMainFrame()
 {
-    send(Messages::WebPageProxy::WillChangeCurrentHistoryItem());
+    send(Messages::WebPageProxy::WillChangeCurrentHistoryItemForMainFrame());
 }
 
 } // namespace WebKit

diff --git a/Source/WebKit2/WebProcess/WebPage/WebPage.h b/Source/WebKit2/WebProcess/WebPage/WebPage.h
index fbffb2367e1e714c918cbbbc3d72a81e8bb115fb..8a1072b2b729dbb410e8aad2312b96ad0e082967 100644 (file)
--- a/Source/WebKit2/WebProcess/WebPage/WebPage.h
+++ b/Source/WebKit2/WebProcess/WebPage/WebPage.h
@@ -842,7 +842,7 @@ public:
 
     void didChangeScrollOffsetForFrame(WebCore::Frame*);
 
-    void willChangeCurrentHistoryItem();
+    void willChangeCurrentHistoryItemForMainFrame();
 
 private:
     WebPage(uint64_t pageID, const WebPageCreationParameters&);