<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[207607] branches/safari-602-branch/Source</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/207607">207607</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2016-10-20 03:00:20 -0700 (Thu, 20 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/204637">r204637</a>. rdar://problem/28216256</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari602branchSourceWebCoreChangeLog">branches/safari-602-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari602branchSourceWebCoredomDocumentcpp">branches/safari-602-branch/Source/WebCore/dom/Document.cpp</a></li>
<li><a href="#branchessafari602branchSourceWebCoreloaderEmptyClientsh">branches/safari-602-branch/Source/WebCore/loader/EmptyClients.h</a></li>
<li><a href="#branchessafari602branchSourceWebCoreloaderFrameLoadercpp">branches/safari-602-branch/Source/WebCore/loader/FrameLoader.cpp</a></li>
<li><a href="#branchessafari602branchSourceWebCoreloaderFrameLoaderh">branches/safari-602-branch/Source/WebCore/loader/FrameLoader.h</a></li>
<li><a href="#branchessafari602branchSourceWebCoreloaderFrameLoaderClienth">branches/safari-602-branch/Source/WebCore/loader/FrameLoaderClient.h</a></li>
<li><a href="#branchessafari602branchSourceWebCorepageFrameViewcpp">branches/safari-602-branch/Source/WebCore/page/FrameView.cpp</a></li>
<li><a href="#branchessafari602branchSourceWebCorepageLayoutMilestonesh">branches/safari-602-branch/Source/WebCore/page/LayoutMilestones.h</a></li>
<li><a href="#branchessafari602branchSourceWebCorepagePagecpp">branches/safari-602-branch/Source/WebCore/page/Page.cpp</a></li>
<li><a href="#branchessafari602branchSourceWebKitmacChangeLog">branches/safari-602-branch/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#branchessafari602branchSourceWebKitmacWebCoreSupportWebFrameLoaderClienth">branches/safari-602-branch/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.h</a></li>
<li><a href="#branchessafari602branchSourceWebKitmacWebCoreSupportWebFrameLoaderClientmm">branches/safari-602-branch/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm</a></li>
<li><a href="#branchessafari602branchSourceWebKitwinChangeLog">branches/safari-602-branch/Source/WebKit/win/ChangeLog</a></li>
<li><a href="#branchessafari602branchSourceWebKitwinWebCoreSupportWebFrameLoaderClientcpp">branches/safari-602-branch/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.cpp</a></li>
<li><a href="#branchessafari602branchSourceWebKitwinWebCoreSupportWebFrameLoaderClienth">branches/safari-602-branch/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.h</a></li>
<li><a href="#branchessafari602branchSourceWebKit2ChangeLog">branches/safari-602-branch/Source/WebKit2/ChangeLog</a></li>
<li><a href="#branchessafari602branchSourceWebKit2UIProcessAPIAPILoaderClienth">branches/safari-602-branch/Source/WebKit2/UIProcess/API/APILoaderClient.h</a></li>
<li><a href="#branchessafari602branchSourceWebKit2UIProcessAPICWKPagecpp">branches/safari-602-branch/Source/WebKit2/UIProcess/API/C/WKPage.cpp</a></li>
<li><a href="#branchessafari602branchSourceWebKit2UIProcessWebPageProxycpp">branches/safari-602-branch/Source/WebKit2/UIProcess/WebPageProxy.cpp</a></li>
<li><a href="#branchessafari602branchSourceWebKit2UIProcessWebPageProxyh">branches/safari-602-branch/Source/WebKit2/UIProcess/WebPageProxy.h</a></li>
<li><a href="#branchessafari602branchSourceWebKit2UIProcessWebPageProxymessagesin">branches/safari-602-branch/Source/WebKit2/UIProcess/WebPageProxy.messages.in</a></li>
<li><a href="#branchessafari602branchSourceWebKit2UIProcessiosWebPageProxyIOSmm">branches/safari-602-branch/Source/WebKit2/UIProcess/ios/WebPageProxyIOS.mm</a></li>
<li><a href="#branchessafari602branchSourceWebKit2UIProcessmacRemoteLayerTreeDrawingAreaProxymm">branches/safari-602-branch/Source/WebKit2/UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.mm</a></li>
<li><a href="#branchessafari602branchSourceWebKit2WebProcessInjectedBundleAPImacWKWebProcessPlugInBrowserContextControllermm">branches/safari-602-branch/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextController.mm</a></li>
<li><a href="#branchessafari602branchSourceWebKit2WebProcessInjectedBundleInjectedBundlePageLoaderClientcpp">branches/safari-602-branch/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.cpp</a></li>
<li><a href="#branchessafari602branchSourceWebKit2WebProcessInjectedBundleInjectedBundlePageLoaderClienth">branches/safari-602-branch/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.h</a></li>
<li><a href="#branchessafari602branchSourceWebKit2WebProcessWebCoreSupportWebFrameLoaderClientcpp">branches/safari-602-branch/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp</a></li>
<li><a href="#branchessafari602branchSourceWebKit2WebProcessWebCoreSupportWebFrameLoaderClienth">branches/safari-602-branch/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.h</a></li>
<li><a href="#branchessafari602branchSourceWebKit2WebProcessWebPageDrawingAreah">branches/safari-602-branch/Source/WebKit2/WebProcess/WebPage/DrawingArea.h</a></li>
<li><a href="#branchessafari602branchSourceWebKit2WebProcessWebPageWebPagecpp">branches/safari-602-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp</a></li>
<li><a href="#branchessafari602branchSourceWebKit2WebProcessWebPageWebPageh">branches/safari-602-branch/Source/WebKit2/WebProcess/WebPage/WebPage.h</a></li>
<li><a href="#branchessafari602branchSourceWebKit2WebProcessWebPagemacRemoteLayerTreeDrawingAreah">branches/safari-602-branch/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.h</a></li>
<li><a href="#branchessafari602branchSourceWebKit2WebProcessWebPagemacRemoteLayerTreeDrawingAreamm">branches/safari-602-branch/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari602branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebCore/ChangeLog (207606 => 207607)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,5 +1,34 @@
</span><span class="cx"> 2016-10-20 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r204637. rdar://problem/28216256
+
+ 2016-08-16 Simon Fraser <simon.fraser@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_hanson@apple.com>
+
</ins><span class="cx"> Merge r207157. rdar://problem/28857500
</span><span class="cx">
</span><span class="cx"> 2016-10-11 Daniel Bates <dabates@apple.com>
</span></span></pre></div>
<a id="branchessafari602branchSourceWebCoredomDocumentcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebCore/dom/Document.cpp (207606 => 207607)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1293,7 +1293,7 @@
</span><span class="cx"> if (frame()->isMainFrame()) {
</span><span class="cx"> frameView->addPaintPendingMilestones(DidFirstPaintAfterSuppressedIncrementalRendering);
</span><span class="cx"> if (page->requestedLayoutMilestones() & DidFirstLayoutAfterSuppressedIncrementalRendering)
</span><del>- frame()->loader().didLayout(DidFirstLayoutAfterSuppressedIncrementalRendering);
</del><ins>+ frame()->loader().didReachLayoutMilestone(DidFirstLayoutAfterSuppressedIncrementalRendering);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari602branchSourceWebCoreloaderEmptyClientsh"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebCore/loader/EmptyClients.h (207606 => 207607)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -300,7 +300,7 @@
</span><span class="cx"> void dispatchDidFailLoad(const ResourceError&) override { }
</span><span class="cx"> void dispatchDidFinishDocumentLoad() override { }
</span><span class="cx"> void dispatchDidFinishLoad() override { }
</span><del>- void dispatchDidLayout(LayoutMilestones) override { }
</del><ins>+ void dispatchDidReachLayoutMilestone(LayoutMilestones) override { }
</ins><span class="cx">
</span><span class="cx"> Frame* dispatchCreatePage(const NavigationAction&) override { return nullptr; }
</span><span class="cx"> void dispatchShow() override { }
</span></span></pre></div>
<a id="branchessafari602branchSourceWebCoreloaderFrameLoadercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebCore/loader/FrameLoader.cpp (207606 => 207607)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -2388,11 +2388,11 @@
</span><span class="cx"> request.setFirstPartyForCookies(originalURL);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void FrameLoader::didLayout(LayoutMilestones milestones)
</del><ins>+void FrameLoader::didReachLayoutMilestone(LayoutMilestones milestones)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(m_frame.isMainFrame());
</span><span class="cx">
</span><del>- m_client.dispatchDidLayout(milestones);
</del><ins>+ m_client.dispatchDidReachLayoutMilestone(milestones);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void FrameLoader::didFirstLayout()
</span></span></pre></div>
<a id="branchessafari602branchSourceWebCoreloaderFrameLoaderh"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebCore/loader/FrameLoader.h (207606 => 207607)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -190,7 +190,7 @@
</span><span class="cx">
</span><span class="cx"> CachePolicy subresourceCachePolicy() const;
</span><span class="cx">
</span><del>- void didLayout(LayoutMilestones);
</del><ins>+ void didReachLayoutMilestone(LayoutMilestones);
</ins><span class="cx"> void didFirstLayout();
</span><span class="cx">
</span><span class="cx"> void loadedResourceFromMemoryCache(CachedResource*, ResourceRequest& newRequest);
</span></span></pre></div>
<a id="branchessafari602branchSourceWebCoreloaderFrameLoaderClienth"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebCore/loader/FrameLoaderClient.h (207606 => 207607)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -174,7 +174,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> virtual void dispatchDidLayout() { }
</span><del>- virtual void dispatchDidLayout(LayoutMilestones) { }
</del><ins>+ virtual void dispatchDidReachLayoutMilestone(LayoutMilestones) { }
</ins><span class="cx">
</span><span class="cx"> virtual Frame* dispatchCreatePage(const NavigationAction&) = 0;
</span><span class="cx"> virtual void dispatchShow() = 0;
</span></span></pre></div>
<a id="branchessafari602branchSourceWebCorepageFrameViewcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebCore/page/FrameView.cpp (207606 => 207607)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -4839,7 +4839,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (milestonesAchieved && frame().isMainFrame())
</span><del>- frame().loader().didLayout(milestonesAchieved);
</del><ins>+ frame().loader().didReachLayoutMilestone(milestonesAchieved);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void FrameView::firePaintRelatedMilestonesIfNeeded()
</span><span class="lines">@@ -4864,7 +4864,7 @@
</span><span class="cx"> m_milestonesPendingPaint = 0;
</span><span class="cx">
</span><span class="cx"> if (milestonesAchieved)
</span><del>- page->mainFrame().loader().didLayout(milestonesAchieved);
</del><ins>+ page->mainFrame().loader().didReachLayoutMilestone(milestonesAchieved);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void FrameView::setVisualUpdatesAllowedByClient(bool visualUpdatesAllowed)
</span></span></pre></div>
<a id="branchessafari602branchSourceWebCorepageLayoutMilestonesh"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebCore/page/LayoutMilestones.h (207606 => 207607)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -32,13 +32,13 @@
</span><span class="cx"> // We should either re-name them to something more generic, or split them into
</span><span class="cx"> // two enums -- one for painting and one for layout.
</span><span class="cx"> enum LayoutMilestoneFlag {
</span><del>- 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.
</del><ins>+ 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.
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> typedef unsigned LayoutMilestones;
</span></span></pre></div>
<a id="branchessafari602branchSourceWebCorepagePagecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebCore/page/Page.cpp (207606 => 207607)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1734,7 +1734,7 @@
</span><span class="cx"> m_isCountingRelevantRepaintedObjects = false;
</span><span class="cx"> resetRelevantPaintedObjectCounter();
</span><span class="cx"> if (Frame* frame = &mainFrame())
</span><del>- frame->loader().didLayout(DidHitRelevantRepaintedObjectsAreaThreshold);
</del><ins>+ frame->loader().didReachLayoutMilestone(DidHitRelevantRepaintedObjectsAreaThreshold);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari602branchSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebKit/mac/ChangeLog (207606 => 207607)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2016-10-20 Matthew Hanson <matthew_hanson@apple.com>
+
+ Merge r204637. rdar://problem/28216256
+
+ 2016-08-16 Simon Fraser <simon.fraser@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.
+
</ins><span class="cx"> 2016-09-26 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r206238. rdar://problem/28450514
</span></span></pre></div>
<a id="branchessafari602branchSourceWebKitmacWebCoreSupportWebFrameLoaderClienth"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.h (207606 => 207607)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -116,7 +116,7 @@
</span><span class="cx"> void dispatchDidFailLoad(const WebCore::ResourceError&) override;
</span><span class="cx"> void dispatchDidFinishDocumentLoad() override;
</span><span class="cx"> void dispatchDidFinishLoad() override;
</span><del>- void dispatchDidLayout(WebCore::LayoutMilestones) override;
</del><ins>+ void dispatchDidReachLayoutMilestone(WebCore::LayoutMilestones) override;
</ins><span class="cx">
</span><span class="cx"> WebCore::Frame* dispatchCreatePage(const WebCore::NavigationAction&) override;
</span><span class="cx"> void dispatchShow() override;
</span></span></pre></div>
<a id="branchessafari602branchSourceWebKitmacWebCoreSupportWebFrameLoaderClientmm"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm (207606 => 207607)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -779,7 +779,7 @@
</span><span class="cx"> [m_webFrame->_private->internalLoadDelegate webFrame:m_webFrame.get() didFinishLoadWithError:nil];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebFrameLoaderClient::dispatchDidLayout(LayoutMilestones milestones)
</del><ins>+void WebFrameLoaderClient::dispatchDidReachLayoutMilestone(LayoutMilestones milestones)
</ins><span class="cx"> {
</span><span class="cx"> WebView *webView = getWebView(m_webFrame.get());
</span><span class="cx"> WebFrameLoadDelegateImplementationCache* implementations = WebViewGetFrameLoadDelegateImplementations(webView);
</span></span></pre></div>
<a id="branchessafari602branchSourceWebKitwinChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebKit/win/ChangeLog (207606 => 207607)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2016-10-20 Matthew Hanson <matthew_hanson@apple.com>
+
+ Merge r204637. rdar://problem/28216256
+
+ 2016-08-16 Simon Fraser <simon.fraser@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:
+
</ins><span class="cx"> 2016-09-16 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r206006. rdar://problem/27991573
</span></span></pre></div>
<a id="branchessafari602branchSourceWebKitwinWebCoreSupportWebFrameLoaderClientcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.cpp (207606 => 207607)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -469,7 +469,7 @@
</span><span class="cx"> frameLoadDelegate->didFinishLoadForFrame(webView, m_webFrame);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebFrameLoaderClient::dispatchDidLayout(LayoutMilestones milestones)
</del><ins>+void WebFrameLoaderClient::dispatchDidReachLayoutMilestone(LayoutMilestones milestones)
</ins><span class="cx"> {
</span><span class="cx"> WebView* webView = m_webFrame->webView();
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari602branchSourceWebKitwinWebCoreSupportWebFrameLoaderClienth"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.h (207606 => 207607)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -91,7 +91,7 @@
</span><span class="cx"> void dispatchDidFailLoad(const WebCore::ResourceError&) override;
</span><span class="cx"> void dispatchDidFinishDocumentLoad() override;
</span><span class="cx"> void dispatchDidFinishLoad() override;
</span><del>- void dispatchDidLayout(WebCore::LayoutMilestones) override;
</del><ins>+ void dispatchDidReachLayoutMilestone(WebCore::LayoutMilestones) override;
</ins><span class="cx">
</span><span class="cx"> void dispatchDecidePolicyForResponse(const WebCore::ResourceResponse&, const WebCore::ResourceRequest&, WebCore::FramePolicyFunction) override;
</span><span class="cx"> void dispatchDecidePolicyForNewWindowAction(const WebCore::NavigationAction&, const WebCore::ResourceRequest&, PassRefPtr<WebCore::FormState>, const WTF::String& frameName, WebCore::FramePolicyFunction) override;
</span></span></pre></div>
<a id="branchessafari602branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebKit2/ChangeLog (207606 => 207607)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,5 +1,60 @@
</span><span class="cx"> 2016-10-20 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r204637. rdar://problem/28216256
+
+ 2016-08-16 Simon Fraser <simon.fraser@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_hanson@apple.com>
+
</ins><span class="cx"> Merge r206834. rdar://problem/28634858
</span><span class="cx">
</span><span class="cx"> 2016-10-05 Tim Horton <timothy_horton@apple.com>
</span></span></pre></div>
<a id="branchessafari602branchSourceWebKit2UIProcessAPIAPILoaderClienth"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebKit2/UIProcess/API/APILoaderClient.h (207606 => 207607)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -75,7 +75,7 @@
</span><span class="cx"> virtual void didRunInsecureContentForFrame(WebKit::WebPageProxy&, WebKit::WebFrameProxy&, API::Object*) { }
</span><span class="cx"> virtual void didDetectXSSForFrame(WebKit::WebPageProxy&, WebKit::WebFrameProxy&, API::Object*) { }
</span><span class="cx">
</span><del>- virtual void didLayout(WebKit::WebPageProxy&, WebCore::LayoutMilestones) { }
</del><ins>+ virtual void didReachLayoutMilestone(WebKit::WebPageProxy&, WebCore::LayoutMilestones) { }
</ins><span class="cx">
</span><span class="cx"> virtual bool canAuthenticateAgainstProtectionSpaceInFrame(WebKit::WebPageProxy&, WebKit::WebFrameProxy&, WebKit::WebProtectionSpace*) { return false; }
</span><span class="cx"> virtual void didReceiveAuthenticationChallengeInFrame(WebKit::WebPageProxy&, WebKit::WebFrameProxy&, WebKit::AuthenticationChallengeProxy*) { }
</span></span></pre></div>
<a id="branchessafari602branchSourceWebKit2UIProcessAPICWKPagecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebKit2/UIProcess/API/C/WKPage.cpp (207606 => 207607)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1086,7 +1086,7 @@
</span><span class="cx"> m_client.didFirstVisuallyNonEmptyLayoutForFrame(toAPI(&page), toAPI(&frame), toAPI(userData), m_client.base.clientInfo);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- void didLayout(WebPageProxy& page, LayoutMilestones milestones) override
</del><ins>+ void didReachLayoutMilestone(WebPageProxy& page, LayoutMilestones milestones) override
</ins><span class="cx"> {
</span><span class="cx"> if (!m_client.didLayout)
</span><span class="cx"> return;
</span></span></pre></div>
<a id="branchessafari602branchSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebKit2/UIProcess/WebPageProxy.cpp (207606 => 207607)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -3477,10 +3477,10 @@
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::didLayoutForCustomContentProvider()
</span><span class="cx"> {
</span><del>- didLayout(DidFirstLayout | DidFirstVisuallyNonEmptyLayout | DidHitRelevantRepaintedObjectsAreaThreshold);
</del><ins>+ didReachLayoutMilestone(DidFirstLayout | DidFirstVisuallyNonEmptyLayout | DidHitRelevantRepaintedObjectsAreaThreshold);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPageProxy::didLayout(uint32_t layoutMilestones)
</del><ins>+void WebPageProxy::didReachLayoutMilestone(uint32_t layoutMilestones)
</ins><span class="cx"> {
</span><span class="cx"> PageClientProtector protector(m_pageClient);
</span><span class="cx">
</span><span class="lines">@@ -3487,7 +3487,7 @@
</span><span class="cx"> if (m_navigationClient)
</span><span class="cx"> m_navigationClient->renderingProgressDidChange(*this, static_cast<LayoutMilestones>(layoutMilestones));
</span><span class="cx"> else
</span><del>- m_loaderClient->didLayout(*this, static_cast<LayoutMilestones>(layoutMilestones));
</del><ins>+ m_loaderClient->didReachLayoutMilestone(*this, static_cast<LayoutMilestones>(layoutMilestones));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::didDisplayInsecureContentForFrame(uint64_t frameID, const UserData& userData)
</span></span></pre></div>
<a id="branchessafari602branchSourceWebKit2UIProcessWebPageProxyh"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebKit2/UIProcess/WebPageProxy.h (207606 => 207607)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1105,7 +1105,7 @@
</span><span class="cx"> void clearWheelEventTestTrigger();
</span><span class="cx"> void callAfterNextPresentationUpdate(std::function<void (CallbackBase::Error)>);
</span><span class="cx">
</span><del>- void didLayout(uint32_t layoutMilestones);
</del><ins>+ void didReachLayoutMilestone(uint32_t layoutMilestones);
</ins><span class="cx">
</span><span class="cx"> void didRestoreScrollPosition();
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari602branchSourceWebKit2UIProcessWebPageProxymessagesin"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebKit2/UIProcess/WebPageProxy.messages.in (207606 => 207607)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -132,7 +132,7 @@
</span><span class="cx"> DidFinishLoadForFrame(uint64_t frameID, uint64_t navigationID, WebKit::UserData userData)
</span><span class="cx"> DidFirstLayoutForFrame(uint64_t frameID, WebKit::UserData userData)
</span><span class="cx"> DidFirstVisuallyNonEmptyLayoutForFrame(uint64_t frameID, WebKit::UserData userData)
</span><del>- DidLayout(uint32_t type)
</del><ins>+ DidReachLayoutMilestone(uint32_t type)
</ins><span class="cx"> DidReceiveTitleForFrame(uint64_t frameID, String title, WebKit::UserData userData)
</span><span class="cx"> DidDisplayInsecureContentForFrame(uint64_t frameID, WebKit::UserData userData)
</span><span class="cx"> DidRunInsecureContentForFrame(uint64_t frameID, WebKit::UserData userData)
</span></span></pre></div>
<a id="branchessafari602branchSourceWebKit2UIProcessiosWebPageProxyIOSmm"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebKit2/UIProcess/ios/WebPageProxyIOS.mm (207606 => 207607)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -364,7 +364,7 @@
</span><span class="cx"> if (m_wantsSessionRestorationRenderTreeSizeThresholdEvent && !m_hitRenderTreeSizeThreshold
</span><span class="cx"> && exceedsRenderTreeSizeSizeThreshold(m_sessionRestorationRenderTreeSize, layerTreeTransaction.renderTreeSize())) {
</span><span class="cx"> m_hitRenderTreeSizeThreshold = true;
</span><del>- didLayout(WebCore::ReachedSessionRestorationRenderTreeSizeThreshold);
</del><ins>+ didReachLayoutMilestone(WebCore::ReachedSessionRestorationRenderTreeSizeThreshold);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (m_hasDeferredStartAssistingNode) {
</span></span></pre></div>
<a id="branchessafari602branchSourceWebKit2UIProcessmacRemoteLayerTreeDrawingAreaProxymm"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebKit2/UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.mm (207606 => 207607)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -236,7 +236,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> if (auto milestones = layerTreeTransaction.newlyReachedLayoutMilestones())
</span><del>- m_webPageProxy.didLayout(milestones);
</del><ins>+ m_webPageProxy.didReachLayoutMilestone(milestones);
</ins><span class="cx">
</span><span class="cx"> for (auto& callbackID : layerTreeTransaction.callbackIDs()) {
</span><span class="cx"> if (auto callback = m_callbacks.take<VoidCallback>(callbackID))
</span></span></pre></div>
<a id="branchessafari602branchSourceWebKit2WebProcessInjectedBundleAPImacWKWebProcessPlugInBrowserContextControllermm"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextController.mm (207606 => 207607)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -182,7 +182,7 @@
</span><span class="cx"> [loadDelegate webProcessPlugInBrowserContextController:pluginContextController didLayoutForFrame:wrapper(*toImpl(frame))];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void didLayout(WKBundlePageRef page, WKLayoutMilestones milestones, WKTypeRef* userData, const void *clientInfo)
</del><ins>+static void didReachLayoutMilestone(WKBundlePageRef page, WKLayoutMilestones milestones, WKTypeRef* userData, const void *clientInfo)
</ins><span class="cx"> {
</span><span class="cx"> WKWebProcessPlugInBrowserContextController *pluginContextController = (WKWebProcessPlugInBrowserContextController *)clientInfo;
</span><span class="cx"> auto loadDelegate = pluginContextController->_loadDelegate.get();
</span><span class="lines">@@ -249,7 +249,7 @@
</span><span class="cx"> client.userAgentForURL = userAgentForURL;
</span><span class="cx">
</span><span class="cx"> client.didLayoutForFrame = didLayoutForFrame;
</span><del>- client.didLayout = didLayout;
</del><ins>+ client.didLayout = didReachLayoutMilestone;
</ins><span class="cx">
</span><span class="cx"> page.initializeInjectedBundleLoaderClient(&client.base);
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari602branchSourceWebKit2WebProcessInjectedBundleInjectedBundlePageLoaderClientcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.cpp (207606 => 207607)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -252,7 +252,7 @@
</span><span class="cx"> m_client.didLayoutForFrame(toAPI(page), toAPI(frame), m_client.base.clientInfo);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InjectedBundlePageLoaderClient::didLayout(WebPage* page, LayoutMilestones milestones, RefPtr<API::Object>& userData)
</del><ins>+void InjectedBundlePageLoaderClient::didReachLayoutMilestone(WebPage* page, LayoutMilestones milestones, RefPtr<API::Object>& userData)
</ins><span class="cx"> {
</span><span class="cx"> if (!m_client.didLayout)
</span><span class="cx"> return;
</span></span></pre></div>
<a id="branchessafari602branchSourceWebKit2WebProcessInjectedBundleInjectedBundlePageLoaderClienth"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.h (207606 => 207607)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -84,7 +84,7 @@
</span><span class="cx"> void didFirstLayoutForFrame(WebPage*, WebFrame*, RefPtr<API::Object>& userData);
</span><span class="cx"> void didFirstVisuallyNonEmptyLayoutForFrame(WebPage*, WebFrame*, RefPtr<API::Object>& userData);
</span><span class="cx"> void didLayoutForFrame(WebPage*, WebFrame*);
</span><del>- void didLayout(WebPage*, WebCore::LayoutMilestones, RefPtr<API::Object>& userData);
</del><ins>+ void didReachLayoutMilestone(WebPage*, WebCore::LayoutMilestones, RefPtr<API::Object>& userData);
</ins><span class="cx">
</span><span class="cx"> void didClearWindowObjectForFrame(WebPage*, WebFrame*, WebCore::DOMWrapperWorld&);
</span><span class="cx"> void didCancelClientRedirectForFrame(WebPage*, WebFrame*);
</span></span></pre></div>
<a id="branchessafari602branchSourceWebKit2WebProcessWebCoreSupportWebFrameLoaderClientcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp (207606 => 207607)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -566,7 +566,7 @@
</span><span class="cx"> m_didCompletePageTransition = true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebFrameLoaderClient::dispatchDidLayout(LayoutMilestones milestones)
</del><ins>+void WebFrameLoaderClient::dispatchDidReachLayoutMilestone(LayoutMilestones milestones)
</ins><span class="cx"> {
</span><span class="cx"> WebPage* webPage = m_frame->page();
</span><span class="cx"> if (!webPage)
</span><span class="lines">@@ -595,7 +595,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Send this after DidFirstLayout-specific calls since some clients expect to get those messages first.
</span><del>- webPage->dispatchDidLayout(milestones);
</del><ins>+ webPage->dispatchDidReachLayoutMilestone(milestones);
</ins><span class="cx">
</span><span class="cx"> if (milestones & DidFirstVisuallyNonEmptyLayout) {
</span><span class="cx"> if (m_frame->isMainFrame() && !m_didCompletePageTransition && !webPage->corePage()->settings().suppressesIncrementalRendering()) {
</span></span></pre></div>
<a id="branchessafari602branchSourceWebKit2WebProcessWebCoreSupportWebFrameLoaderClienth"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.h (207606 => 207607)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -102,7 +102,7 @@
</span><span class="cx"> void dispatchDidFinishDocumentLoad() override;
</span><span class="cx"> void dispatchDidFinishLoad() override;
</span><span class="cx">
</span><del>- void dispatchDidLayout(WebCore::LayoutMilestones) override;
</del><ins>+ void dispatchDidReachLayoutMilestone(WebCore::LayoutMilestones) override;
</ins><span class="cx"> void dispatchDidLayout() override;
</span><span class="cx">
</span><span class="cx"> WebCore::Frame* dispatchCreatePage(const WebCore::NavigationAction&) override;
</span></span></pre></div>
<a id="branchessafari602branchSourceWebKit2WebProcessWebPageDrawingAreah"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebKit2/WebProcess/WebPage/DrawingArea.h (207606 => 207607)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -131,7 +131,7 @@
</span><span class="cx">
</span><span class="cx"> virtual void setShouldScaleViewToFitDocument(bool) { }
</span><span class="cx">
</span><del>- virtual bool dispatchDidLayout(WebCore::LayoutMilestones) { return false; }
</del><ins>+ virtual bool dispatchDidReachLayoutMilestone(WebCore::LayoutMilestones) { return false; }
</ins><span class="cx">
</span><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> // Used by TiledCoreAnimationDrawingArea.
</span></span></pre></div>
<a id="branchessafari602branchSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (207606 => 207607)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -5521,19 +5521,19 @@
</span><span class="cx"> m_userContentController->removeAllUserContent();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPage::dispatchDidLayout(WebCore::LayoutMilestones milestones)
</del><ins>+void WebPage::dispatchDidReachLayoutMilestone(WebCore::LayoutMilestones milestones)
</ins><span class="cx"> {
</span><span class="cx"> RefPtr<API::Object> userData;
</span><del>- injectedBundleLoaderClient().didLayout(this, milestones, userData);
</del><ins>+ injectedBundleLoaderClient().didReachLayoutMilestone(this, milestones, userData);
</ins><span class="cx">
</span><span class="cx"> // Clients should not set userData for this message, and it won't be passed through.
</span><span class="cx"> ASSERT(!userData);
</span><span class="cx">
</span><span class="cx"> // The drawing area might want to defer dispatch of didLayout to the UI process.
</span><del>- if (m_drawingArea && m_drawingArea->dispatchDidLayout(milestones))
</del><ins>+ if (m_drawingArea && m_drawingArea->dispatchDidReachLayoutMilestone(milestones))
</ins><span class="cx"> return;
</span><span class="cx">
</span><del>- send(Messages::WebPageProxy::DidLayout(milestones));
</del><ins>+ send(Messages::WebPageProxy::DidReachLayoutMilestone(milestones));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPage::didRestoreScrollPosition()
</span></span></pre></div>
<a id="branchessafari602branchSourceWebKit2WebProcessWebPageWebPageh"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebKit2/WebProcess/WebPage/WebPage.h (207606 => 207607)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -938,7 +938,7 @@
</span><span class="cx"> void addUserStyleSheet(const String& source, WebCore::UserContentInjectedFrames);
</span><span class="cx"> void removeAllUserContent();
</span><span class="cx">
</span><del>- void dispatchDidLayout(WebCore::LayoutMilestones);
</del><ins>+ void dispatchDidReachLayoutMilestone(WebCore::LayoutMilestones);
</ins><span class="cx">
</span><span class="cx"> void didRestoreScrollPosition();
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari602branchSourceWebKit2WebProcessWebPagemacRemoteLayerTreeDrawingAreah"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.h (207606 => 207607)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -110,7 +110,7 @@
</span><span class="cx">
</span><span class="cx"> bool adjustLayerFlushThrottling(WebCore::LayerFlushThrottleState::Flags) override;
</span><span class="cx">
</span><del>- bool dispatchDidLayout(WebCore::LayoutMilestones) override;
</del><ins>+ bool dispatchDidReachLayoutMilestone(WebCore::LayoutMilestones) override;
</ins><span class="cx">
</span><span class="cx"> void updateScrolledExposedRect();
</span><span class="cx"> void updateRootLayers();
</span></span></pre></div>
<a id="branchessafari602branchSourceWebKit2WebProcessWebPagemacRemoteLayerTreeDrawingAreamm"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebKit2/WebProcess/WebPage/mac/RemoteLayerTreeDrawingArea.mm (207606 => 207607)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -511,7 +511,7 @@
</span><span class="cx"> scheduleCompositingLayerFlush();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RemoteLayerTreeDrawingArea::dispatchDidLayout(WebCore::LayoutMilestones layoutMilestones)
</del><ins>+bool RemoteLayerTreeDrawingArea::dispatchDidReachLayoutMilestone(WebCore::LayoutMilestones layoutMilestones)
</ins><span class="cx"> {
</span><span class="cx"> m_pendingNewlyReachedLayoutMilestones |= layoutMilestones;
</span><span class="cx"> return true;
</span></span></pre>
</div>
</div>
</body>
</html>