<!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>[211387] 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/211387">211387</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2017-01-30 14:51:52 -0800 (Mon, 30 Jan 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>[iOS] position:fixed inside touch-scrollable overflow is mispositioned
https://bugs.webkit.org/show_bug.cgi?id=167604
Source/WebCore:
rdar://problem/29500273
Reviewed by Zalan Bujtas.
For layers inside touch-scrollable overflow, RenderLayerBacking::computeParentGraphicsLayerRect() needs
to account for the offset from the ancestor compositing layer's origin, to handle scrollable elements with
box-shadow, for example.
Also make the compositing log output a little easier to read.
Test: compositing/scrolling/fixed-inside-scroll.html
* rendering/RenderLayerBacking.cpp:
(WebCore::RenderLayerBacking::computeParentGraphicsLayerRect):
* rendering/RenderLayerCompositor.cpp:
(WebCore::RenderLayerCompositor::logLayerInfo):
Source/WebKit2:
rdar://problem/29500273
Reviewed by Zalan Bujtas.
Make sure we tell m_webPageProxy.computeCustomFixedPositionRect() when visual viewports are enabled.
* UIProcess/ios/RemoteScrollingCoordinatorProxyIOS.mm:
(WebKit::RemoteScrollingCoordinatorProxy::customFixedPositionRect):
LayoutTests:
Reviewed by Zalan Bujtas.
* compositing/scrolling/fixed-inside-scroll-expected.html: Added.
* compositing/scrolling/fixed-inside-scroll.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="#trunkSourceWebCorerenderingRenderLayerCompositorcpp">trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessiosRemoteScrollingCoordinatorProxyIOSmm">trunk/Source/WebKit2/UIProcess/ios/RemoteScrollingCoordinatorProxyIOS.mm</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestscompositingscrollingfixedinsidescrollexpectedhtml">trunk/LayoutTests/compositing/scrolling/fixed-inside-scroll-expected.html</a></li>
<li><a href="#trunkLayoutTestscompositingscrollingfixedinsidescrollhtml">trunk/LayoutTests/compositing/scrolling/fixed-inside-scroll.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (211386 => 211387)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2017-01-30 22:09:01 UTC (rev 211386)
+++ trunk/LayoutTests/ChangeLog 2017-01-30 22:51:52 UTC (rev 211387)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2017-01-30 Simon Fraser <simon.fraser@apple.com>
+
+ [iOS] position:fixed inside touch-scrollable overflow is mispositioned
+ https://bugs.webkit.org/show_bug.cgi?id=167604
+
+ Reviewed by Zalan Bujtas.
+
+ * compositing/scrolling/fixed-inside-scroll-expected.html: Added.
+ * compositing/scrolling/fixed-inside-scroll.html: Added.
+
</ins><span class="cx"> 2017-01-30 Matt Baker <mattbaker@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Need some limit on Async Call Stacks for async loops (rAF loops)
</span></span></pre></div>
<a id="trunkLayoutTestscompositingscrollingfixedinsidescrollexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/compositing/scrolling/fixed-inside-scroll-expected.html (0 => 211387)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/compositing/scrolling/fixed-inside-scroll-expected.html (rev 0)
+++ trunk/LayoutTests/compositing/scrolling/fixed-inside-scroll-expected.html 2017-01-30 22:51:52 UTC (rev 211387)
</span><span class="lines">@@ -0,0 +1,52 @@
</span><ins>+<!DOCTYPE html>
+
+<html>
+<head>
+ <style>
+ html {
+ -webkit-overflow-scrolling: touch;
+ }
+
+ .scroller {
+ height: 500px;
+ width: 300px;
+ margin: 50px;
+ border: 25px solid gray;
+ padding: 10px;
+ overflow: scroll;
+ box-shadow: 0 0 30px black;
+ }
+
+ .contents {
+ width: 400px;
+ height: 2000px;
+ }
+
+ .fixed {
+ position: absolute;
+ background-color: green;
+ left: 70px;
+ top: 70px;
+ height: 200px;
+ width: 200px;
+ }
+
+ .indicator {
+ position: absolute;
+ left: 70px;
+ top: 70px;
+ height: 200px;
+ width: 200px;
+ background-color: red;
+ }
+ </style>
+</head>
+<body>
+ <div class="indicator"></div>
+ <div id="scroller" class="scroller">
+ <div class="contents">
+ <div class="fixed box"></div>
+ </div>
+ </div>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestscompositingscrollingfixedinsidescrollhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/compositing/scrolling/fixed-inside-scroll.html (0 => 211387)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/compositing/scrolling/fixed-inside-scroll.html (rev 0)
+++ trunk/LayoutTests/compositing/scrolling/fixed-inside-scroll.html 2017-01-30 22:51:52 UTC (rev 211387)
</span><span class="lines">@@ -0,0 +1,52 @@
</span><ins>+<!DOCTYPE html>
+
+<html>
+<head>
+ <style>
+ html {
+ -webkit-overflow-scrolling: touch;
+ }
+
+ .scroller {
+ height: 500px;
+ width: 300px;
+ margin: 50px;
+ border: 25px solid gray;
+ padding: 10px;
+ overflow: scroll;
+ box-shadow: 0 0 30px black;
+ }
+
+ .contents {
+ width: 400px;
+ height: 2000px;
+ }
+
+ .fixed {
+ position: fixed;
+ background-color: green;
+ left: 70px;
+ top: 70px;
+ height: 200px;
+ width: 200px;
+ }
+
+ .indicator {
+ position: absolute;
+ left: 70px;
+ top: 70px;
+ height: 200px;
+ width: 200px;
+ background-color: red;
+ }
+ </style>
+</head>
+<body>
+ <div class="indicator"></div>
+ <div id="scroller" class="scroller">
+ <div class="contents">
+ <div class="fixed box"></div>
+ </div>
+ </div>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (211386 => 211387)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-01-30 22:09:01 UTC (rev 211386)
+++ trunk/Source/WebCore/ChangeLog 2017-01-30 22:51:52 UTC (rev 211387)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2017-01-30 Simon Fraser <simon.fraser@apple.com>
+
+ [iOS] position:fixed inside touch-scrollable overflow is mispositioned
+ https://bugs.webkit.org/show_bug.cgi?id=167604
+ rdar://problem/29500273
+
+ Reviewed by Zalan Bujtas.
+
+ For layers inside touch-scrollable overflow, RenderLayerBacking::computeParentGraphicsLayerRect() needs
+ to account for the offset from the ancestor compositing layer's origin, to handle scrollable elements with
+ box-shadow, for example.
+
+ Also make the compositing log output a little easier to read.
+
+ Test: compositing/scrolling/fixed-inside-scroll.html
+
+ * rendering/RenderLayerBacking.cpp:
+ (WebCore::RenderLayerBacking::computeParentGraphicsLayerRect):
+ * rendering/RenderLayerCompositor.cpp:
+ (WebCore::RenderLayerCompositor::logLayerInfo):
+
</ins><span class="cx"> 2017-01-30 Jer Noble <jer.noble@apple.com>
</span><span class="cx">
</span><span class="cx"> NULL-deref crash at PlatformMediaSession::endInterruption
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerBackingcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerBacking.cpp (211386 => 211387)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2017-01-30 22:09:01 UTC (rev 211386)
+++ trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2017-01-30 22:51:52 UTC (rev 211387)
</span><span class="lines">@@ -813,12 +813,11 @@
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> if (compositedAncestor->hasTouchScrollableOverflow()) {
</span><ins>+ LayoutRect ancestorCompositedBounds = ancestorBackingLayer->compositedBounds();
</ins><span class="cx"> auto& renderBox = downcast<RenderBox>(compositedAncestor->renderer());
</span><del>- LayoutRect paddingBox(renderBox.borderLeft(), renderBox.borderTop(),
- renderBox.width() - renderBox.borderLeft() - renderBox.borderRight(),
- renderBox.height() - renderBox.borderTop() - renderBox.borderBottom());
</del><ins>+ LayoutRect paddingBox(renderBox.borderLeft(), renderBox.borderTop(), renderBox.width() - renderBox.borderLeft() - renderBox.borderRight(), renderBox.height() - renderBox.borderTop() - renderBox.borderBottom());
</ins><span class="cx"> ScrollOffset scrollOffset = compositedAncestor->scrollOffset();
</span><del>- parentGraphicsLayerRect = LayoutRect((paddingBox.location() - toLayoutSize(scrollOffset)), paddingBox.size());
</del><ins>+ parentGraphicsLayerRect = LayoutRect((paddingBox.location() - toLayoutSize(ancestorCompositedBounds.location()) - toLayoutSize(scrollOffset)), paddingBox.size());
</ins><span class="cx"> }
</span><span class="cx"> #else
</span><span class="cx"> if (compositedAncestor->needsCompositedScrolling()) {
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerCompositorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp (211386 => 211387)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2017-01-30 22:09:01 UTC (rev 211386)
+++ trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2017-01-30 22:51:52 UTC (rev 211387)
</span><span class="lines">@@ -809,7 +809,7 @@
</span><span class="cx"> absoluteBounds.move(layer.offsetFromAncestor(m_renderView.layer()));
</span><span class="cx">
</span><span class="cx"> StringBuilder logString;
</span><del>- logString.append(String::format("%*p (%.6f,%.6f-%.6f,%.6f) %.2fKB", 12 + depth * 2, &layer,
</del><ins>+ logString.append(String::format("%*p (%.3f,%.3f-%.3f,%.3f) %.2fKB", 12 + depth * 2, &layer,
</ins><span class="cx"> absoluteBounds.x().toFloat(), absoluteBounds.y().toFloat(), absoluteBounds.maxX().toFloat(), absoluteBounds.maxY().toFloat(),
</span><span class="cx"> backing->backingStoreMemoryEstimate() / 1024));
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (211386 => 211387)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2017-01-30 22:09:01 UTC (rev 211386)
+++ trunk/Source/WebKit2/ChangeLog 2017-01-30 22:51:52 UTC (rev 211387)
</span><span class="lines">@@ -1,5 +1,18 @@
</span><span class="cx"> 2017-01-30 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><ins>+ [iOS] position:fixed inside touch-scrollable overflow is mispositioned
+ https://bugs.webkit.org/show_bug.cgi?id=167604
+ rdar://problem/29500273
+
+ Reviewed by Zalan Bujtas.
+
+ Make sure we tell m_webPageProxy.computeCustomFixedPositionRect() when visual viewports are enabled.
+
+ * UIProcess/ios/RemoteScrollingCoordinatorProxyIOS.mm:
+ (WebKit::RemoteScrollingCoordinatorProxy::customFixedPositionRect):
+
+2017-01-30 Simon Fraser <simon.fraser@apple.com>
+
</ins><span class="cx"> Fixed elements should not rubber-band in WK2, nor remain at negative offsets
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=167484
</span><span class="cx"> rdar://problem/29453068
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessiosRemoteScrollingCoordinatorProxyIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ios/RemoteScrollingCoordinatorProxyIOS.mm (211386 => 211387)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ios/RemoteScrollingCoordinatorProxyIOS.mm 2017-01-30 22:09:01 UTC (rev 211386)
+++ trunk/Source/WebKit2/UIProcess/ios/RemoteScrollingCoordinatorProxyIOS.mm 2017-01-30 22:51:52 UTC (rev 211387)
</span><span class="lines">@@ -95,7 +95,8 @@
</span><span class="cx">
</span><span class="cx"> FloatRect RemoteScrollingCoordinatorProxy::customFixedPositionRect() const
</span><span class="cx"> {
</span><del>- return m_webPageProxy.computeCustomFixedPositionRect(m_webPageProxy.unobscuredContentRect(), m_webPageProxy.unobscuredContentRectRespectingInputViewBounds(), m_webPageProxy.customFixedPositionRect(), m_webPageProxy.displayedContentScale());
</del><ins>+ return m_webPageProxy.computeCustomFixedPositionRect(m_webPageProxy.unobscuredContentRect(), m_webPageProxy.unobscuredContentRectRespectingInputViewBounds(), m_webPageProxy.customFixedPositionRect(),
+ m_webPageProxy.displayedContentScale(), WebPageProxy::UnobscuredRectConstraint::Unconstrained, visualViewportEnabled());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RemoteScrollingCoordinatorProxy::scrollingTreeNodeWillStartPanGesture()
</span></span></pre>
</div>
</div>
</body>
</html>