<!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>[171250] 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/171250">171250</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2014-07-18 17:00:52 -0700 (Fri, 18 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[iOS WK2] position:fixed in iframes with programmatic scroll could end up in the wrong place
https://bugs.webkit.org/show_bug.cgi?id=135078
Source/WebCore:
<rdar://problem/17401823>
Reviewed by Tim Horton.
When the UI-side scrolling tree receives a requested scroll position update, it scrolls
the node (e.g. a frame) then traverses child nodes to update them, e.g. for fixed position.
However, we would always use a viewport rect for the main document (from the scrolling tree),
which is not appropriate for subframes. Subframes should just use their own visible
rect to position fixed children.
Test: platform/mac-wk2/tiled-drawing/scrolling/frames/fixed-inside-frame.html
* page/scrolling/ios/ScrollingTreeFrameScrollingNodeIOS.mm:
(WebCore::ScrollingTreeFrameScrollingNodeIOS::updateChildNodesAfterScroll):
Source/WebKit2:
<rdar://problem/17401823>
Reviewed by Tim Horton.
Fix the logging of requested scroll position and frame scale factor.
* Shared/Scrolling/RemoteScrollingCoordinatorTransaction.cpp:
(WebKit::RemoteScrollingTreeTextStream::dump):
LayoutTests:
Reviewed by Tim Horton.
Test with position:fixed inside an iframe that scrolls programmatically.
* platform/mac-wk2/tiled-drawing/scrolling/frames/fixed-inside-frame-expected.txt: Added.
* platform/mac-wk2/tiled-drawing/scrolling/frames/fixed-inside-frame.html: Added.
* platform/mac-wk2/tiled-drawing/scrolling/frames/resources/autoscrolling-frame-with-fixed.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="#trunkSourceWebCorepagescrollingiosScrollingTreeFrameScrollingNodeIOSmm">trunk/Source/WebCore/page/scrolling/ios/ScrollingTreeFrameScrollingNodeIOS.mm</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedScrollingRemoteScrollingCoordinatorTransactioncpp">trunk/Source/WebKit2/Shared/Scrolling/RemoteScrollingCoordinatorTransaction.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsplatformmacwk2tileddrawingscrollingframesfixedinsideframeexpectedtxt">trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/frames/fixed-inside-frame-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk2tileddrawingscrollingframesfixedinsideframehtml">trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/frames/fixed-inside-frame.html</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk2tileddrawingscrollingframesresourcesautoscrollingframewithfixedhtml">trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/frames/resources/autoscrolling-frame-with-fixed.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (171249 => 171250)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-07-18 23:57:40 UTC (rev 171249)
+++ trunk/LayoutTests/ChangeLog 2014-07-19 00:00:52 UTC (rev 171250)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2014-07-18 Simon Fraser <simon.fraser@apple.com>
+
+ [iOS WK2] position:fixed in iframes with programmatic scroll could end up in the wrong place
+ https://bugs.webkit.org/show_bug.cgi?id=135078
+
+ Reviewed by Tim Horton.
+
+ Test with position:fixed inside an iframe that scrolls programmatically.
+
+ * platform/mac-wk2/tiled-drawing/scrolling/frames/fixed-inside-frame-expected.txt: Added.
+ * platform/mac-wk2/tiled-drawing/scrolling/frames/fixed-inside-frame.html: Added.
+ * platform/mac-wk2/tiled-drawing/scrolling/frames/resources/autoscrolling-frame-with-fixed.html: Added.
+
</ins><span class="cx"> 2014-07-18 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><span class="cx"> media/video-seek-with-negative-playback.html is flaky on Mac
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk2tileddrawingscrollingframesfixedinsideframeexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/frames/fixed-inside-frame-expected.txt (0 => 171250)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/frames/fixed-inside-frame-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/frames/fixed-inside-frame-expected.txt 2014-07-19 00:00:52 UTC (rev 171250)
</span><span class="lines">@@ -0,0 +1,75 @@
</span><ins>+
+(Frame scrolling node
+ (scrollable area size 785 600)
+ (contents size 785 657)
+ (non-fast-scrollable region
+ at (110,110) size 462x400)
+ (children 1
+ (Frame scrolling node
+ (scrollable area size 446 400)
+ (contents size 446 1016)
+ (requested scroll position 0 120)
+ (children 1
+ (Fixed node
+ (anchor edges: AnchorEdgeLeft AnchorEdgeTop)
+ (viewport rect at last layout: 0.00 120.00 446.00 400.00)
+ (layer position at last layout 10.00 130.00)
+ )
+ )
+ )
+ )
+)
+(GraphicsLayer
+ (anchor 0.00 0.00)
+ (bounds 785.00 657.00)
+ (children 1
+ (GraphicsLayer
+ (bounds 785.00 657.00)
+ (contentsOpaque 1)
+ (children 1
+ (GraphicsLayer
+ (position 80.00 80.00)
+ (bounds 522.00 460.00)
+ (drawsContent 1)
+ (children 1
+ (GraphicsLayer
+ (position 30.00 30.00)
+ (children 1
+ (GraphicsLayer
+ (anchor 0.00 0.00)
+ (bounds 446.00 400.00)
+ (children 1
+ (GraphicsLayer
+ (position 0.00 -120.00)
+ (children 1
+ (GraphicsLayer
+ (anchor 0.00 0.00)
+ (bounds 446.00 1016.00)
+ (children 1
+ (GraphicsLayer
+ (bounds 446.00 1016.00)
+ (drawsContent 1)
+ (children 1
+ (GraphicsLayer
+ (position 10.00 130.00)
+ (bounds 436.00 100.00)
+ (contentsOpaque 1)
+ (drawsContent 1)
+ )
+ )
+ )
+ )
+ )
+ )
+ )
+ )
+ )
+ )
+ )
+ )
+ )
+ )
+ )
+ )
+)
+
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk2tileddrawingscrollingframesfixedinsideframehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/frames/fixed-inside-frame.html (0 => 171250)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/frames/fixed-inside-frame.html (rev 0)
+++ trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/frames/fixed-inside-frame.html 2014-07-19 00:00:52 UTC (rev 171250)
</span><span class="lines">@@ -0,0 +1,41 @@
</span><ins>+<!DOCTYPE html>
+
+<html>
+<head>
+ <style>
+ iframe {
+ height: 400px;
+ width: 60%;
+ margin: 100px;
+ box-shadow: 0 0 20px black;
+ }
+
+ </style>
+ <script>
+ if (window.testRunner) {
+ testRunner.waitUntilDone();
+ testRunner.dumpAsText();
+ window.internals.settings.setScrollingTreeIncludesFrames(true);
+ }
+
+ function frameDidChange()
+ {
+ window.setTimeout(function() {
+ if (window.testRunner) {
+ var scrollingTree = internals.scrollingStateTreeAsText();
+ var layerTree = internals.layerTreeAsText(document);
+
+ var resultElement = document.getElementById('result');
+ resultElement.textContent = scrollingTree + layerTree;
+
+ testRunner.notifyDone();
+ }
+ }, 0);
+ }
+ </script>
+</head>
+<body>
+ <iframe src="resources/autoscrolling-frame-with-fixed.html" height="300" scrolling="yes"></iframe>
+<pre id="result">Results</pre>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk2tileddrawingscrollingframesresourcesautoscrollingframewithfixedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/frames/resources/autoscrolling-frame-with-fixed.html (0 => 171250)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/frames/resources/autoscrolling-frame-with-fixed.html (rev 0)
+++ trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/frames/resources/autoscrolling-frame-with-fixed.html 2014-07-19 00:00:52 UTC (rev 171250)
</span><span class="lines">@@ -0,0 +1,38 @@
</span><ins>+<!DOCTYPE html>
+
+<html>
+<head>
+ <style>
+ body {
+ height: 1000px;
+ background-image: repeating-linear-gradient(to bottom, silver, white 100px);
+ }
+
+ .fixed {
+ position: fixed;
+ left: 10px;
+ width: 600px;
+ top: 10px;
+ height: 100px;
+ background-color: gray;
+ }
+ </style>
+ <script>
+ function doScroll()
+ {
+ window.setTimeout(function() {
+ document.body.scrollTop = 120;
+ window.parent.frameDidChange();
+ }, 0);
+ }
+ window.addEventListener('load', doScroll, false);
+ </script>
+</head>
+<body>
+
+<div class="fixed">
+ Top bar
+</div>
+
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (171249 => 171250)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-07-18 23:57:40 UTC (rev 171249)
+++ trunk/Source/WebCore/ChangeLog 2014-07-19 00:00:52 UTC (rev 171250)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2014-07-18 Simon Fraser <simon.fraser@apple.com>
+
+ [iOS WK2] position:fixed in iframes with programmatic scroll could end up in the wrong place
+ https://bugs.webkit.org/show_bug.cgi?id=135078
+ <rdar://problem/17401823>
+
+ Reviewed by Tim Horton.
+
+ When the UI-side scrolling tree receives a requested scroll position update, it scrolls
+ the node (e.g. a frame) then traverses child nodes to update them, e.g. for fixed position.
+ However, we would always use a viewport rect for the main document (from the scrolling tree),
+ which is not appropriate for subframes. Subframes should just use their own visible
+ rect to position fixed children.
+
+ Test: platform/mac-wk2/tiled-drawing/scrolling/frames/fixed-inside-frame.html
+
+ * page/scrolling/ios/ScrollingTreeFrameScrollingNodeIOS.mm:
+ (WebCore::ScrollingTreeFrameScrollingNodeIOS::updateChildNodesAfterScroll):
+
</ins><span class="cx"> 2014-07-18 Beth Dakin <bdakin@apple.com>
</span><span class="cx">
</span><span class="cx"> Fixed position elements are misplaced when a WK1 view has contentInsets set
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingiosScrollingTreeFrameScrollingNodeIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ios/ScrollingTreeFrameScrollingNodeIOS.mm (171249 => 171250)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ios/ScrollingTreeFrameScrollingNodeIOS.mm 2014-07-18 23:57:40 UTC (rev 171249)
+++ trunk/Source/WebCore/page/scrolling/ios/ScrollingTreeFrameScrollingNodeIOS.mm 2014-07-19 00:00:52 UTC (rev 171250)
</span><span class="lines">@@ -170,8 +170,13 @@
</span><span class="cx"> if (!m_children)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- FloatRect fixedPositionRect = scrollingTree().fixedPositionRect();
-
</del><ins>+
+ FloatRect fixedPositionRect;
+ if (!parent())
+ fixedPositionRect = scrollingTree().fixedPositionRect();
+ else
+ fixedPositionRect = FloatRect(scrollOffset, scrollableAreaSize());
+
</ins><span class="cx"> for (auto& child : *m_children)
</span><span class="cx"> child->updateLayersAfterAncestorChange(*this, fixedPositionRect, FloatSize());
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (171249 => 171250)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-07-18 23:57:40 UTC (rev 171249)
+++ trunk/Source/WebKit2/ChangeLog 2014-07-19 00:00:52 UTC (rev 171250)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2014-07-18 Simon Fraser <simon.fraser@apple.com>
+
+ [iOS WK2] position:fixed in iframes with programmatic scroll could end up in the wrong place
+ https://bugs.webkit.org/show_bug.cgi?id=135078
+ <rdar://problem/17401823>
+
+ Reviewed by Tim Horton.
+
+ Fix the logging of requested scroll position and frame scale factor.
+
+ * Shared/Scrolling/RemoteScrollingCoordinatorTransaction.cpp:
+ (WebKit::RemoteScrollingTreeTextStream::dump):
+
</ins><span class="cx"> 2014-07-18 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> [Cocoa] Use RetainPtr in _WKRemoteObjectInterface
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedScrollingRemoteScrollingCoordinatorTransactioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/Scrolling/RemoteScrollingCoordinatorTransaction.cpp (171249 => 171250)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/Scrolling/RemoteScrollingCoordinatorTransaction.cpp 2014-07-18 23:57:40 UTC (rev 171249)
+++ trunk/Source/WebKit2/Shared/Scrolling/RemoteScrollingCoordinatorTransaction.cpp 2014-07-19 00:00:52 UTC (rev 171250)
</span><span class="lines">@@ -581,7 +581,6 @@
</span><span class="cx"> if (!changedPropertiesOnly || node.hasChangedProperty(ScrollingStateScrollingNode::ScrollOrigin))
</span><span class="cx"> dumpProperty(ts, "scroll-origin", node.scrollOrigin());
</span><span class="cx">
</span><del>- if (!changedPropertiesOnly || node.hasChangedProperty(ScrollingStateFrameScrollingNode::FrameScaleFactor))
</del><span class="cx"> if (!changedPropertiesOnly || node.hasChangedProperty(ScrollingStateScrollingNode::RequestedScrollPosition)) {
</span><span class="cx"> dumpProperty(ts, "requested-scroll-position", node.requestedScrollPosition());
</span><span class="cx"> dumpProperty(ts, "requested-scroll-position-is-programatic", node.requestedScrollPositionRepresentsProgrammaticScroll());
</span><span class="lines">@@ -627,6 +626,9 @@
</span><span class="cx"> if (!changedPropertiesOnly || node.hasChangedProperty(ScrollingStateFrameScrollingNode::TopContentInset))
</span><span class="cx"> dumpProperty(ts, "top-content-inset", node.topContentInset());
</span><span class="cx">
</span><ins>+ if (!changedPropertiesOnly || node.hasChangedProperty(ScrollingStateFrameScrollingNode::FrameScaleFactor))
+ dumpProperty(ts, "frame-scale-factor", node.frameScaleFactor());
+
</ins><span class="cx"> if (!changedPropertiesOnly || node.hasChangedProperty(ScrollingStateFrameScrollingNode::ScrolledContentsLayer))
</span><span class="cx"> dumpProperty(ts, "scrolled-contents-layer", static_cast<GraphicsLayer::PlatformLayerID>(node.scrolledContentsLayer()));
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>