<!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>[182799] trunk</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/182799">182799</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2015-04-14 10:25:31 -0700 (Tue, 14 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[iOS WK2] Interactive elements of developer.apple.com are broken
https://bugs.webkit.org/show_bug.cgi?id=143692
Source/WebCore:
rdar://problem/19320087
Reviewed by Sam Weinig.
When a composited RenderLayer had nodes in the scrolling tree by virtue of
both position and overflow:scroll, and one of those reasons disappeared,
we'd fail to remove the corresponding node from the scrolling tree. This
could leave an overflow:scroll element behaving as if it were position:fixed.
Fix by having RenderLayerCompositor::updateScrollCoordinationForThisFrame()
detach the layer on a per-role basis.
Test: platform/ios-simulator-wk2/scrolling/remove-scrolling-role.html
* rendering/RenderLayerBacking.cpp:
(WebCore::RenderLayerBacking::detachFromScrollingCoordinatorForRole):
* rendering/RenderLayerBacking.h:
* rendering/RenderLayerCompositor.cpp:
(WebCore::RenderLayerCompositor::detachScrollCoordinatedLayerForRole):
(WebCore::RenderLayerCompositor::detachScrollCoordinatedLayer): Just moved.
(WebCore::RenderLayerCompositor::updateScrollCoordinatedLayer): Call detachScrollCoordinatedLayerForRole()
if the layer doesn't have the relevant scrolling reasons.
* rendering/RenderLayerCompositor.h:
LayoutTests:
Reviewed by Sam Weinig.
* platform/ios-simulator-wk2/scrolling/remove-scrolling-role-expected.txt: Added.
* platform/ios-simulator-wk2/scrolling/remove-scrolling-role.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayerBackingcpp">trunk/Source/WebCore/rendering/RenderLayerBacking.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayerBackingh">trunk/Source/WebCore/rendering/RenderLayerBacking.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayerCompositorcpp">trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayerCompositorh">trunk/Source/WebCore/rendering/RenderLayerCompositor.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>trunk/LayoutTests/platform/ios-simulator-wk2/scrolling/</li>
<li><a href="#trunkLayoutTestsplatformiossimulatorwk2scrollingremovescrollingroleexpectedtxt">trunk/LayoutTests/platform/ios-simulator-wk2/scrolling/remove-scrolling-role-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformiossimulatorwk2scrollingremovescrollingrolehtml">trunk/LayoutTests/platform/ios-simulator-wk2/scrolling/remove-scrolling-role.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (182798 => 182799)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-04-14 17:07:11 UTC (rev 182798)
+++ trunk/LayoutTests/ChangeLog 2015-04-14 17:25:31 UTC (rev 182799)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-04-13 Simon Fraser <simon.fraser@apple.com>
+
+ [iOS WK2] Interactive elements of developer.apple.com are broken
+ https://bugs.webkit.org/show_bug.cgi?id=143692
+
+ Reviewed by Sam Weinig.
+
+ * platform/ios-simulator-wk2/scrolling/remove-scrolling-role-expected.txt: Added.
+ * platform/ios-simulator-wk2/scrolling/remove-scrolling-role.html: Added.
+
</ins><span class="cx"> 2015-04-14 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r182794.
</span></span></pre></div>
<a id="trunkLayoutTestsplatformiossimulatorwk2scrollingremovescrollingroleexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/platform/ios-simulator-wk2/scrolling/remove-scrolling-role-expected.txt (0 => 182799)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/ios-simulator-wk2/scrolling/remove-scrolling-role-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/ios-simulator-wk2/scrolling/remove-scrolling-role-expected.txt 2015-04-14 17:25:31 UTC (rev 182799)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+(Frame scrolling node
+ (scrollable area size 800 600)
+ (contents size 800 2513)
+ (children 1
+ (Overflow scrolling node
+ (scrollable area size 300 400)
+ (contents size 300 2000)
+ (scrolled contents layer 22)
+ )
+ )
+)
+
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformiossimulatorwk2scrollingremovescrollingrolehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/platform/ios-simulator-wk2/scrolling/remove-scrolling-role.html (0 => 182799)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/ios-simulator-wk2/scrolling/remove-scrolling-role.html (rev 0)
+++ trunk/LayoutTests/platform/ios-simulator-wk2/scrolling/remove-scrolling-role.html 2015-04-14 17:25:31 UTC (rev 182799)
</span><span class="lines">@@ -0,0 +1,63 @@
</span><ins>+<!DOCTYPE html>
+<html>
+
+<head>
+ <style>
+ body {
+ margin: 0;
+ height: 2500px;
+ }
+
+ #fixed {
+ position: fixed;
+ left: 10px;
+ top: 10px;
+ -webkit-overflow-scrolling: touch;
+ height: 400px;
+ width: 300px;
+ overflow: auto;
+ border: 4px solid black;
+ }
+
+ #fixed.changed {
+ position: absolute;
+ border: 4px solid green;
+ }
+
+ .content {
+ height: 2000px;
+ background-color: silver;
+ }
+
+ </style>
+ <script>
+ if (window.testRunner) {
+ testRunner.waitUntilDone();
+ testRunner.dumpAsText();
+ }
+
+ function doTest()
+ {
+ window.setTimeout(function() {
+ document.getElementById('fixed').classList.add('changed');
+
+ if (window.internals)
+ document.getElementById('results').innerText = internals.scrollingStateTreeAsText();
+
+ if (window.testRunner)
+ testRunner.notifyDone();
+
+ }, 0);
+ }
+
+ window.addEventListener('load', doTest, false);
+ </script>
+</head>
+<body>
+ <pre id="results"></pre>
+ <div id="fixed">
+ <div class="content">
+ </div>
+ </div>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (182798 => 182799)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-04-14 17:07:11 UTC (rev 182798)
+++ trunk/Source/WebCore/ChangeLog 2015-04-14 17:25:31 UTC (rev 182799)
</span><span class="lines">@@ -1,3 +1,31 @@
</span><ins>+2015-04-13 Simon Fraser <simon.fraser@apple.com>
+
+ [iOS WK2] Interactive elements of developer.apple.com are broken
+ https://bugs.webkit.org/show_bug.cgi?id=143692
+ rdar://problem/19320087
+
+ Reviewed by Sam Weinig.
+
+ When a composited RenderLayer had nodes in the scrolling tree by virtue of
+ both position and overflow:scroll, and one of those reasons disappeared,
+ we'd fail to remove the corresponding node from the scrolling tree. This
+ could leave an overflow:scroll element behaving as if it were position:fixed.
+
+ Fix by having RenderLayerCompositor::updateScrollCoordinationForThisFrame()
+ detach the layer on a per-role basis.
+
+ Test: platform/ios-simulator-wk2/scrolling/remove-scrolling-role.html
+
+ * rendering/RenderLayerBacking.cpp:
+ (WebCore::RenderLayerBacking::detachFromScrollingCoordinatorForRole):
+ * rendering/RenderLayerBacking.h:
+ * rendering/RenderLayerCompositor.cpp:
+ (WebCore::RenderLayerCompositor::detachScrollCoordinatedLayerForRole):
+ (WebCore::RenderLayerCompositor::detachScrollCoordinatedLayer): Just moved.
+ (WebCore::RenderLayerCompositor::updateScrollCoordinatedLayer): Call detachScrollCoordinatedLayerForRole()
+ if the layer doesn't have the relevant scrolling reasons.
+ * rendering/RenderLayerCompositor.h:
+
</ins><span class="cx"> 2015-04-14 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r182794.
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerBackingcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerBacking.cpp (182798 => 182799)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2015-04-14 17:07:11 UTC (rev 182798)
+++ trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2015-04-14 17:25:31 UTC (rev 182799)
</span><span class="lines">@@ -1570,6 +1570,20 @@
</span><span class="cx"> m_viewportConstrainedNodeID = 0;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void RenderLayerBacking::detachFromScrollingCoordinatorForRole(ScrollingNodeType role)
+{
+ ScrollingNodeID nodeID = scrollingNodeIDForRole(role);
+ if (!nodeID)
+ return;
+
+ ScrollingCoordinator* scrollingCoordinator = scrollingCoordinatorFromLayer(m_owningLayer);
+ if (!scrollingCoordinator)
+ return;
+
+ scrollingCoordinator->detachFromStateTree(nodeID);
+ setScrollingNodeIDForRole(0, role);
+}
+
</ins><span class="cx"> GraphicsLayerPaintingPhase RenderLayerBacking::paintingPhaseForPrimaryLayer() const
</span><span class="cx"> {
</span><span class="cx"> unsigned phase = 0;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerBackingh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerBacking.h (182798 => 182799)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerBacking.h 2015-04-14 17:07:11 UTC (rev 182798)
+++ trunk/Source/WebCore/rendering/RenderLayerBacking.h 2015-04-14 17:25:31 UTC (rev 182799)
</span><span class="lines">@@ -108,6 +108,7 @@
</span><span class="cx"> GraphicsLayer* scrollingContentsLayer() const { return m_scrollingContentsLayer.get(); }
</span><span class="cx">
</span><span class="cx"> void detachFromScrollingCoordinator();
</span><ins>+ void detachFromScrollingCoordinatorForRole(ScrollingNodeType);
</ins><span class="cx">
</span><span class="cx"> ScrollingNodeID scrollingNodeIDForRole(ScrollingNodeType nodeType) const
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerCompositorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp (182798 => 182799)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2015-04-14 17:07:11 UTC (rev 182798)
+++ trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2015-04-14 17:25:31 UTC (rev 182799)
</span><span class="lines">@@ -3813,6 +3813,33 @@
</span><span class="cx"> return nodeID;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void RenderLayerCompositor::detachScrollCoordinatedLayerForRole(RenderLayer& layer, ScrollingNodeType role)
+{
+ RenderLayerBacking* backing = layer.backing();
+ if (!backing)
+ return;
+
+ if (ScrollingNodeID nodeID = backing->scrollingNodeIDForRole(role))
+ m_scrollingNodeToLayerMap.remove(nodeID);
+
+ backing->detachFromScrollingCoordinatorForRole(role);
+}
+
+void RenderLayerCompositor::detachScrollCoordinatedLayer(RenderLayer& layer)
+{
+ RenderLayerBacking* backing = layer.backing();
+ if (!backing)
+ return;
+
+ if (ScrollingNodeID nodeID = backing->scrollingNodeIDForRole(FrameScrollingNode))
+ m_scrollingNodeToLayerMap.remove(nodeID);
+
+ if (ScrollingNodeID nodeID = backing->scrollingNodeIDForRole(FixedNode))
+ m_scrollingNodeToLayerMap.remove(nodeID);
+
+ backing->detachFromScrollingCoordinator();
+}
+
</ins><span class="cx"> void RenderLayerCompositor::updateScrollCoordinationForThisFrame(ScrollingNodeID parentNodeID)
</span><span class="cx"> {
</span><span class="cx"> ScrollingCoordinator* scrollingCoordinator = this->scrollingCoordinator();
</span><span class="lines">@@ -3883,7 +3910,8 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> parentNodeID = nodeID;
</span><del>- }
</del><ins>+ } else
+ detachScrollCoordinatedLayerForRole(layer, FixedNode);
</ins><span class="cx">
</span><span class="cx"> if (reasons & Scrolling) {
</span><span class="cx"> if (isRootLayer)
</span><span class="lines">@@ -3908,24 +3936,10 @@
</span><span class="cx"> #endif
</span><span class="cx"> scrollingCoordinator->updateOverflowScrollingNode(nodeID, backing->scrollingLayer(), backing->scrollingContentsLayer(), &scrollingGeometry);
</span><span class="cx"> }
</span><del>- }
</del><ins>+ } else
+ detachScrollCoordinatedLayerForRole(layer, OverflowScrollingNode);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void RenderLayerCompositor::detachScrollCoordinatedLayer(RenderLayer& layer)
-{
- RenderLayerBacking* backing = layer.backing();
- if (!backing)
- return;
-
- if (ScrollingNodeID nodeID = backing->scrollingNodeIDForRole(FrameScrollingNode))
- m_scrollingNodeToLayerMap.remove(nodeID);
-
- if (ScrollingNodeID nodeID = backing->scrollingNodeIDForRole(FixedNode))
- m_scrollingNodeToLayerMap.remove(nodeID);
-
- backing->detachFromScrollingCoordinator();
-}
-
</del><span class="cx"> ScrollableArea* RenderLayerCompositor::scrollableAreaForScrollLayerID(ScrollingNodeID nodeID) const
</span><span class="cx"> {
</span><span class="cx"> if (!nodeID)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerCompositorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerCompositor.h (182798 => 182799)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerCompositor.h 2015-04-14 17:07:11 UTC (rev 182798)
+++ trunk/Source/WebCore/rendering/RenderLayerCompositor.h 2015-04-14 17:25:31 UTC (rev 182799)
</span><span class="lines">@@ -434,6 +434,7 @@
</span><span class="cx"> ScrollingNodeID attachScrollingNode(RenderLayer&, ScrollingNodeType, ScrollingNodeID parentNodeID);
</span><span class="cx"> void updateScrollCoordinatedLayer(RenderLayer&, ScrollCoordinationReasons);
</span><span class="cx"> void detachScrollCoordinatedLayer(RenderLayer&);
</span><ins>+ void detachScrollCoordinatedLayerForRole(RenderLayer&, ScrollingNodeType);
</ins><span class="cx"> void reattachSubframeScrollLayers();
</span><span class="cx">
</span><span class="cx"> FixedPositionViewportConstraints computeFixedViewportConstraints(RenderLayer&) const;
</span></span></pre>
</div>
</div>
</body>
</html>