Diff
Modified: branches/safari-602-branch/Source/WebCore/ChangeLog (207606 => 207607)
--- branches/safari-602-branch/Source/WebCore/ChangeLog 2016-10-20 10:00:11 UTC (rev 207606)
+++ branches/safari-602-branch/Source/WebCore/ChangeLog 2016-10-20 10:00:20 UTC (rev 207607)
@@ -1,5 +1,34 @@
2016-10-20 Matthew Hanson <matthew_han...@apple.com>
+ Merge r204637. rdar://problem/28216256
+
+ 2016-08-16 Simon Fraser <simon.fra...@apple.com>
+
+ Rename didLayout(LayoutMilestones) to didReachLayoutMilestone(), and related WK2 functions
+ https://bugs.webkit.org/show_bug.cgi?id=160923
+
+ Reviewed by Tim Horton.
+
+ didLayout(LayoutMilestones) -> didReachLayoutMilestone(LayoutMilestones)
+ dispatchDidLayout(LayoutMilestones) -> dispatchDidReachLayoutMilestone(LayoutMilestones)
+
+ * dom/Document.cpp:
+ (WebCore::Document::setVisualUpdatesAllowed):
+ * loader/EmptyClients.h:
+ * loader/FrameLoader.cpp:
+ (WebCore::FrameLoader::didReachLayoutMilestone):
+ (WebCore::FrameLoader::didLayout): Deleted.
+ * loader/FrameLoader.h:
+ * loader/FrameLoaderClient.h:
+ * page/FrameView.cpp:
+ (WebCore::FrameView::fireLayoutRelatedMilestonesIfNeeded):
+ (WebCore::FrameView::firePaintRelatedMilestonesIfNeeded):
+ * page/LayoutMilestones.h: Formatting
+ * page/Page.cpp:
+ (WebCore::Page::addRelevantRepaintedObject):
+
+2016-10-20 Matthew Hanson <matthew_han...@apple.com>
+
Merge r207157. rdar://problem/28857500
2016-10-11 Daniel Bates <daba...@apple.com>
Modified: branches/safari-602-branch/Source/WebCore/dom/Document.cpp (207606 => 207607)
--- branches/safari-602-branch/Source/WebCore/dom/Document.cpp 2016-10-20 10:00:11 UTC (rev 207606)
+++ branches/safari-602-branch/Source/WebCore/dom/Document.cpp 2016-10-20 10:00:20 UTC (rev 207607)
@@ -1293,7 +1293,7 @@
if (frame()->isMainFrame()) {
frameView->addPaintPendingMilestones(DidFirstPaintAfterSuppressedIncrementalRendering);
if (page->requestedLayoutMilestones() & DidFirstLayoutAfterSuppressedIncrementalRendering)
- frame()->loader().didLayout(DidFirstLayoutAfterSuppressedIncrementalRendering);
+ frame()->loader().didReachLayoutMilestone(DidFirstLayoutAfterSuppressedIncrementalRendering);
}
}
Modified: branches/safari-602-branch/Source/WebCore/loader/EmptyClients.h (207606 => 207607)
--- branches/safari-602-branch/Source/WebCore/loader/EmptyClients.h 2016-10-20 10:00:11 UTC (rev 207606)
+++ branches/safari-602-branch/Source/WebCore/loader/EmptyClients.h 2016-10-20 10:00:20 UTC (rev 207607)
@@ -300,7 +300,7 @@
void dispatchDidFailLoad(const ResourceError&) override { }
void dispatchDidFinishDocumentLoad() override { }
void dispatchDidFinishLoad() override { }
- void dispatchDidLayout(LayoutMilestones) override { }
+ void dispatchDidReachLayoutMilestone(LayoutMilestones) override { }
Frame* dispatchCreatePage(const NavigationAction&) override { return nullptr; }
void dispatchShow() override { }
Modified: branches/safari-602-branch/Source/WebCore/loader/FrameLoader.cpp (207606 => 207607)
--- branches/safari-602-branch/Source/WebCore/loader/FrameLoader.cpp 2016-10-20 10:00:11 UTC (rev 207606)
+++ branches/safari-602-branch/Source/WebCore/loader/FrameLoader.cpp 2016-10-20 10:00:20 UTC (rev 207607)
@@ -2388,11 +2388,11 @@
request.setFirstPartyForCookies(originalURL);
}
-void FrameLoader::didLayout(LayoutMilestones milestones)
+void FrameLoader::didReachLayoutMilestone(LayoutMilestones milestones)
{
ASSERT(m_frame.isMainFrame());
- m_client.dispatchDidLayout(milestones);
+ m_client.dispatchDidReachLayoutMilestone(milestones);
}
void FrameLoader::didFirstLayout()
Modified: branches/safari-602-branch/Source/WebCore/loader/FrameLoader.h (207606 => 207607)
--- branches/safari-602-branch/Source/WebCore/loader/FrameLoader.h 2016-10-20 10:00:11 UTC (rev 207606)
+++ branches/safari-602-branch/Source/WebCore/loader/FrameLoader.h 2016-10-20 10:00:20 UTC (rev 207607)
@@ -190,7 +190,7 @@
CachePolicy subresourceCachePolicy() const;
- void didLayout(LayoutMilestones);
+ void didReachLayoutMilestone(LayoutMilestones);
void didFirstLayout();
void loadedResourceFromMemoryCache(CachedResource*, ResourceRequest& newRequest);
Modified: branches/safari-602-branch/Source/WebCore/loader/FrameLoaderClient.h (207606 => 207607)
--- branches/safari-602-branch/Source/WebCore/loader/FrameLoaderClient.h 2016-10-20 10:00:11 UTC (rev 207606)
+++ branches/safari-602-branch/Source/WebCore/loader/FrameLoaderClient.h 2016-10-20 10:00:20 UTC (rev 207607)
@@ -174,7 +174,7 @@
#endif
virtual void dispatchDidLayout() { }
- virtual void dispatchDidLayout(LayoutMilestones) { }
+ virtual void dispatchDidReachLayoutMilestone(LayoutMilestones) { }
virtual Frame* dispatchCreatePage(const NavigationAction&) = 0;
virtual void dispatchShow() = 0;
Modified: branches/safari-602-branch/Source/WebCore/page/FrameView.cpp (207606 => 207607)
--- branches/safari-602-branch/Source/WebCore/page/FrameView.cpp 2016-10-20 10:00:11 UTC (rev 207606)
+++ branches/safari-602-branch/Source/WebCore/page/FrameView.cpp 2016-10-20 10:00:20 UTC (rev 207607)
@@ -4839,7 +4839,7 @@
}
if (milestonesAchieved && frame().isMainFrame())
- frame().loader().didLayout(milestonesAchieved);
+ frame().loader().didReachLayoutMilestone(milestonesAchieved);
}
void FrameView::firePaintRelatedMilestonesIfNeeded()
@@ -4864,7 +4864,7 @@
m_milestonesPendingPaint = 0;
if (milestonesAchieved)
- page->mainFrame().loader().didLayout(milestonesAchieved);
+ page->mainFrame().loader().didReachLayoutMilestone(milestonesAchieved);
}
void FrameView::setVisualUpdatesAllowedByClient(bool visualUpdatesAllowed)
Modified: branches/safari-602-branch/Source/WebCore/page/LayoutMilestones.h (207606 => 207607)
--- branches/safari-602-branch/Source/WebCore/page/LayoutMilestones.h 2016-10-20 10:00:11 UTC (rev 207606)
+++ branches/safari-602-branch/Source/WebCore/page/LayoutMilestones.h 2016-10-20 10:00:20 UTC (rev 207607)
@@ -32,13 +32,13 @@
// We should either re-name them to something more generic, or split them into
// two enums -- one for painting and one for layout.
enum LayoutMilestoneFlag {
- DidFirstLayout = 1 << 0,
- DidFirstVisuallyNonEmptyLayout = 1 << 1,
- DidHitRelevantRepaintedObjectsAreaThreshold = 1 << 2,
- DidFirstFlushForHeaderLayer = 1 << 3,
- DidFirstLayoutAfterSuppressedIncrementalRendering = 1 << 4,
- DidFirstPaintAfterSuppressedIncrementalRendering = 1 << 5,
- ReachedSessionRestorationRenderTreeSizeThreshold = 1 << 6 // FIXME: only implemented by WK2 currently.
+ DidFirstLayout = 1 << 0,
+ DidFirstVisuallyNonEmptyLayout = 1 << 1,
+ DidHitRelevantRepaintedObjectsAreaThreshold = 1 << 2,
+ DidFirstFlushForHeaderLayer = 1 << 3,
+ DidFirstLayoutAfterSuppressedIncrementalRendering = 1 << 4,
+ DidFirstPaintAfterSuppressedIncrementalRendering = 1 << 5,
+ ReachedSessionRestorationRenderTreeSizeThreshold = 1 << 6 // FIXME: only implemented by WK2 currently.
};
typedef unsigned LayoutMilestones;
Modified: branches/safari-602-branch/Source/WebCore/page/Page.cpp (207606 => 207607)
--- branches/safari-602-branch/Source/WebCore/page/Page.cpp 2016-10-20 10:00:11 UTC (rev 207606)
+++ branches/safari-602-branch/Source/WebCore/page/Page.cpp 2016-10-20 10:00:20 UTC (rev 207607)
@@ -1734,7 +1734,7 @@
m_isCountingRelevantRepaintedObjects = false;
resetRelevantPaintedObjectCounter();
if (Frame* frame = &mainFrame())
- frame->loader().didLayout(DidHitRelevantRepaintedObjectsAreaThreshold);
+ frame->loader().didReachLayoutMilestone(DidHitRelevantRepaintedObjectsAreaThreshold);
}
}
Modified: branches/safari-602-branch/Source/WebKit/mac/ChangeLog (207606 => 207607)
--- branches/safari-602-branch/Source/WebKit/mac/ChangeLog 2016-10-20 10:00:11 UTC (rev 207606)
+++ branches/safari-602-branch/Source/WebKit/mac/ChangeLog 2016-10-20 10:00:20 UTC (rev 207607)
@@ -1,3 +1,19 @@
+2016-10-20 Matthew Hanson <matthew_han...@apple.com>
+
+ Merge r204637. rdar://problem/28216256
+
+ 2016-08-16 Simon Fraser <simon.fra...@apple.com>
+
+ Rename didLayout(LayoutMilestones) to didReachLayoutMilestone(), and related WK2 functions
+ https://bugs.webkit.org/show_bug.cgi?id=160923
+
+ Reviewed by Tim Horton.
+
+ * WebCoreSupport/WebFrameLoaderClient.h:
+ * WebCoreSupport/WebFrameLoaderClient.mm:
+ (WebFrameLoaderClient::dispatchDidReachLayoutMilestone):
+ (WebFrameLoaderClient::dispatchDidLayout): Deleted.
+
2016-09-26 Babak Shafiei <bshaf...@apple.com>
Merge r206238. rdar://problem/28450514
Modified: branches/safari-602-branch/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.h (207606 => 207607)
--- branches/safari-602-branch/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.h 2016-10-20 10:00:11 UTC (rev 207606)
+++ branches/safari-602-branch/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.h 2016-10-20 10:00:20 UTC (rev 207607)
@@ -116,7 +116,7 @@
void dispatchDidFailLoad(const WebCore::ResourceError&) override;
void dispatchDidFinishDocumentLoad() override;
void dispatchDidFinishLoad() override;
- void dispatchDidLayout(WebCore::LayoutMilestones) override;
+ void dispatchDidReachLayoutMilestone(WebCore::LayoutMilestones) override;
WebCore::Frame* dispatchCreatePage(const WebCore::NavigationAction&) override;
void dispatchShow() override;
Modified: branches/safari-602-branch/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm (207606 => 207607)
--- branches/safari-602-branch/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm 2016-10-20 10:00:11 UTC (rev 207606)
+++ branches/safari-602-branch/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm 2016-10-20 10:00:20 UTC (rev 207607)
@@ -779,7 +779,7 @@
[m_webFrame->_private->internalLoadDelegate webFrame:m_webFrame.get() didFinishLoadWithError:nil];
}
-void WebFrameLoaderClient::dispatchDidLayout(LayoutMilestones milestones)
+void WebFrameLoaderClient::dispatchDidReachLayoutMilestone(LayoutMilestones milestones)
{
WebView *webView = getWebView(m_webFrame.get());
WebFrameLoadDelegateImplementationCache* implementations = WebViewGetFrameLoadDelegateImplementations(webView);
Modified: branches/safari-602-branch/Source/WebKit/win/ChangeLog (207606 => 207607)
--- branches/safari-602-branch/Source/WebKit/win/ChangeLog 2016-10-20 10:00:11 UTC (rev 207606)
+++ branches/safari-602-branch/Source/WebKit/win/ChangeLog 2016-10-20 10:00:20 UTC (rev 207607)
@@ -1,3 +1,22 @@
+2016-10-20 Matthew Hanson <matthew_han...@apple.com>
+
+ Merge r204637. rdar://problem/28216256
+
+ 2016-08-16 Simon Fraser <simon.fra...@apple.com>
+
+ Rename didLayout(LayoutMilestones) to didReachLayoutMilestone(), and related WK2 functions
+ https://bugs.webkit.org/show_bug.cgi?id=160923
+
+ Reviewed by Tim Horton.
+
+ didLayout(LayoutMilestones) -> didReachLayoutMilestone(LayoutMilestones)
+ dispatchDidLayout(LayoutMilestones) -> dispatchDidReachLayoutMilestone(LayoutMilestones)
+
+ * WebCoreSupport/WebFrameLoaderClient.cpp:
+ (WebFrameLoaderClient::dispatchDidReachLayoutMilestone):
+ (WebFrameLoaderClient::dispatchDidLayout): Deleted.
+ * WebCoreSupport/WebFrameLoaderClient.h:
+
2016-09-16 Babak Shafiei <bshaf...@apple.com>
Merge r206006. rdar://problem/27991573
Modified: branches/safari-602-branch/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.cpp (207606 => 207607)
--- branches/safari-602-branch/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.cpp 2016-10-20 10:00:11 UTC (rev 207606)
+++ branches/safari-602-branch/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.cpp 2016-10-20 10:00:20 UTC (rev 207607)
@@ -469,7 +469,7 @@
frameLoadDelegate->didFinishLoadForFrame(webView, m_webFrame);
}
-void WebFrameLoaderClient::dispatchDidLayout(LayoutMilestones milestones)
+void WebFrameLoaderClient::dispatchDidReachLayoutMilestone(LayoutMilestones milestones)
{
WebView* webView = m_webFrame->webView();
Modified: branches/safari-602-branch/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.h (207606 => 207607)
--- branches/safari-602-branch/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.h 2016-10-20 10:00:11 UTC (rev 207606)
+++ branches/safari-602-branch/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.h 2016-10-20 10:00:20 UTC (rev 207607)
@@ -91,7 +91,7 @@
void dispatchDidFailLoad(const WebCore::ResourceError&) override;
void dispatchDidFinishDocumentLoad() override;
void dispatchDidFinishLoad() override;
- void dispatchDidLayout(WebCore::LayoutMilestones) override;
+ void dispatchDidReachLayoutMilestone(WebCore::LayoutMilestones) override;
void dispatchDecidePolicyForResponse(const WebCore::ResourceResponse&, const WebCore::ResourceRequest&, WebCore::FramePolicyFunction) override;
void dispatchDecidePolicyForNewWindowAction(const WebCore::NavigationAction&, const WebCore::ResourceRequest&, PassRefPtr<WebCore::FormState>, const WTF::String& frameName, WebCore::FramePolicyFunction) override;
Modified: branches/safari-602-branch/Source/WebKit2/ChangeLog (207606 => 207607)
--- branches/safari-602-branch/Source/WebKit2/ChangeLog 2016-10-20 10:00:11 UTC (rev 207606)
+++ branches/safari-602-branch/Source/WebKit2/ChangeLog 2016-10-20 10:00:20 UTC (rev 207607)
@@ -1,5 +1,60 @@
2016-10-20 Matthew Hanson <matthew_han...@apple.com>
+ Merge r204637. rdar://problem/28216256
+
+ 2016-08-16 Simon Fraser <simon.fra...@apple.com>
+
+ Rename didLayout(LayoutMilestones) to didReachLayoutMilestone(), and related WK2 functions
+ https://bugs.webkit.org/show_bug.cgi?id=160923
+
+ Reviewed by Tim Horton.
+
+ didLayout(LayoutMilestones) -> didReachLayoutMilestone(LayoutMilestones)
+ dispatchDidLayout(LayoutMilestones) -> dispatchDidReachLayoutMilestone(LayoutMilestones)
+
+ Avoided changing functions that are exposed as API/SPI.
+
+ * UIProcess/API/APILoaderClient.h:
+ (API::LoaderClient::didReachLayoutMilestone):
+ (API::LoaderClient::didLayout): Deleted.
+ * UIProcess/API/C/WKPage.cpp:
+ (WKPageSetPageLoaderClient):
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::didLayoutForCustomContentProvider):
+ (WebKit::WebPageProxy::didReachLayoutMilestone):
+ (WebKit::WebPageProxy::didLayout): Deleted.
+ * UIProcess/WebPageProxy.h:
+ * UIProcess/WebPageProxy.messages.in:
+ * UIProcess/ios/WebPageProxyIOS.mm:
+ (WebKit::WebPageProxy::didCommitLayerTree):
+ * UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.mm:
+ (WebKit::RemoteLayerTreeDrawingAreaProxy::commitLayerTree):
+ * WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextController.mm:
+ (didReachLayoutMilestone):
+ (setUpPageLoaderClient):
+ (didLayout): Deleted.
+ * WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.cpp:
+ (WebKit::InjectedBundlePageLoaderClient::didReachLayoutMilestone):
+ (WebKit::InjectedBundlePageLoaderClient::didLayout): Deleted.
+ * WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.h:
+ * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
+ (WebKit::WebFrameLoaderClient::dispatchDidReachLayoutMilestone):
+ (WebKit::WebFrameLoaderClient::dispatchDidLayout): Deleted.
+ * WebProcess/WebCoreSupport/WebFrameLoaderClient.h:
+ * WebProcess/WebPage/DrawingArea.h:
+ (WebKit::DrawingArea::dispatchDidReachLayoutMilestone):
+ (WebKit::DrawingArea::dispatchDidLayout): Deleted.
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::dispatchDidReachLayoutMilestone):
+ (WebKit::WebPage::dispatchDidLayout): Deleted.
+ * WebProcess/WebPage/WebPage.h:
+ * WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.h:
+ * WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm:
+ (WebKit::RemoteLayerTreeDrawingArea::dispatchDidReachLayoutMilestone):
+ (WebKit::RemoteLayerTreeDrawingArea::dispatchDidLayout): Deleted.
+
+2016-10-20 Matthew Hanson <matthew_han...@apple.com>
+
Merge r206834. rdar://problem/28634858
2016-10-05 Tim Horton <timothy_hor...@apple.com>
Modified: branches/safari-602-branch/Source/WebKit2/UIProcess/API/APILoaderClient.h (207606 => 207607)
--- branches/safari-602-branch/Source/WebKit2/UIProcess/API/APILoaderClient.h 2016-10-20 10:00:11 UTC (rev 207606)
+++ branches/safari-602-branch/Source/WebKit2/UIProcess/API/APILoaderClient.h 2016-10-20 10:00:20 UTC (rev 207607)
@@ -75,7 +75,7 @@
virtual void didRunInsecureContentForFrame(WebKit::WebPageProxy&, WebKit::WebFrameProxy&, API::Object*) { }
virtual void didDetectXSSForFrame(WebKit::WebPageProxy&, WebKit::WebFrameProxy&, API::Object*) { }
- virtual void didLayout(WebKit::WebPageProxy&, WebCore::LayoutMilestones) { }
+ virtual void didReachLayoutMilestone(WebKit::WebPageProxy&, WebCore::LayoutMilestones) { }
virtual bool canAuthenticateAgainstProtectionSpaceInFrame(WebKit::WebPageProxy&, WebKit::WebFrameProxy&, WebKit::WebProtectionSpace*) { return false; }
virtual void didReceiveAuthenticationChallengeInFrame(WebKit::WebPageProxy&, WebKit::WebFrameProxy&, WebKit::AuthenticationChallengeProxy*) { }
Modified: branches/safari-602-branch/Source/WebKit2/UIProcess/API/C/WKPage.cpp (207606 => 207607)
--- branches/safari-602-branch/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2016-10-20 10:00:11 UTC (rev 207606)
+++ branches/safari-602-branch/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2016-10-20 10:00:20 UTC (rev 207607)
@@ -1086,7 +1086,7 @@
m_client.didFirstVisuallyNonEmptyLayoutForFrame(toAPI(&page), toAPI(&frame), toAPI(userData), m_client.base.clientInfo);
}
- void didLayout(WebPageProxy& page, LayoutMilestones milestones) override
+ void didReachLayoutMilestone(WebPageProxy& page, LayoutMilestones milestones) override
{
if (!m_client.didLayout)
return;
Modified: branches/safari-602-branch/Source/WebKit2/UIProcess/WebPageProxy.cpp (207606 => 207607)
--- branches/safari-602-branch/Source/WebKit2/UIProcess/WebPageProxy.cpp 2016-10-20 10:00:11 UTC (rev 207606)
+++ branches/safari-602-branch/Source/WebKit2/UIProcess/WebPageProxy.cpp 2016-10-20 10:00:20 UTC (rev 207607)
@@ -3477,10 +3477,10 @@
void WebPageProxy::didLayoutForCustomContentProvider()
{
- didLayout(DidFirstLayout | DidFirstVisuallyNonEmptyLayout | DidHitRelevantRepaintedObjectsAreaThreshold);
+ didReachLayoutMilestone(DidFirstLayout | DidFirstVisuallyNonEmptyLayout | DidHitRelevantRepaintedObjectsAreaThreshold);
}
-void WebPageProxy::didLayout(uint32_t layoutMilestones)
+void WebPageProxy::didReachLayoutMilestone(uint32_t layoutMilestones)
{
PageClientProtector protector(m_pageClient);
@@ -3487,7 +3487,7 @@
if (m_navigationClient)
m_navigationClient->renderingProgressDidChange(*this, static_cast<LayoutMilestones>(layoutMilestones));
else
- m_loaderClient->didLayout(*this, static_cast<LayoutMilestones>(layoutMilestones));
+ m_loaderClient->didReachLayoutMilestone(*this, static_cast<LayoutMilestones>(layoutMilestones));
}
void WebPageProxy::didDisplayInsecureContentForFrame(uint64_t frameID, const UserData& userData)
Modified: branches/safari-602-branch/Source/WebKit2/UIProcess/WebPageProxy.h (207606 => 207607)
--- branches/safari-602-branch/Source/WebKit2/UIProcess/WebPageProxy.h 2016-10-20 10:00:11 UTC (rev 207606)
+++ branches/safari-602-branch/Source/WebKit2/UIProcess/WebPageProxy.h 2016-10-20 10:00:20 UTC (rev 207607)
@@ -1105,7 +1105,7 @@
void clearWheelEventTestTrigger();
void callAfterNextPresentationUpdate(std::function<void (CallbackBase::Error)>);
- void didLayout(uint32_t layoutMilestones);
+ void didReachLayoutMilestone(uint32_t layoutMilestones);
void didRestoreScrollPosition();
Modified: branches/safari-602-branch/Source/WebKit2/UIProcess/WebPageProxy.messages.in (207606 => 207607)
--- branches/safari-602-branch/Source/WebKit2/UIProcess/WebPageProxy.messages.in 2016-10-20 10:00:11 UTC (rev 207606)
+++ branches/safari-602-branch/Source/WebKit2/UIProcess/WebPageProxy.messages.in 2016-10-20 10:00:20 UTC (rev 207607)
@@ -132,7 +132,7 @@
DidFinishLoadForFrame(uint64_t frameID, uint64_t navigationID, WebKit::UserData userData)
DidFirstLayoutForFrame(uint64_t frameID, WebKit::UserData userData)
DidFirstVisuallyNonEmptyLayoutForFrame(uint64_t frameID, WebKit::UserData userData)
- DidLayout(uint32_t type)
+ DidReachLayoutMilestone(uint32_t type)
DidReceiveTitleForFrame(uint64_t frameID, String title, WebKit::UserData userData)
DidDisplayInsecureContentForFrame(uint64_t frameID, WebKit::UserData userData)
DidRunInsecureContentForFrame(uint64_t frameID, WebKit::UserData userData)
Modified: branches/safari-602-branch/Source/WebKit2/UIProcess/ios/WebPageProxyIOS.mm (207606 => 207607)
--- branches/safari-602-branch/Source/WebKit2/UIProcess/ios/WebPageProxyIOS.mm 2016-10-20 10:00:11 UTC (rev 207606)
+++ branches/safari-602-branch/Source/WebKit2/UIProcess/ios/WebPageProxyIOS.mm 2016-10-20 10:00:20 UTC (rev 207607)
@@ -364,7 +364,7 @@
if (m_wantsSessionRestorationRenderTreeSizeThresholdEvent && !m_hitRenderTreeSizeThreshold
&& exceedsRenderTreeSizeSizeThreshold(m_sessionRestorationRenderTreeSize, layerTreeTransaction.renderTreeSize())) {
m_hitRenderTreeSizeThreshold = true;
- didLayout(WebCore::ReachedSessionRestorationRenderTreeSizeThreshold);
+ didReachLayoutMilestone(WebCore::ReachedSessionRestorationRenderTreeSizeThreshold);
}
if (m_hasDeferredStartAssistingNode) {
Modified: branches/safari-602-branch/Source/WebKit2/UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.mm (207606 => 207607)
--- branches/safari-602-branch/Source/WebKit2/UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.mm 2016-10-20 10:00:11 UTC (rev 207606)
+++ branches/safari-602-branch/Source/WebKit2/UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.mm 2016-10-20 10:00:20 UTC (rev 207607)
@@ -236,7 +236,7 @@
#endif
if (auto milestones = layerTreeTransaction.newlyReachedLayoutMilestones())
- m_webPageProxy.didLayout(milestones);
+ m_webPageProxy.didReachLayoutMilestone(milestones);
for (auto& callbackID : layerTreeTransaction.callbackIDs()) {
if (auto callback = m_callbacks.take<VoidCallback>(callbackID))
Modified: branches/safari-602-branch/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextController.mm (207606 => 207607)
--- branches/safari-602-branch/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextController.mm 2016-10-20 10:00:11 UTC (rev 207606)
+++ branches/safari-602-branch/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextController.mm 2016-10-20 10:00:20 UTC (rev 207607)
@@ -182,7 +182,7 @@
[loadDelegate webProcessPlugInBrowserContextController:pluginContextController didLayoutForFrame:wrapper(*toImpl(frame))];
}
-static void didLayout(WKBundlePageRef page, WKLayoutMilestones milestones, WKTypeRef* userData, const void *clientInfo)
+static void didReachLayoutMilestone(WKBundlePageRef page, WKLayoutMilestones milestones, WKTypeRef* userData, const void *clientInfo)
{
WKWebProcessPlugInBrowserContextController *pluginContextController = (WKWebProcessPlugInBrowserContextController *)clientInfo;
auto loadDelegate = pluginContextController->_loadDelegate.get();
@@ -249,7 +249,7 @@
client.userAgentForURL = userAgentForURL;
client.didLayoutForFrame = didLayoutForFrame;
- client.didLayout = didLayout;
+ client.didLayout = didReachLayoutMilestone;
page.initializeInjectedBundleLoaderClient(&client.base);
}
Modified: branches/safari-602-branch/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.cpp (207606 => 207607)
--- branches/safari-602-branch/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.cpp 2016-10-20 10:00:11 UTC (rev 207606)
+++ branches/safari-602-branch/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.cpp 2016-10-20 10:00:20 UTC (rev 207607)
@@ -252,7 +252,7 @@
m_client.didLayoutForFrame(toAPI(page), toAPI(frame), m_client.base.clientInfo);
}
-void InjectedBundlePageLoaderClient::didLayout(WebPage* page, LayoutMilestones milestones, RefPtr<API::Object>& userData)
+void InjectedBundlePageLoaderClient::didReachLayoutMilestone(WebPage* page, LayoutMilestones milestones, RefPtr<API::Object>& userData)
{
if (!m_client.didLayout)
return;
Modified: branches/safari-602-branch/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.h (207606 => 207607)
--- branches/safari-602-branch/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.h 2016-10-20 10:00:11 UTC (rev 207606)
+++ branches/safari-602-branch/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.h 2016-10-20 10:00:20 UTC (rev 207607)
@@ -84,7 +84,7 @@
void didFirstLayoutForFrame(WebPage*, WebFrame*, RefPtr<API::Object>& userData);
void didFirstVisuallyNonEmptyLayoutForFrame(WebPage*, WebFrame*, RefPtr<API::Object>& userData);
void didLayoutForFrame(WebPage*, WebFrame*);
- void didLayout(WebPage*, WebCore::LayoutMilestones, RefPtr<API::Object>& userData);
+ void didReachLayoutMilestone(WebPage*, WebCore::LayoutMilestones, RefPtr<API::Object>& userData);
void didClearWindowObjectForFrame(WebPage*, WebFrame*, WebCore::DOMWrapperWorld&);
void didCancelClientRedirectForFrame(WebPage*, WebFrame*);
Modified: branches/safari-602-branch/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp (207606 => 207607)
--- branches/safari-602-branch/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp 2016-10-20 10:00:11 UTC (rev 207606)
+++ branches/safari-602-branch/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp 2016-10-20 10:00:20 UTC (rev 207607)
@@ -566,7 +566,7 @@
m_didCompletePageTransition = true;
}
-void WebFrameLoaderClient::dispatchDidLayout(LayoutMilestones milestones)
+void WebFrameLoaderClient::dispatchDidReachLayoutMilestone(LayoutMilestones milestones)
{
WebPage* webPage = m_frame->page();
if (!webPage)
@@ -595,7 +595,7 @@
}
// Send this after DidFirstLayout-specific calls since some clients expect to get those messages first.
- webPage->dispatchDidLayout(milestones);
+ webPage->dispatchDidReachLayoutMilestone(milestones);
if (milestones & DidFirstVisuallyNonEmptyLayout) {
if (m_frame->isMainFrame() && !m_didCompletePageTransition && !webPage->corePage()->settings().suppressesIncrementalRendering()) {
Modified: branches/safari-602-branch/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.h (207606 => 207607)
--- branches/safari-602-branch/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.h 2016-10-20 10:00:11 UTC (rev 207606)
+++ branches/safari-602-branch/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.h 2016-10-20 10:00:20 UTC (rev 207607)
@@ -102,7 +102,7 @@
void dispatchDidFinishDocumentLoad() override;
void dispatchDidFinishLoad() override;
- void dispatchDidLayout(WebCore::LayoutMilestones) override;
+ void dispatchDidReachLayoutMilestone(WebCore::LayoutMilestones) override;
void dispatchDidLayout() override;
WebCore::Frame* dispatchCreatePage(const WebCore::NavigationAction&) override;
Modified: branches/safari-602-branch/Source/WebKit2/WebProcess/WebPage/DrawingArea.h (207606 => 207607)
--- branches/safari-602-branch/Source/WebKit2/WebProcess/WebPage/DrawingArea.h 2016-10-20 10:00:11 UTC (rev 207606)
+++ branches/safari-602-branch/Source/WebKit2/WebProcess/WebPage/DrawingArea.h 2016-10-20 10:00:20 UTC (rev 207607)
@@ -131,7 +131,7 @@
virtual void setShouldScaleViewToFitDocument(bool) { }
- virtual bool dispatchDidLayout(WebCore::LayoutMilestones) { return false; }
+ virtual bool dispatchDidReachLayoutMilestone(WebCore::LayoutMilestones) { return false; }
#if PLATFORM(COCOA)
// Used by TiledCoreAnimationDrawingArea.
Modified: branches/safari-602-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (207606 => 207607)
--- branches/safari-602-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2016-10-20 10:00:11 UTC (rev 207606)
+++ branches/safari-602-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2016-10-20 10:00:20 UTC (rev 207607)
@@ -5521,19 +5521,19 @@
m_userContentController->removeAllUserContent();
}
-void WebPage::dispatchDidLayout(WebCore::LayoutMilestones milestones)
+void WebPage::dispatchDidReachLayoutMilestone(WebCore::LayoutMilestones milestones)
{
RefPtr<API::Object> userData;
- injectedBundleLoaderClient().didLayout(this, milestones, userData);
+ injectedBundleLoaderClient().didReachLayoutMilestone(this, milestones, userData);
// Clients should not set userData for this message, and it won't be passed through.
ASSERT(!userData);
// The drawing area might want to defer dispatch of didLayout to the UI process.
- if (m_drawingArea && m_drawingArea->dispatchDidLayout(milestones))
+ if (m_drawingArea && m_drawingArea->dispatchDidReachLayoutMilestone(milestones))
return;
- send(Messages::WebPageProxy::DidLayout(milestones));
+ send(Messages::WebPageProxy::DidReachLayoutMilestone(milestones));
}
void WebPage::didRestoreScrollPosition()
Modified: branches/safari-602-branch/Source/WebKit2/WebProcess/WebPage/WebPage.h (207606 => 207607)
--- branches/safari-602-branch/Source/WebKit2/WebProcess/WebPage/WebPage.h 2016-10-20 10:00:11 UTC (rev 207606)
+++ branches/safari-602-branch/Source/WebKit2/WebProcess/WebPage/WebPage.h 2016-10-20 10:00:20 UTC (rev 207607)
@@ -938,7 +938,7 @@
void addUserStyleSheet(const String& source, WebCore::UserContentInjectedFrames);
void removeAllUserContent();
- void dispatchDidLayout(WebCore::LayoutMilestones);
+ void dispatchDidReachLayoutMilestone(WebCore::LayoutMilestones);
void didRestoreScrollPosition();
Modified: branches/safari-602-branch/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.h (207606 => 207607)
--- branches/safari-602-branch/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.h 2016-10-20 10:00:11 UTC (rev 207606)
+++ branches/safari-602-branch/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.h 2016-10-20 10:00:20 UTC (rev 207607)
@@ -110,7 +110,7 @@
bool adjustLayerFlushThrottling(WebCore::LayerFlushThrottleState::Flags) override;
- bool dispatchDidLayout(WebCore::LayoutMilestones) override;
+ bool dispatchDidReachLayoutMilestone(WebCore::LayoutMilestones) override;
void updateScrolledExposedRect();
void updateRootLayers();
Modified: branches/safari-602-branch/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm (207606 => 207607)
--- branches/safari-602-branch/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm 2016-10-20 10:00:11 UTC (rev 207606)
+++ branches/safari-602-branch/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm 2016-10-20 10:00:20 UTC (rev 207607)
@@ -511,7 +511,7 @@
scheduleCompositingLayerFlush();
}
-bool RemoteLayerTreeDrawingArea::dispatchDidLayout(WebCore::LayoutMilestones layoutMilestones)
+bool RemoteLayerTreeDrawingArea::dispatchDidReachLayoutMilestone(WebCore::LayoutMilestones layoutMilestones)
{
m_pendingNewlyReachedLayoutMilestones |= layoutMilestones;
return true;
