Title: [171366] trunk/Source/WebKit2
- Revision
- 171366
- Author
- timothy_hor...@apple.com
- Date
- 2014-07-22 14:46:43 -0700 (Tue, 22 Jul 2014)
Log Message
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.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (171365 => 171366)
--- trunk/Source/WebKit2/ChangeLog 2014-07-22 21:32:28 UTC (rev 171365)
+++ trunk/Source/WebKit2/ChangeLog 2014-07-22 21:46:43 UTC (rev 171366)
@@ -1,3 +1,25 @@
+2014-07-22 Timothy Horton <timothy_hor...@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-22 Oliver Hunt <oli...@apple.com>
Add accountsd access to network sandbox profile
Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (171365 => 171366)
--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-07-22 21:32:28 UTC (rev 171365)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-07-22 21:46:43 UTC (rev 171366)
@@ -5171,7 +5171,7 @@
m_isShowingNavigationGestureSnapshot = false;
}
-void WebPageProxy::willChangeCurrentHistoryItem()
+void WebPageProxy::willChangeCurrentHistoryItemForMainFrame()
{
recordNavigationSnapshot();
}
Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (171365 => 171366)
--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2014-07-22 21:32:28 UTC (rev 171365)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2014-07-22 21:46:43 UTC (rev 171366)
@@ -1031,7 +1031,7 @@
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*);
Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in (171365 => 171366)
--- trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in 2014-07-22 21:32:28 UTC (rev 171365)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in 2014-07-22 21:46:43 UTC (rev 171366)
@@ -404,7 +404,7 @@
DidFinishLoadForQuickLookDocumentInMainFrame(WebKit::QuickLookDocumentData data)
#endif
- WillChangeCurrentHistoryItem()
+ WillChangeCurrentHistoryItemForMainFrame()
#if USE(CONTENT_FILTERING)
ContentFilterDidBlockLoadForFrame(WebCore::ContentFilter contentFilter, uint64_t frameID)
Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp (171365 => 171366)
--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp 2014-07-22 21:32:28 UTC (rev 171365)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp 2014-07-22 21:46:43 UTC (rev 171366)
@@ -1626,8 +1626,10 @@
WebPage* webPage = m_frame->page();
if (!webPage)
return;
+ if (!m_frame->isMainFrame())
+ return;
- webPage->willChangeCurrentHistoryItem();
+ webPage->willChangeCurrentHistoryItemForMainFrame();
}
#if USE(CONTENT_FILTERING)
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (171365 => 171366)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2014-07-22 21:32:28 UTC (rev 171365)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2014-07-22 21:46:43 UTC (rev 171366)
@@ -4848,9 +4848,9 @@
updateMainFrameScrollOffsetPinning();
}
-void WebPage::willChangeCurrentHistoryItem()
+void WebPage::willChangeCurrentHistoryItemForMainFrame()
{
- send(Messages::WebPageProxy::WillChangeCurrentHistoryItem());
+ send(Messages::WebPageProxy::WillChangeCurrentHistoryItemForMainFrame());
}
} // namespace WebKit
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h (171365 => 171366)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2014-07-22 21:32:28 UTC (rev 171365)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2014-07-22 21:46:43 UTC (rev 171366)
@@ -842,7 +842,7 @@
void didChangeScrollOffsetForFrame(WebCore::Frame*);
- void willChangeCurrentHistoryItem();
+ void willChangeCurrentHistoryItemForMainFrame();
private:
WebPage(uint64_t pageID, const WebPageCreationParameters&);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
