<!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>[171560] trunk/Source/WebKit2</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/171560">171560</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2014-07-24 17:24:56 -0700 (Thu, 24 Jul 2014)</dd>
</dl>

<h3>Log Message</h3>
<pre>[iOS WK2] Header bar on nytimes articles lands in the wrong place after rubberbanding
https://bugs.webkit.org/show_bug.cgi?id=135221
&lt;rdar://problem/17542454&gt;

Reviewed by Benjamin Poulain.

The call to didCommitLayerTree() can cause one or two visible rect updates,
via changes to the UIScrollView contentSize and contentOffset. As a result, we
would notify the scrolling tree about a viewport change, but using the old
scrolling tree rather than the new one, so we could move layers around for
nodes which are about to be removed from the tree.

However, we also have to ensure that programmatic scrolls are applied after
didCommitLayerTree() has updated the view size, so have RemoteScrollingCoordinatorProxy
store data about programmatic scrolls and return them to the caller, which
can apply them after didCommitLayerTree().

* UIProcess/Scrolling/RemoteScrollingCoordinatorProxy.cpp: Store a pointer to a RequestedScrollInfo
for the duration of the tree update, so that we can store requested scroll info in it.
(WebKit::RemoteScrollingCoordinatorProxy::RemoteScrollingCoordinatorProxy):
(WebKit::RemoteScrollingCoordinatorProxy::updateScrollingTree):
(WebKit::RemoteScrollingCoordinatorProxy::scrollingTreeNodeRequestsScroll):
* UIProcess/Scrolling/RemoteScrollingCoordinatorProxy.h:
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::didCommitLayerTree): Give Mac a stub implementation.
* UIProcess/WebPageProxy.h: Group some editing-related functions together.
(WebKit::WebPageProxy::editorState):
(WebKit::WebPageProxy::canDelete):
(WebKit::WebPageProxy::hasSelectedRange):
(WebKit::WebPageProxy::isContentEditable):
(WebKit::WebPageProxy::maintainsInactiveSelection):
* UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.mm:
(WebKit::RemoteLayerTreeDrawingAreaProxy::commitLayerTree): Ordering change: update
the layer tree, then call didCommitLayerTree(), then do the viewport update, followed
by any programmatic scroll.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessScrollingRemoteScrollingCoordinatorProxycpp">trunk/Source/WebKit2/UIProcess/Scrolling/RemoteScrollingCoordinatorProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessScrollingRemoteScrollingCoordinatorProxyh">trunk/Source/WebKit2/UIProcess/Scrolling/RemoteScrollingCoordinatorProxy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxycpp">trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxyh">trunk/Source/WebKit2/UIProcess/WebPageProxy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacRemoteLayerTreeDrawingAreaProxymm">trunk/Source/WebKit2/UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.mm</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (171559 => 171560)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog        2014-07-25 00:15:06 UTC (rev 171559)
+++ trunk/Source/WebKit2/ChangeLog        2014-07-25 00:24:56 UTC (rev 171560)
</span><span class="lines">@@ -1,3 +1,41 @@
</span><ins>+2014-07-24  Simon Fraser  &lt;simon.fraser@apple.com&gt;
+
+        [iOS WK2] Header bar on nytimes articles lands in the wrong place after rubberbanding
+        https://bugs.webkit.org/show_bug.cgi?id=135221
+        &lt;rdar://problem/17542454&gt;
+
+        Reviewed by Benjamin Poulain.
+        
+        The call to didCommitLayerTree() can cause one or two visible rect updates,
+        via changes to the UIScrollView contentSize and contentOffset. As a result, we
+        would notify the scrolling tree about a viewport change, but using the old
+        scrolling tree rather than the new one, so we could move layers around for
+        nodes which are about to be removed from the tree.
+        
+        However, we also have to ensure that programmatic scrolls are applied after
+        didCommitLayerTree() has updated the view size, so have RemoteScrollingCoordinatorProxy
+        store data about programmatic scrolls and return them to the caller, which
+        can apply them after didCommitLayerTree().
+
+        * UIProcess/Scrolling/RemoteScrollingCoordinatorProxy.cpp: Store a pointer to a RequestedScrollInfo
+        for the duration of the tree update, so that we can store requested scroll info in it.
+        (WebKit::RemoteScrollingCoordinatorProxy::RemoteScrollingCoordinatorProxy):
+        (WebKit::RemoteScrollingCoordinatorProxy::updateScrollingTree):
+        (WebKit::RemoteScrollingCoordinatorProxy::scrollingTreeNodeRequestsScroll):
+        * UIProcess/Scrolling/RemoteScrollingCoordinatorProxy.h:
+        * UIProcess/WebPageProxy.cpp:
+        (WebKit::WebPageProxy::didCommitLayerTree): Give Mac a stub implementation.
+        * UIProcess/WebPageProxy.h: Group some editing-related functions together.
+        (WebKit::WebPageProxy::editorState):
+        (WebKit::WebPageProxy::canDelete):
+        (WebKit::WebPageProxy::hasSelectedRange):
+        (WebKit::WebPageProxy::isContentEditable):
+        (WebKit::WebPageProxy::maintainsInactiveSelection):
+        * UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.mm:
+        (WebKit::RemoteLayerTreeDrawingAreaProxy::commitLayerTree): Ordering change: update
+        the layer tree, then call didCommitLayerTree(), then do the viewport update, followed
+        by any programmatic scroll.
+
</ins><span class="cx"> 2014-07-24  Peyton Randolph  &lt;prandolph@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Rename feature flag for long-press gesture on Mac.                                                                   
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessScrollingRemoteScrollingCoordinatorProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Scrolling/RemoteScrollingCoordinatorProxy.cpp (171559 => 171560)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Scrolling/RemoteScrollingCoordinatorProxy.cpp        2014-07-25 00:15:06 UTC (rev 171559)
+++ trunk/Source/WebKit2/UIProcess/Scrolling/RemoteScrollingCoordinatorProxy.cpp        2014-07-25 00:24:56 UTC (rev 171560)
</span><span class="lines">@@ -49,6 +49,7 @@
</span><span class="cx"> RemoteScrollingCoordinatorProxy::RemoteScrollingCoordinatorProxy(WebPageProxy&amp; webPageProxy)
</span><span class="cx">     : m_webPageProxy(webPageProxy)
</span><span class="cx">     , m_scrollingTree(RemoteScrollingTree::create(*this))
</span><ins>+    , m_requestedScrollInfo(nullptr)
</ins><span class="cx">     , m_propagatesMainFrameScrolls(true)
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="lines">@@ -77,8 +78,10 @@
</span><span class="cx">     return &amp;remoteDrawingArea-&gt;remoteLayerTreeHost();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void RemoteScrollingCoordinatorProxy::updateScrollingTree(const RemoteScrollingCoordinatorTransaction&amp; transaction)
</del><ins>+void RemoteScrollingCoordinatorProxy::updateScrollingTree(const RemoteScrollingCoordinatorTransaction&amp; transaction, RequestedScrollInfo&amp; requestedScrollInfo)
</ins><span class="cx"> {
</span><ins>+    m_requestedScrollInfo = &amp;requestedScrollInfo;
+
</ins><span class="cx">     OwnPtr&lt;ScrollingStateTree&gt; stateTree = const_cast&lt;RemoteScrollingCoordinatorTransaction&amp;&gt;(transaction).scrollingStateTree().release();
</span><span class="cx">     
</span><span class="cx">     const RemoteLayerTreeHost* layerTreeHost = this-&gt;layerTreeHost();
</span><span class="lines">@@ -89,6 +92,8 @@
</span><span class="cx"> 
</span><span class="cx">     connectStateNodeLayers(*stateTree, *layerTreeHost);
</span><span class="cx">     m_scrollingTree-&gt;commitNewTreeState(stateTree.release());
</span><ins>+
+    m_requestedScrollInfo = nullptr;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> #if !PLATFORM(IOS)
</span><span class="lines">@@ -169,8 +174,11 @@
</span><span class="cx"> 
</span><span class="cx"> void RemoteScrollingCoordinatorProxy::scrollingTreeNodeRequestsScroll(ScrollingNodeID scrolledNodeID, const FloatPoint&amp; scrollPosition, bool representsProgrammaticScroll)
</span><span class="cx"> {
</span><del>-    if (scrolledNodeID == rootScrollingNodeID())
-        m_webPageProxy.requestScroll(scrollPosition, representsProgrammaticScroll);
</del><ins>+    if (scrolledNodeID == rootScrollingNodeID() &amp;&amp; m_requestedScrollInfo) {
+        m_requestedScrollInfo-&gt;requestsScrollPositionUpdate = true;
+        m_requestedScrollInfo-&gt;requestIsProgrammaticScroll = representsProgrammaticScroll;
+        m_requestedScrollInfo-&gt;requestedScrollPosition = scrollPosition;
+    }
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessScrollingRemoteScrollingCoordinatorProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Scrolling/RemoteScrollingCoordinatorProxy.h (171559 => 171560)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Scrolling/RemoteScrollingCoordinatorProxy.h        2014-07-25 00:15:06 UTC (rev 171559)
+++ trunk/Source/WebKit2/UIProcess/Scrolling/RemoteScrollingCoordinatorProxy.h        2014-07-25 00:24:56 UTC (rev 171560)
</span><span class="lines">@@ -68,7 +68,12 @@
</span><span class="cx"> 
</span><span class="cx">     const RemoteLayerTreeHost* layerTreeHost() const;
</span><span class="cx"> 
</span><del>-    void updateScrollingTree(const RemoteScrollingCoordinatorTransaction&amp;);
</del><ins>+    struct RequestedScrollInfo {
+        bool requestsScrollPositionUpdate { };
+        bool requestIsProgrammaticScroll { };
+        WebCore::FloatPoint requestedScrollPosition;
+    };
+    void updateScrollingTree(const RemoteScrollingCoordinatorTransaction&amp;, RequestedScrollInfo&amp;);
</ins><span class="cx"> 
</span><span class="cx">     void setPropagatesMainFrameScrolls(bool propagatesMainFrameScrolls) { m_propagatesMainFrameScrolls = propagatesMainFrameScrolls; }
</span><span class="cx">     bool propagatesMainFrameScrolls() const { return m_propagatesMainFrameScrolls; }
</span><span class="lines">@@ -86,6 +91,7 @@
</span><span class="cx"> 
</span><span class="cx">     WebPageProxy&amp; m_webPageProxy;
</span><span class="cx">     RefPtr&lt;RemoteScrollingTree&gt; m_scrollingTree;
</span><ins>+    RequestedScrollInfo* m_requestedScrollInfo;
</ins><span class="cx">     bool m_propagatesMainFrameScrolls;
</span><span class="cx"> };
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (171559 => 171560)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp        2014-07-25 00:15:06 UTC (rev 171559)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp        2014-07-25 00:24:56 UTC (rev 171560)
</span><span class="lines">@@ -1313,7 +1313,13 @@
</span><span class="cx"> 
</span><span class="cx">     m_process-&gt;send(Messages::WebPage::ExecuteEditCommand(commandName), m_pageID);
</span><span class="cx"> }
</span><del>-    
</del><ins>+
+#if !PLATFORM(IOS)
+void WebPageProxy::didCommitLayerTree(const RemoteLayerTreeTransaction&amp;)
+{
+}
+#endif
+
</ins><span class="cx"> #if USE(TILED_BACKING_STORE)
</span><span class="cx"> void WebPageProxy::commitPageTransitionViewport()
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (171559 => 171560)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h        2014-07-25 00:15:06 UTC (rev 171559)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h        2014-07-25 00:24:56 UTC (rev 171560)
</span><span class="lines">@@ -377,6 +377,15 @@
</span><span class="cx"> 
</span><span class="cx">     void executeEditCommand(const String&amp; commandName);
</span><span class="cx">     void validateCommand(const String&amp; commandName, std::function&lt;void (const String&amp;, bool, int32_t, CallbackBase::Error)&gt;);
</span><ins>+
+    const EditorState&amp; editorState() const { return m_editorState; }
+    bool canDelete() const { return hasSelectedRange() &amp;&amp; isContentEditable(); }
+    bool hasSelectedRange() const { return m_editorState.selectionIsRange; }
+    bool isContentEditable() const { return m_editorState.isContentEditable; }
+    
+    bool maintainsInactiveSelection() const { return m_maintainsInactiveSelection; }
+    void setMaintainsInactiveSelection(bool);
+
</ins><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx">     void executeEditCommand(const String&amp; commandName, std::function&lt;void (CallbackBase::Error)&gt;);
</span><span class="cx">     double displayedContentScale() const { return m_lastVisibleContentRectUpdate.scale(); }
</span><span class="lines">@@ -402,7 +411,6 @@
</span><span class="cx">     void setDeviceOrientation(int32_t);
</span><span class="cx">     int32_t deviceOrientation() const { return m_deviceOrientation; }
</span><span class="cx">     void willCommitLayerTree(uint64_t transactionID);
</span><del>-    void didCommitLayerTree(const WebKit::RemoteLayerTreeTransaction&amp;);
</del><span class="cx"> 
</span><span class="cx">     void selectWithGesture(const WebCore::IntPoint, WebCore::TextGranularity, uint32_t gestureType, uint32_t gestureState, std::function&lt;void (const WebCore::IntPoint&amp;, uint32_t, uint32_t, uint32_t, CallbackBase::Error)&gt;);
</span><span class="cx">     void updateSelectionWithTouches(const WebCore::IntPoint, uint32_t touches, bool baseIsStart, std::function&lt;void (const WebCore::IntPoint&amp;, uint32_t, CallbackBase::Error)&gt;);
</span><span class="lines">@@ -442,13 +450,8 @@
</span><span class="cx">     void contentSizeCategoryDidChange(const String&amp; contentSizeCategory);
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><del>-    const EditorState&amp; editorState() const { return m_editorState; }
-    bool canDelete() const { return hasSelectedRange() &amp;&amp; isContentEditable(); }
-    bool hasSelectedRange() const { return m_editorState.selectionIsRange; }
-    bool isContentEditable() const { return m_editorState.isContentEditable; }
-    
-    bool maintainsInactiveSelection() const { return m_maintainsInactiveSelection; }
-    void setMaintainsInactiveSelection(bool);
</del><ins>+    void didCommitLayerTree(const WebKit::RemoteLayerTreeTransaction&amp;);
+
</ins><span class="cx"> #if USE(TILED_BACKING_STORE) 
</span><span class="cx">     void didRenderFrame(const WebCore::IntSize&amp; contentsSize, const WebCore::IntRect&amp; coveredRect);
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacRemoteLayerTreeDrawingAreaProxymm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.mm (171559 => 171560)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.mm        2014-07-25 00:15:06 UTC (rev 171559)
+++ trunk/Source/WebKit2/UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.mm        2014-07-25 00:24:56 UTC (rev 171560)
</span><span class="lines">@@ -200,20 +200,26 @@
</span><span class="cx">     if (m_remoteLayerTreeHost.updateLayerTree(layerTreeTransaction))
</span><span class="cx">         m_webPageProxy-&gt;setAcceleratedCompositingRootLayer(m_remoteLayerTreeHost.rootLayer());
</span><span class="cx"> 
</span><del>-#if PLATFORM(IOS)
-    m_webPageProxy-&gt;didCommitLayerTree(layerTreeTransaction);
</del><ins>+#if ENABLE(ASYNC_SCROLLING)
+    RemoteScrollingCoordinatorProxy::RequestedScrollInfo requestedScrollInfo;
+    m_webPageProxy-&gt;scrollingCoordinatorProxy()-&gt;updateScrollingTree(scrollingTreeTransaction, requestedScrollInfo);
</ins><span class="cx"> #endif
</span><span class="cx"> 
</span><ins>+    m_webPageProxy-&gt;didCommitLayerTree(layerTreeTransaction);
+
</ins><span class="cx"> #if ENABLE(ASYNC_SCROLLING)
</span><del>-    m_webPageProxy-&gt;scrollingCoordinatorProxy()-&gt;updateScrollingTree(scrollingTreeTransaction);
-
</del><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx">     if (m_webPageProxy-&gt;scrollingCoordinatorProxy()-&gt;hasFixedOrSticky()) {
</span><ins>+        // If we got a new layer for a fixed or sticky node, its position from the WebProcess is probably stale. We need to re-run the &quot;viewport&quot; changed logic to udpate it with our UI-side state.
</ins><span class="cx">         FloatRect customFixedPositionRect = m_webPageProxy-&gt;computeCustomFixedPositionRect(m_webPageProxy-&gt;unobscuredContentRect(), m_webPageProxy-&gt;displayedContentScale());
</span><del>-        // If we got a new layer for a fixed or sticky node, its position from the WebProcess is probably stale. We need to re-run the &quot;viewport&quot; changed logic to udpate it with our UI-side state.
</del><span class="cx">         m_webPageProxy-&gt;scrollingCoordinatorProxy()-&gt;viewportChangedViaDelegatedScrolling(m_webPageProxy-&gt;scrollingCoordinatorProxy()-&gt;rootScrollingNodeID(), customFixedPositionRect, m_webPageProxy-&gt;displayedContentScale());
</span><span class="cx">     }
</span><span class="cx"> #endif
</span><ins>+
+    // Handle requested scroll position updates from the scrolling tree transaction after didCommitLayerTree()
+    // has updated the view size based on the content size.
+    if (requestedScrollInfo.requestsScrollPositionUpdate)
+        m_webPageProxy-&gt;requestScroll(requestedScrollInfo.requestedScrollPosition, requestedScrollInfo.requestIsProgrammaticScroll);
</ins><span class="cx"> #endif // ENABLE(ASYNC_SCROLLING)
</span><span class="cx"> 
</span><span class="cx">     if (m_debugIndicatorLayerTreeHost) {
</span></span></pre>
</div>
</div>

</body>
</html>