<!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>[260643] trunk/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/260643">260643</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2020-04-24 08:03:22 -0700 (Fri, 24 Apr 2020)</dd>
</dl>

<h3>Log Message</h3>
<pre>Move some post-renderingUpdate code into WebCore
https://bugs.webkit.org/show_bug.cgi?id=210952

Reviewed by Antti Koivisto.

Factor some code called by the various DrawingArea subclasses into Page::finalizeRenderingUpdate(),
with some flags to control behavior that differs between drawing areas.

ScrollingCoordinator::commitTreeStateIfNeeded() is a no-op for RemoteScrollingCoordinator so
it's fine to always call it.

Source/WebCore:

* page/Page.cpp:
(WebCore::Page::passiveTouchEventListenerRectsForTesting):
(WebCore::Page::finalizeRenderingUpdate):
* page/Page.h:

Source/WebKit:

* WebProcess/WebPage/RemoteLayerTree/RemoteLayerTreeDrawingArea.mm:
(WebKit::RemoteLayerTreeDrawingArea::updateRendering):
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::finalizeRenderingUpdate):
* WebProcess/WebPage/WebPage.h:
* WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm:
(WebKit::TiledCoreAnimationDrawingArea::updateRendering):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorepagePagecpp">trunk/Source/WebCore/page/Page.cpp</a></li>
<li><a href="#trunkSourceWebCorepagePageh">trunk/Source/WebCore/page/Page.h</a></li>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitWebProcessWebPageRemoteLayerTreeRemoteLayerTreeDrawingAreamm">trunk/Source/WebKit/WebProcess/WebPage/RemoteLayerTree/RemoteLayerTreeDrawingArea.mm</a></li>
<li><a href="#trunkSourceWebKitWebProcessWebPageWebPagecpp">trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp</a></li>
<li><a href="#trunkSourceWebKitWebProcessWebPageWebPageh">trunk/Source/WebKit/WebProcess/WebPage/WebPage.h</a></li>
<li><a href="#trunkSourceWebKitWebProcessWebPagemacTiledCoreAnimationDrawingAreamm">trunk/Source/WebKit/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (260642 => 260643)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2020-04-24 14:57:32 UTC (rev 260642)
+++ trunk/Source/WebCore/ChangeLog      2020-04-24 15:03:22 UTC (rev 260643)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2020-04-24  Simon Fraser  <simon.fraser@apple.com>
+
+        Move some post-renderingUpdate code into WebCore
+        https://bugs.webkit.org/show_bug.cgi?id=210952
+
+        Reviewed by Antti Koivisto.
+
+        Factor some code called by the various DrawingArea subclasses into Page::finalizeRenderingUpdate(),
+        with some flags to control behavior that differs between drawing areas.
+
+        ScrollingCoordinator::commitTreeStateIfNeeded() is a no-op for RemoteScrollingCoordinator so
+        it's fine to always call it.
+
+        * page/Page.cpp:
+        (WebCore::Page::passiveTouchEventListenerRectsForTesting):
+        (WebCore::Page::finalizeRenderingUpdate):
+        * page/Page.h:
+
</ins><span class="cx"> 2020-04-24  Adrian Perez de Castro  <aperez@igalia.com>
</span><span class="cx"> 
</span><span class="cx">         Add missing HTMLNames:: namespace prefix to usage of liTag object
</span></span></pre></div>
<a id="trunkSourceWebCorepagePagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Page.cpp (260642 => 260643)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Page.cpp       2020-04-24 14:57:32 UTC (rev 260642)
+++ trunk/Source/WebCore/page/Page.cpp  2020-04-24 15:03:22 UTC (rev 260643)
</span><span class="lines">@@ -516,7 +516,7 @@
</span><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     Vector<IntRect> rects;
</span><del>-    if (ScrollingCoordinator* scrollingCoordinator = this->scrollingCoordinator())
</del><ins>+    if (auto* scrollingCoordinator = this->scrollingCoordinator())
</ins><span class="cx">         rects.appendVector(scrollingCoordinator->absoluteEventTrackingRegions().asynchronousDispatchRegion.rects());
</span><span class="cx"> 
</span><span class="cx">     Vector<FloatQuad> quads(rects.size());
</span><span class="lines">@@ -1422,6 +1422,26 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+void Page::finalizeRenderingUpdate(OptionSet<FinalizeRenderingUpdateFlags> flags)
+{
+    auto* view = mainFrame().view();
+    if (!view)
+        return;
+
+    if (flags.contains(FinalizeRenderingUpdateFlags::InvalidateImagesWithAsyncDecodes))
+        view->invalidateImagesWithAsyncDecodes();
+
+    view->flushCompositingStateIncludingSubframes();
+
+#if ENABLE(ASYNC_SCROLLING)
+    if (auto* scrollingCoordinator = this->scrollingCoordinator()) {
+        scrollingCoordinator->commitTreeStateIfNeeded();
+        if (flags.contains(FinalizeRenderingUpdateFlags::ApplyScrollingTreeLayerPositions))
+            scrollingCoordinator->applyScrollingTreeLayerPositions();
+    }
+#endif
+}
+
</ins><span class="cx"> void Page::suspendScriptedAnimations()
</span><span class="cx"> {
</span><span class="cx">     m_scriptedAnimationsSuspended = true;
</span></span></pre></div>
<a id="trunkSourceWebCorepagePageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Page.h (260642 => 260643)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Page.h 2020-04-24 14:57:32 UTC (rev 260642)
+++ trunk/Source/WebCore/page/Page.h    2020-04-24 15:03:22 UTC (rev 260643)
</span><span class="lines">@@ -164,6 +164,11 @@
</span><span class="cx">     Conservative, // Used in low memory situations.
</span><span class="cx"> };
</span><span class="cx"> 
</span><ins>+enum class FinalizeRenderingUpdateFlags : uint8_t {
+    ApplyScrollingTreeLayerPositions    = 1 << 0,
+    InvalidateImagesWithAsyncDecodes    = 1 << 1,
+};
+
</ins><span class="cx"> class Page : public Supplementable<Page>, public CanMakeWeakPtr<Page> {
</span><span class="cx">     WTF_MAKE_NONCOPYABLE(Page);
</span><span class="cx">     WTF_MAKE_FAST_ALLOCATED;
</span><span class="lines">@@ -481,6 +486,8 @@
</span><span class="cx">     WEBCORE_EXPORT void layoutIfNeeded();
</span><span class="cx">     WEBCORE_EXPORT void updateRendering();
</span><span class="cx">     
</span><ins>+    WEBCORE_EXPORT void finalizeRenderingUpdate(OptionSet<FinalizeRenderingUpdateFlags>);
+    
</ins><span class="cx">     WEBCORE_EXPORT void scheduleRenderingUpdate();
</span><span class="cx">     void scheduleTimedRenderingUpdate();
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (260642 => 260643)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog    2020-04-24 14:57:32 UTC (rev 260642)
+++ trunk/Source/WebKit/ChangeLog       2020-04-24 15:03:22 UTC (rev 260643)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2020-04-24  Simon Fraser  <simon.fraser@apple.com>
+
+        Move some post-renderingUpdate code into WebCore
+        https://bugs.webkit.org/show_bug.cgi?id=210952
+
+        Reviewed by Antti Koivisto.
+
+        Factor some code called by the various DrawingArea subclasses into Page::finalizeRenderingUpdate(),
+        with some flags to control behavior that differs between drawing areas.
+
+        ScrollingCoordinator::commitTreeStateIfNeeded() is a no-op for RemoteScrollingCoordinator so
+        it's fine to always call it.
+
+        * WebProcess/WebPage/RemoteLayerTree/RemoteLayerTreeDrawingArea.mm:
+        (WebKit::RemoteLayerTreeDrawingArea::updateRendering):
+        * WebProcess/WebPage/WebPage.cpp:
+        (WebKit::WebPage::finalizeRenderingUpdate):
+        * WebProcess/WebPage/WebPage.h:
+        * WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm:
+        (WebKit::TiledCoreAnimationDrawingArea::updateRendering):
+
</ins><span class="cx"> 2020-04-24  Chris Dumez  <cdumez@apple.com>
</span><span class="cx"> 
</span><span class="cx">         [iOS] Stop using legacy BKSApplicationStateMonitor
</span></span></pre></div>
<a id="trunkSourceWebKitWebProcessWebPageRemoteLayerTreeRemoteLayerTreeDrawingAreamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/WebProcess/WebPage/RemoteLayerTree/RemoteLayerTreeDrawingArea.mm (260642 => 260643)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/WebProcess/WebPage/RemoteLayerTree/RemoteLayerTreeDrawingArea.mm     2020-04-24 14:57:32 UTC (rev 260642)
+++ trunk/Source/WebKit/WebProcess/WebPage/RemoteLayerTree/RemoteLayerTreeDrawingArea.mm        2020-04-24 15:03:22 UTC (rev 260643)
</span><span class="lines">@@ -338,10 +338,11 @@
</span><span class="cx"> 
</span><span class="cx">     addCommitHandlers();
</span><span class="cx"> 
</span><ins>+    OptionSet<FinalizeRenderingUpdateFlags> flags;
</ins><span class="cx">     if (m_nextRenderingUpdateRequiresSynchronousImageDecoding)
</span><del>-        m_webPage.mainFrameView()->invalidateImagesWithAsyncDecodes();
</del><ins>+        flags.add(FinalizeRenderingUpdateFlags::InvalidateImagesWithAsyncDecodes);
</ins><span class="cx"> 
</span><del>-    m_webPage.mainFrameView()->flushCompositingStateIncludingSubframes();
</del><ins>+    m_webPage.finalizeRenderingUpdate(flags);
</ins><span class="cx"> 
</span><span class="cx">     // Because our view-relative overlay root layer is not attached to the FrameView's GraphicsLayer tree, we need to flush it manually.
</span><span class="cx">     if (m_viewOverlayRootLayer)
</span></span></pre></div>
<a id="trunkSourceWebKitWebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp (260642 => 260643)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp       2020-04-24 14:57:32 UTC (rev 260642)
+++ trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp  2020-04-24 15:03:22 UTC (rev 260643)
</span><span class="lines">@@ -3812,6 +3812,11 @@
</span><span class="cx">     m_page->updateRendering();
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+void WebPage::finalizeRenderingUpdate(OptionSet<FinalizeRenderingUpdateFlags> flags)
+{
+    m_page->finalizeRenderingUpdate(flags);
+}
+
</ins><span class="cx"> WebInspector* WebPage::inspector(LazyCreationPolicy behavior)
</span><span class="cx"> {
</span><span class="cx">     if (m_isClosed)
</span></span></pre></div>
<a id="trunkSourceWebKitWebProcessWebPageWebPageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/WebProcess/WebPage/WebPage.h (260642 => 260643)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/WebProcess/WebPage/WebPage.h 2020-04-24 14:57:32 UTC (rev 260642)
+++ trunk/Source/WebKit/WebProcess/WebPage/WebPage.h    2020-04-24 15:03:22 UTC (rev 260643)
</span><span class="lines">@@ -351,6 +351,7 @@
</span><span class="cx"> 
</span><span class="cx">     void layoutIfNeeded();
</span><span class="cx">     void updateRendering();
</span><ins>+    void finalizeRenderingUpdate(OptionSet<WebCore::FinalizeRenderingUpdateFlags>);
</ins><span class="cx"> 
</span><span class="cx">     enum class LazyCreationPolicy { UseExistingOnly, CreateIfNeeded };
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebKitWebProcessWebPagemacTiledCoreAnimationDrawingAreamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm (260642 => 260643)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm      2020-04-24 14:57:32 UTC (rev 260642)
+++ trunk/Source/WebKit/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm 2020-04-24 15:03:22 UTC (rev 260643)
</span><span class="lines">@@ -475,17 +475,13 @@
</span><span class="cx">             m_viewOverlayRootLayer->flushCompositingState(visibleRect);
</span><span class="cx"> 
</span><span class="cx">         addCommitHandlers();
</span><del>-        
-        bool didFlushAllFrames = m_webPage.mainFrameView()->flushCompositingStateIncludingSubframes();
</del><span class="cx"> 
</span><del>-#if ENABLE(ASYNC_SCROLLING)
-        if (auto* scrollingCoordinator = m_webPage.corePage()->scrollingCoordinator()) {
-            scrollingCoordinator->commitTreeStateIfNeeded();
-            if (flushType == UpdateRenderingType::Normal)
-                scrollingCoordinator->applyScrollingTreeLayerPositions();
-        }
-#endif
</del><ins>+        OptionSet<FinalizeRenderingUpdateFlags> flags;
+        if (flushType == UpdateRenderingType::Normal)
+            flags.add(FinalizeRenderingUpdateFlags::ApplyScrollingTreeLayerPositions);
</ins><span class="cx"> 
</span><ins>+        m_webPage.finalizeRenderingUpdate(flags);
+
</ins><span class="cx">         // If we have an active transient zoom, we want the zoom to win over any changes
</span><span class="cx">         // that WebCore makes to the relevant layers, so re-apply our changes after flushing.
</span><span class="cx">         if (m_transientZoomScale != 1)
</span><span class="lines">@@ -496,10 +492,8 @@
</span><span class="cx">             m_pendingCallbackIDs.clear();
</span><span class="cx">         }
</span><span class="cx"> 
</span><del>-        if (didFlushAllFrames) {
-            sendDidFirstLayerFlushIfNeeded();
-            invalidateRenderingUpdateRunLoopObserver();
-        }
</del><ins>+        sendDidFirstLayerFlushIfNeeded();
+        invalidateRenderingUpdateRunLoopObserver();
</ins><span class="cx">     }
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>