<!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>[208369] 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/208369">208369</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2016-11-03 22:05:32 -0700 (Thu, 03 Nov 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/208328">r208328</a>. rdar://problem/29084886</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari602branchSourceWebCoreChangeLog">branches/safari-602-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari602branchSourceWebCorerenderingRenderLayerCompositorcpp">branches/safari-602-branch/Source/WebCore/rendering/RenderLayerCompositor.cpp</a></li>
<li><a href="#branchessafari602branchSourceWebCorerenderingRenderLayerCompositorh">branches/safari-602-branch/Source/WebCore/rendering/RenderLayerCompositor.h</a></li>
<li><a href="#branchessafari602branchSourceWebKit2ChangeLog">branches/safari-602-branch/Source/WebKit2/ChangeLog</a></li>
<li><a href="#branchessafari602branchSourceWebKit2WebProcessWebPagemacTiledCoreAnimationDrawingAreah">branches/safari-602-branch/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.h</a></li>
<li><a href="#branchessafari602branchSourceWebKit2WebProcessWebPagemacTiledCoreAnimationDrawingAreamm">branches/safari-602-branch/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.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 (208368 => 208369)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebCore/ChangeLog 2016-11-04 04:47:58 UTC (rev 208368)
+++ branches/safari-602-branch/Source/WebCore/ChangeLog 2016-11-04 05:05:32 UTC (rev 208369)
</span><span class="lines">@@ -1,5 +1,29 @@
</span><span class="cx"> 2016-11-03 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r208328. rdar://problem/29084886
+
+ 2016-11-03 Dan Bernstein <mitz@apple.com>
+
+ REGRESSION (r206247): Painting milestones can be delayed until the next layer flush
+ https://bugs.webkit.org/show_bug.cgi?id=164340
+ <rdar://problem/29074344>
+
+ Reviewed by Tim Horton.
+
+ To give WebKit a chance to deliver the painting milestones to its client after the commit,
+ we must tell it about them before or during the commit. To that end, we should not defer
+ the call to firePaintRelatedMilestonesIfNeeded until after the commit.
+
+ * rendering/RenderLayerCompositor.cpp:
+ (WebCore::RenderLayerCompositor::RenderLayerCompositor): Removed
+ m_paintRelatedMilestonesTimer initializer.
+ (WebCore::RenderLayerCompositor::didPaintBacking): Call
+ FrameView::firePaintRelatedMilestonesIfNeeded directly from here.
+ (WebCore::RenderLayerCompositor::paintRelatedMilestonesTimerFired): Deleted.
+ * rendering/RenderLayerCompositor.h:
+
+2016-11-03 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r208319. rdar://problem/29084077
</span><span class="cx">
</span><span class="cx"> 2016-11-02 Simon Fraser <simon.fraser@apple.com>
</span></span></pre></div>
<a id="branchessafari602branchSourceWebCorerenderingRenderLayerCompositorcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebCore/rendering/RenderLayerCompositor.cpp (208368 => 208369)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebCore/rendering/RenderLayerCompositor.cpp 2016-11-04 04:47:58 UTC (rev 208368)
+++ branches/safari-602-branch/Source/WebCore/rendering/RenderLayerCompositor.cpp 2016-11-04 05:05:32 UTC (rev 208369)
</span><span class="lines">@@ -274,7 +274,6 @@
</span><span class="cx"> RenderLayerCompositor::RenderLayerCompositor(RenderView& renderView)
</span><span class="cx"> : m_renderView(renderView)
</span><span class="cx"> , m_updateCompositingLayersTimer(*this, &RenderLayerCompositor::updateCompositingLayersTimerFired)
</span><del>- , m_paintRelatedMilestonesTimer(*this, &RenderLayerCompositor::paintRelatedMilestonesTimerFired)
</del><span class="cx"> , m_layerFlushTimer(*this, &RenderLayerCompositor::layerFlushTimerFired)
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="lines">@@ -569,8 +568,8 @@
</span><span class="cx"> {
</span><span class="cx"> FrameView& frameView = m_renderView.frameView();
</span><span class="cx"> frameView.setLastPaintTime(monotonicallyIncreasingTime());
</span><del>- if (frameView.milestonesPendingPaint() && !m_paintRelatedMilestonesTimer.isActive())
- m_paintRelatedMilestonesTimer.startOneShot(0);
</del><ins>+ if (frameView.milestonesPendingPaint())
+ frameView.firePaintRelatedMilestonesIfNeeded();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RenderLayerCompositor::didChangeVisibleRect()
</span><span class="lines">@@ -4203,20 +4202,6 @@
</span><span class="cx"> scheduleLayerFlushNow();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RenderLayerCompositor::paintRelatedMilestonesTimerFired()
-{
- Frame& frame = m_renderView.frameView().frame();
- Page* page = frame.page();
- if (!page)
- return;
-
- // If the layer tree is frozen, we'll paint when it's unfrozen and schedule the timer again.
- if (page->chrome().client().layerTreeStateIsFrozen())
- return;
-
- m_renderView.frameView().firePaintRelatedMilestonesIfNeeded();
-}
-
</del><span class="cx"> #if USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR)
</span><span class="cx"> RefPtr<DisplayRefreshMonitor> RenderLayerCompositor::createDisplayRefreshMonitor(PlatformDisplayID displayID) const
</span><span class="cx"> {
</span></span></pre></div>
<a id="branchessafari602branchSourceWebCorerenderingRenderLayerCompositorh"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebCore/rendering/RenderLayerCompositor.h (208368 => 208369)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebCore/rendering/RenderLayerCompositor.h 2016-11-04 04:47:58 UTC (rev 208368)
+++ branches/safari-602-branch/Source/WebCore/rendering/RenderLayerCompositor.h 2016-11-04 05:05:32 UTC (rev 208369)
</span><span class="lines">@@ -475,8 +475,6 @@
</span><span class="cx"> void startLayerFlushTimerIfNeeded();
</span><span class="cx"> void layerFlushTimerFired();
</span><span class="cx">
</span><del>- void paintRelatedMilestonesTimerFired();
-
</del><span class="cx"> #if !LOG_DISABLED
</span><span class="cx"> const char* logReasonsForCompositing(const RenderLayer&);
</span><span class="cx"> void logLayerInfo(const RenderLayer&, int depth);
</span><span class="lines">@@ -548,7 +546,6 @@
</span><span class="cx">
</span><span class="cx"> std::unique_ptr<GraphicsLayerUpdater> m_layerUpdater; // Updates tiled layer visible area periodically while animations are running.
</span><span class="cx">
</span><del>- Timer m_paintRelatedMilestonesTimer;
</del><span class="cx"> Timer m_layerFlushTimer;
</span><span class="cx">
</span><span class="cx"> bool m_layerFlushThrottlingEnabled { false };
</span></span></pre></div>
<a id="branchessafari602branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebKit2/ChangeLog (208368 => 208369)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebKit2/ChangeLog 2016-11-04 04:47:58 UTC (rev 208368)
+++ branches/safari-602-branch/Source/WebKit2/ChangeLog 2016-11-04 05:05:32 UTC (rev 208369)
</span><span class="lines">@@ -1,5 +1,26 @@
</span><span class="cx"> 2016-11-03 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r208328. rdar://problem/29084886
+
+ 2016-11-03 Dan Bernstein <mitz@apple.com>
+
+ REGRESSION (r206247): Painting milestones can be delayed until the next layer flush
+ https://bugs.webkit.org/show_bug.cgi?id=164340
+ <rdar://problem/29074344>
+
+ Reviewed by Tim Horton.
+
+ * WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.h: Declared new helper function.
+ * WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm:
+ (WebKit::TiledCoreAnimationDrawingArea::sendPendingNewlyReachedLayoutMilestones): Helper
+ function that sends the message to the UI process and resets
+ m_pendingNewlyReachedLayoutMilestones.
+ (WebKit::TiledCoreAnimationDrawingArea::flushLayers): Wait until after the commit to get the
+ pending milestones and send them to the UI process. This way we don’t miss milestones that
+ fire during the commit.
+
+2016-11-03 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r208340. rdar://problem/29092397
</span><span class="cx">
</span><span class="cx"> 2016-11-03 Dan Bernstein <mitz@apple.com>
</span></span></pre></div>
<a id="branchessafari602branchSourceWebKit2WebProcessWebPagemacTiledCoreAnimationDrawingAreah"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.h (208368 => 208369)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.h 2016-11-04 04:47:58 UTC (rev 208368)
+++ branches/safari-602-branch/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.h 2016-11-04 05:05:32 UTC (rev 208369)
</span><span class="lines">@@ -122,6 +122,8 @@
</span><span class="cx"> void updateScrolledExposedRect();
</span><span class="cx"> void scaleViewToFitDocumentIfNeeded();
</span><span class="cx">
</span><ins>+ void sendPendingNewlyReachedLayoutMilestones();
+
</ins><span class="cx"> bool m_layerTreeStateIsFrozen;
</span><span class="cx"> WebCore::LayerFlushScheduler m_layerFlushScheduler;
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari602branchSourceWebKit2WebProcessWebPagemacTiledCoreAnimationDrawingAreamm"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm (208368 => 208369)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm 2016-11-04 04:47:58 UTC (rev 208368)
+++ branches/safari-602-branch/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm 2016-11-04 05:05:32 UTC (rev 208369)
</span><span class="lines">@@ -394,6 +394,15 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void TiledCoreAnimationDrawingArea::sendPendingNewlyReachedLayoutMilestones()
+{
+ if (!m_pendingNewlyReachedLayoutMilestones)
+ return;
+
+ m_webPage.send(Messages::WebPageProxy::DidReachLayoutMilestone(m_pendingNewlyReachedLayoutMilestones));
+ m_pendingNewlyReachedLayoutMilestones = 0;
+}
+
</ins><span class="cx"> bool TiledCoreAnimationDrawingArea::flushLayers()
</span><span class="cx"> {
</span><span class="cx"> ASSERT(!m_layerTreeStateIsFrozen);
</span><span class="lines">@@ -418,14 +427,21 @@
</span><span class="cx"> if (m_viewOverlayRootLayer)
</span><span class="cx"> m_viewOverlayRootLayer->flushCompositingState(visibleRect, m_webPage.mainFrameView()->viewportIsStable());
</span><span class="cx">
</span><ins>+ RefPtr<WebPage> retainedPage = &m_webPage;
</ins><span class="cx"> #if TARGET_OS_IPHONE || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
</span><del>- RefPtr<WebPage> retainedPage = &m_webPage;
</del><span class="cx"> [CATransaction addCommitHandler:[retainedPage] {
</span><span class="cx"> if (Page* corePage = retainedPage->corePage()) {
</span><span class="cx"> if (Frame* coreFrame = retainedPage->mainFrame())
</span><span class="cx"> corePage->inspectorController().didComposite(*coreFrame);
</span><span class="cx"> }
</span><ins>+ if (auto drawingArea = static_cast<TiledCoreAnimationDrawingArea*>(retainedPage->drawingArea()))
+ drawingArea->sendPendingNewlyReachedLayoutMilestones();
</ins><span class="cx"> } forPhase:kCATransactionPhasePostCommit];
</span><ins>+#else
+ dispatch_async(dispatch_get_main_queue(), [retainedPage] {
+ if (auto drawingArea = static_cast<TiledCoreAnimationDrawingArea*>(retainedPage->drawingArea()))
+ drawingArea->sendPendingNewlyReachedLayoutMilestones();
+ });
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> bool returnValue = m_webPage.mainFrameView()->flushCompositingStateIncludingSubframes();
</span><span class="lines">@@ -439,10 +455,6 @@
</span><span class="cx"> if (m_transientZoomScale != 1)
</span><span class="cx"> applyTransientZoomToLayers(m_transientZoomScale, m_transientZoomOrigin);
</span><span class="cx">
</span><del>- if (m_pendingNewlyReachedLayoutMilestones)
- m_webPage.send(Messages::WebPageProxy::DidReachLayoutMilestone(m_pendingNewlyReachedLayoutMilestones));
- m_pendingNewlyReachedLayoutMilestones = 0;
-
</del><span class="cx"> return returnValue;
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>