<!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>[166348] trunk/Source/WebCore</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/166348">166348</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2014-03-26 23:50:40 -0700 (Wed, 26 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix failing scrolling tests by reverting to previous behavior where
the scrolling geometry for the main frame scrolling node was only
updated from frameViewLayoutUpdated() and no-where else.
* WebCore.exp.in:
* page/scrolling/AsyncScrollingCoordinator.cpp:
(WebCore::AsyncScrollingCoordinator::updateScrollingNode):
* page/scrolling/AsyncScrollingCoordinator.h:
* page/scrolling/ScrollingCoordinator.h:
(WebCore::ScrollingCoordinator::updateScrollingNode):
* rendering/RenderLayerCompositor.cpp:
(WebCore::RenderLayerCompositor::updateScrollCoordinatedLayer):
(WebCore::RenderLayerCompositor::detachScrollCoordinatedLayer): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreWebCoreexpin">trunk/Source/WebCore/WebCore.exp.in</a></li>
<li><a href="#trunkSourceWebCorepagescrollingAsyncScrollingCoordinatorcpp">trunk/Source/WebCore/page/scrolling/AsyncScrollingCoordinator.cpp</a></li>
<li><a href="#trunkSourceWebCorepagescrollingAsyncScrollingCoordinatorh">trunk/Source/WebCore/page/scrolling/AsyncScrollingCoordinator.h</a></li>
<li><a href="#trunkSourceWebCorepagescrollingScrollingCoordinatorh">trunk/Source/WebCore/page/scrolling/ScrollingCoordinator.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayerCompositorcpp">trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (166347 => 166348)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-03-27 06:22:48 UTC (rev 166347)
+++ trunk/Source/WebCore/ChangeLog 2014-03-27 06:50:40 UTC (rev 166348)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2014-03-26 Simon Fraser <simon.fraser@apple.com>
+
+ Fix failing scrolling tests by reverting to previous behavior where
+ the scrolling geometry for the main frame scrolling node was only
+ updated from frameViewLayoutUpdated() and no-where else.
+
+ * WebCore.exp.in:
+ * page/scrolling/AsyncScrollingCoordinator.cpp:
+ (WebCore::AsyncScrollingCoordinator::updateScrollingNode):
+ * page/scrolling/AsyncScrollingCoordinator.h:
+ * page/scrolling/ScrollingCoordinator.h:
+ (WebCore::ScrollingCoordinator::updateScrollingNode):
+ * rendering/RenderLayerCompositor.cpp:
+ (WebCore::RenderLayerCompositor::updateScrollCoordinatedLayer):
+ (WebCore::RenderLayerCompositor::detachScrollCoordinatedLayer): Deleted.
+
</ins><span class="cx"> 2014-03-26 Ryosuke Niwa <rniwa@webkit.org>
</span><span class="cx">
</span><span class="cx"> HTMLConverter::_processText is slow because it walks up ancestor elements
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCoreexpin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.exp.in (166347 => 166348)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.exp.in 2014-03-27 06:22:48 UTC (rev 166347)
+++ trunk/Source/WebCore/WebCore.exp.in 2014-03-27 06:50:40 UTC (rev 166348)
</span><span class="lines">@@ -251,12 +251,12 @@
</span><span class="cx"> __ZN7WebCore12gcControllerEv
</span><span class="cx"> __ZN7WebCore12iconDatabaseEv
</span><span class="cx"> __ZN7WebCore13AXObjectCache10rootObjectEv
</span><del>-__ZN7WebCore13AXObjectCache37setEnhancedUserInterfaceAccessibilityEb
</del><span class="cx"> __ZN7WebCore13AXObjectCache18rootObjectForFrameEPNS_5FrameE
</span><span class="cx"> __ZN7WebCore13AXObjectCache19enableAccessibilityEv
</span><span class="cx"> __ZN7WebCore13AXObjectCache20disableAccessibilityEv
</span><span class="cx"> __ZN7WebCore13AXObjectCache21gAccessibilityEnabledE
</span><span class="cx"> __ZN7WebCore13AXObjectCache23focusedUIElementForPageEPKNS_4PageE
</span><ins>+__ZN7WebCore13AXObjectCache37setEnhancedUserInterfaceAccessibilityEb
</ins><span class="cx"> __ZN7WebCore13AXObjectCache42gAccessibilityEnhancedUserInterfaceEnabledE
</span><span class="cx"> __ZN7WebCore13CharacterData7setDataERKN3WTF6StringERi
</span><span class="cx"> __ZN7WebCore13ContainerNode11appendChildEN3WTF10PassRefPtrINS_4NodeEEERi
</span><span class="lines">@@ -2756,7 +2756,7 @@
</span><span class="cx"> __ZN7WebCore25AsyncScrollingCoordinator17attachToStateTreeENS_17ScrollingNodeTypeEyy
</span><span class="cx"> __ZN7WebCore25AsyncScrollingCoordinator18syncChildPositionsERKNS_10LayoutRectE
</span><span class="cx"> __ZN7WebCore25AsyncScrollingCoordinator19detachFromStateTreeEy
</span><del>-__ZN7WebCore25AsyncScrollingCoordinator19updateScrollingNodeEyPNS_13GraphicsLayerES2_S2_RKNS_20ScrollingCoordinator17ScrollingGeometryE
</del><ins>+__ZN7WebCore25AsyncScrollingCoordinator19updateScrollingNodeEyPNS_13GraphicsLayerES2_S2_PKNS_20ScrollingCoordinator17ScrollingGeometryE
</ins><span class="cx"> __ZN7WebCore25AsyncScrollingCoordinator22frameViewLayoutUpdatedEPNS_9FrameViewE
</span><span class="cx"> __ZN7WebCore25AsyncScrollingCoordinator27frameViewRootLayerDidChangeEPNS_9FrameViewE
</span><span class="cx"> __ZN7WebCore25AsyncScrollingCoordinator27requestScrollPositionUpdateEPNS_9FrameViewERKNS_8IntPointE
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingAsyncScrollingCoordinatorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/AsyncScrollingCoordinator.cpp (166347 => 166348)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/AsyncScrollingCoordinator.cpp 2014-03-27 06:22:48 UTC (rev 166347)
+++ trunk/Source/WebCore/page/scrolling/AsyncScrollingCoordinator.cpp 2014-03-27 06:50:40 UTC (rev 166348)
</span><span class="lines">@@ -287,7 +287,7 @@
</span><span class="cx"> attachToStateTree(FrameScrollingNode, frameView->scrollLayerID(), 0);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void AsyncScrollingCoordinator::updateScrollingNode(ScrollingNodeID nodeID, GraphicsLayer* layer, GraphicsLayer* scrolledContentsLayer, GraphicsLayer* counterScrollingLayer, const ScrollingGeometry& scrollingGeometry)
</del><ins>+void AsyncScrollingCoordinator::updateScrollingNode(ScrollingNodeID nodeID, GraphicsLayer* layer, GraphicsLayer* scrolledContentsLayer, GraphicsLayer* counterScrollingLayer, const ScrollingGeometry* scrollingGeometry)
</ins><span class="cx"> {
</span><span class="cx"> ScrollingStateScrollingNode* node = toScrollingStateScrollingNode(m_scrollingStateTree->stateNodeForID(nodeID));
</span><span class="cx"> ASSERT(node);
</span><span class="lines">@@ -298,9 +298,11 @@
</span><span class="cx"> node->setScrolledContentsLayer(scrolledContentsLayer);
</span><span class="cx"> node->setCounterScrollingLayer(counterScrollingLayer);
</span><span class="cx">
</span><del>- node->setScrollOrigin(scrollingGeometry.scrollOrigin);
- node->setScrollPosition(scrollingGeometry.scrollPosition);
- node->setTotalContentsSize(scrollingGeometry.contentSize);
</del><ins>+ if (scrollingGeometry) {
+ node->setScrollOrigin(scrollingGeometry->scrollOrigin);
+ node->setScrollPosition(scrollingGeometry->scrollPosition);
+ node->setTotalContentsSize(scrollingGeometry->contentSize);
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void AsyncScrollingCoordinator::updateViewportConstrainedNode(ScrollingNodeID nodeID, const ViewportConstraints& constraints, GraphicsLayer* graphicsLayer)
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingAsyncScrollingCoordinatorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/AsyncScrollingCoordinator.h (166347 => 166348)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/AsyncScrollingCoordinator.h 2014-03-27 06:22:48 UTC (rev 166347)
+++ trunk/Source/WebCore/page/scrolling/AsyncScrollingCoordinator.h 2014-03-27 06:50:40 UTC (rev 166348)
</span><span class="lines">@@ -87,7 +87,7 @@
</span><span class="cx"> virtual void clearStateTree() override;
</span><span class="cx">
</span><span class="cx"> virtual void updateViewportConstrainedNode(ScrollingNodeID, const ViewportConstraints&, GraphicsLayer*) override;
</span><del>- virtual void updateScrollingNode(ScrollingNodeID, GraphicsLayer*, GraphicsLayer* scrolledContentsLayer, GraphicsLayer* counterScrollingLayer, const ScrollingGeometry&) override;
</del><ins>+ virtual void updateScrollingNode(ScrollingNodeID, GraphicsLayer*, GraphicsLayer* scrolledContentsLayer, GraphicsLayer* counterScrollingLayer, const ScrollingGeometry* = nullptr) override;
</ins><span class="cx"> virtual String scrollingStateTreeAsText() const override;
</span><span class="cx"> virtual bool isRubberBandInProgress() const override;
</span><span class="cx"> virtual void setScrollPinningBehavior(ScrollPinningBehavior) override;
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingScrollingCoordinatorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ScrollingCoordinator.h (166347 => 166348)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ScrollingCoordinator.h 2014-03-27 06:22:48 UTC (rev 166347)
+++ trunk/Source/WebCore/page/scrolling/ScrollingCoordinator.h 2014-03-27 06:50:40 UTC (rev 166348)
</span><span class="lines">@@ -159,7 +159,7 @@
</span><span class="cx"> IntPoint scrollOrigin;
</span><span class="cx"> };
</span><span class="cx">
</span><del>- virtual void updateScrollingNode(ScrollingNodeID, GraphicsLayer* /*scrollLayer*/, GraphicsLayer* /*scrolledContentsLayer*/, GraphicsLayer* /*counterScrollingLayer*/, const ScrollingGeometry&) { }
</del><ins>+ virtual void updateScrollingNode(ScrollingNodeID, GraphicsLayer* /*scrollLayer*/, GraphicsLayer* /*scrolledContentsLayer*/, GraphicsLayer* /*counterScrollingLayer*/, const ScrollingGeometry* = nullptr) { }
</ins><span class="cx"> virtual void syncChildPositions(const LayoutRect&) { }
</span><span class="cx"> virtual String scrollingStateTreeAsText() const;
</span><span class="cx"> virtual bool isRubberBandInProgress() const { return false; }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerCompositorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp (166347 => 166348)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2014-03-27 06:22:48 UTC (rev 166347)
+++ trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2014-03-27 06:50:40 UTC (rev 166348)
</span><span class="lines">@@ -3520,22 +3520,18 @@
</span><span class="cx"> GraphicsLayer* scrolledContentsLayer = backing->scrollingContentsLayer();
</span><span class="cx"> GraphicsLayer* counterScrollingLayer = nullptr;
</span><span class="cx">
</span><del>- ScrollingCoordinator::ScrollingGeometry scrollingGeometry;
</del><span class="cx"> if (isRootLayer) {
</span><span class="cx"> scrollingLayer = m_scrollLayer.get();
</span><span class="cx"> scrolledContentsLayer = nullptr;
</span><span class="cx"> counterScrollingLayer = fixedRootBackgroundLayer();
</span><del>-
- scrollingGeometry.scrollOrigin = m_renderView.frameView().scrollOrigin();
- scrollingGeometry.scrollPosition = m_renderView.frameView().scrollPosition();
- scrollingGeometry.contentSize = m_renderView.frameView().totalContentsSize();
</del><ins>+ scrollingCoordinator->updateScrollingNode(nodeID, scrollingLayer, scrolledContentsLayer, counterScrollingLayer);
</ins><span class="cx"> } else {
</span><ins>+ ScrollingCoordinator::ScrollingGeometry scrollingGeometry;
</ins><span class="cx"> scrollingGeometry.scrollOrigin = layer.scrollOrigin();
</span><span class="cx"> scrollingGeometry.scrollPosition = layer.scrollPosition();
</span><span class="cx"> scrollingGeometry.contentSize = layer.contentsSize();
</span><ins>+ scrollingCoordinator->updateScrollingNode(nodeID, scrollingLayer, scrolledContentsLayer, counterScrollingLayer, &scrollingGeometry);
</ins><span class="cx"> }
</span><del>-
- scrollingCoordinator->updateScrollingNode(nodeID, scrollingLayer, scrolledContentsLayer, counterScrollingLayer, scrollingGeometry);
</del><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>