<!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>[169430] 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/169430">169430</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2014-05-28 12:34:52 -0700 (Wed, 28 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[iOS WK2] Improve behavior of position:fixed inside accelerated overflow-scroll
https://bugs.webkit.org/show_bug.cgi?id=133352
Reviewed by Tim Horton.
Source/WebCore:
When adjusting layers inside accelerated overflow-scroll, pass a delta
down to descendant nodes. Fix behavior of sticky nodes inside fixed nodes
inside overflow scroll (sticky should only be affected if the parent node
is a scrolling node).
* page/scrolling/mac/ScrollingTreeFixedNode.mm:
(WebCore::ScrollingTreeFixedNode::updateLayersAfterAncestorChange): Just remove
some .get()
* page/scrolling/mac/ScrollingTreeStickyNode.mm:
(WebCore::ScrollingTreeStickyNode::updateLayersAfterAncestorChange): Remove .get()s.
We never care about the cumulative delta here, because sticky nodes only respond to
changes in their direct scrolling ancestors. Only adjust the layer if the parent
is a scrolling node.
Source/WebKit2:
Pass the correct delta down to descendant nodes.
* UIProcess/Scrolling/ios/ScrollingTreeOverflowScrollingNodeIOS.mm:
(WebKit::ScrollingTreeOverflowScrollingNodeIOS::updateChildNodesAfterScroll):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorepagescrollingmacScrollingTreeFixedNodemm">trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeFixedNode.mm</a></li>
<li><a href="#trunkSourceWebCorepagescrollingmacScrollingTreeStickyNodemm">trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeStickyNode.mm</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessScrollingiosScrollingTreeOverflowScrollingNodeIOSmm">trunk/Source/WebKit2/UIProcess/Scrolling/ios/ScrollingTreeOverflowScrollingNodeIOS.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (169429 => 169430)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-05-28 19:21:11 UTC (rev 169429)
+++ trunk/Source/WebCore/ChangeLog 2014-05-28 19:34:52 UTC (rev 169430)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2014-05-28 Simon Fraser <simon.fraser@apple.com>
+
+ [iOS WK2] Improve behavior of position:fixed inside accelerated overflow-scroll
+ https://bugs.webkit.org/show_bug.cgi?id=133352
+
+ Reviewed by Tim Horton.
+
+ When adjusting layers inside accelerated overflow-scroll, pass a delta
+ down to descendant nodes. Fix behavior of sticky nodes inside fixed nodes
+ inside overflow scroll (sticky should only be affected if the parent node
+ is a scrolling node).
+
+ * page/scrolling/mac/ScrollingTreeFixedNode.mm:
+ (WebCore::ScrollingTreeFixedNode::updateLayersAfterAncestorChange): Just remove
+ some .get()
+ * page/scrolling/mac/ScrollingTreeStickyNode.mm:
+ (WebCore::ScrollingTreeStickyNode::updateLayersAfterAncestorChange): Remove .get()s.
+ We never care about the cumulative delta here, because sticky nodes only respond to
+ changes in their direct scrolling ancestors. Only adjust the layer if the parent
+ is a scrolling node.
+
</ins><span class="cx"> 2014-05-27 Chris Fleizach <cfleizach@apple.com>
</span><span class="cx">
</span><span class="cx"> AX: WebKit does not recognize ARIA 1.1 tables
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingmacScrollingTreeFixedNodemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeFixedNode.mm (169429 => 169430)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeFixedNode.mm 2014-05-28 19:21:11 UTC (rev 169429)
+++ trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeFixedNode.mm 2014-05-28 19:34:52 UTC (rev 169430)
</span><span class="lines">@@ -69,10 +69,11 @@
</span><span class="cx"> FloatPoint layerPosition = m_constraints.layerPositionForViewportRect(fixedPositionRect);
</span><span class="cx"> layerPosition -= cumulativeDelta;
</span><span class="cx">
</span><del>- CGRect layerBounds = [m_layer.get() bounds];
- CGPoint anchorPoint = [m_layer.get() anchorPoint];
</del><ins>+ CGRect layerBounds = [m_layer bounds];
+ CGPoint anchorPoint = [m_layer anchorPoint];
</ins><span class="cx"> CGPoint newPosition = layerPosition - m_constraints.alignmentOffset() + anchorPoint * layerBounds.size;
</span><del>- [m_layer.get() setPosition:newPosition];
</del><ins>+
+ [m_layer setPosition:newPosition];
</ins><span class="cx">
</span><span class="cx"> if (!m_children)
</span><span class="cx"> return;
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingmacScrollingTreeStickyNodemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeStickyNode.mm (169429 => 169430)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeStickyNode.mm 2014-05-28 19:21:11 UTC (rev 169429)
+++ trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeStickyNode.mm 2014-05-28 19:34:52 UTC (rev 169430)
</span><span class="lines">@@ -67,29 +67,35 @@
</span><span class="cx">
</span><span class="cx"> void ScrollingTreeStickyNode::updateLayersAfterAncestorChange(const ScrollingTreeNode& changedNode, const FloatRect& fixedPositionRect, const FloatSize& cumulativeDelta)
</span><span class="cx"> {
</span><del>- FloatRect constrainingRect = fixedPositionRect;
- if (parent()->isOverflowScrollingNode())
</del><ins>+ bool adjustStickyLayer = false;
+ FloatRect constrainingRect;
+
+ if (parent()->isOverflowScrollingNode()) {
</ins><span class="cx"> constrainingRect = FloatRect(toScrollingTreeOverflowScrollingNode(parent())->scrollPosition(), m_constraints.constrainingRectAtLastLayout().size());
</span><ins>+ adjustStickyLayer = true;
+ } else if (parent()->isFrameScrollingNode()) {
+ constrainingRect = fixedPositionRect;
+ adjustStickyLayer = true;
+ }
</ins><span class="cx">
</span><del>- FloatPoint layerPosition = m_constraints.layerPositionForConstrainingRect(constrainingRect);
</del><ins>+ FloatSize deltaForDescendants = cumulativeDelta;
</ins><span class="cx">
</span><del>- // FIXME: Subtracting the cumulativeDelta is not totally sufficient to get the new position right for nested
- // sticky objects. We probably need a way to modify the containingBlockRect in the ViewportContraints
- // to get this right in all cases.
- layerPosition -= cumulativeDelta;
</del><ins>+ if (adjustStickyLayer) {
+ FloatPoint layerPosition = m_constraints.layerPositionForConstrainingRect(constrainingRect);
</ins><span class="cx">
</span><del>- CGRect layerBounds = [m_layer.get() bounds];
- CGPoint anchorPoint = [m_layer.get() anchorPoint];
- CGPoint newPosition = layerPosition - m_constraints.alignmentOffset() + anchorPoint * layerBounds.size;
- [m_layer.get() setPosition:newPosition];
</del><ins>+ CGRect layerBounds = [m_layer bounds];
+ CGPoint anchorPoint = [m_layer anchorPoint];
+ CGPoint newPosition = layerPosition - m_constraints.alignmentOffset() + anchorPoint * layerBounds.size;
+ [m_layer setPosition:newPosition];
</ins><span class="cx">
</span><ins>+ deltaForDescendants = layerPosition - m_constraints.layerPositionAtLastLayout() + cumulativeDelta;
+ }
+
</ins><span class="cx"> if (!m_children)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- FloatSize newDelta = layerPosition - m_constraints.layerPositionAtLastLayout() + cumulativeDelta;
-
</del><span class="cx"> for (auto& child : *m_children)
</span><del>- child->updateLayersAfterAncestorChange(changedNode, fixedPositionRect, newDelta);
</del><ins>+ child->updateLayersAfterAncestorChange(changedNode, fixedPositionRect, deltaForDescendants);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (169429 => 169430)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-05-28 19:21:11 UTC (rev 169429)
+++ trunk/Source/WebKit2/ChangeLog 2014-05-28 19:34:52 UTC (rev 169430)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2014-05-28 Simon Fraser <simon.fraser@apple.com>
+
+ [iOS WK2] Improve behavior of position:fixed inside accelerated overflow-scroll
+ https://bugs.webkit.org/show_bug.cgi?id=133352
+
+ Reviewed by Tim Horton.
+
+ Pass the correct delta down to descendant nodes.
+
+ * UIProcess/Scrolling/ios/ScrollingTreeOverflowScrollingNodeIOS.mm:
+ (WebKit::ScrollingTreeOverflowScrollingNodeIOS::updateChildNodesAfterScroll):
+
</ins><span class="cx"> 2014-05-28 Andy Estes <aestes@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS] REGRESSION (r168388): DidNotHandleTapAsClick not sent when commitPotentialTap() fails
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessScrollingiosScrollingTreeOverflowScrollingNodeIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Scrolling/ios/ScrollingTreeOverflowScrollingNodeIOS.mm (169429 => 169430)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Scrolling/ios/ScrollingTreeOverflowScrollingNodeIOS.mm 2014-05-28 19:21:11 UTC (rev 169429)
+++ trunk/Source/WebKit2/UIProcess/Scrolling/ios/ScrollingTreeOverflowScrollingNodeIOS.mm 2014-05-28 19:34:52 UTC (rev 169430)
</span><span class="lines">@@ -185,10 +185,10 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> FloatRect fixedPositionRect = scrollingTree().fixedPositionRect();
</span><ins>+ FloatSize scrollDelta = lastCommittedScrollPosition() - scrollPosition;
</ins><span class="cx">
</span><del>- size_t size = m_children->size();
- for (size_t i = 0; i < size; ++i)
- m_children->at(i)->updateLayersAfterAncestorChange(*this, fixedPositionRect, FloatSize());
</del><ins>+ for (auto& child : *m_children)
+ child->updateLayersAfterAncestorChange(*this, fixedPositionRect, scrollDelta);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ScrollingTreeOverflowScrollingNodeIOS::scrollViewDidScroll(const FloatPoint& scrollPosition, bool inUserInteration)
</span></span></pre>
</div>
</div>
</body>
</html>