<!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>[211433] 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/211433">211433</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2017-01-31 08:09:38 -0800 (Tue, 31 Jan 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>REGRESSION (<a href="http://trac.webkit.org/projects/webkit/changeset/209411">r209411</a>): Scrolling to a fragment identifier in overflow:scroll inside position:fixed no longer works
https://bugs.webkit.org/show_bug.cgi?id=167630
rdar://problem/30091558
Reviewed by Zalan Bujtas.
Source/WebCore:
<a href="http://trac.webkit.org/projects/webkit/changeset/209411">r209411</a> added special handling for scrolling inside position:fixed, but cut off all scrolling, breaking
overflow:scroll inside position:fixed. Fix by only handling the position:fixed case when we get to
the root layer, which is where we scroll the document.
Test: fast/overflow/scroll-anchor-in-overflow-in-position-fixed.html
* rendering/RenderLayer.cpp:
(WebCore::RenderLayer::getRectToExpose):
LayoutTests:
* fast/overflow/scroll-anchor-in-overflow-in-position-fixed-expected.txt: Added.
* fast/overflow/scroll-anchor-in-overflow-in-position-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="#trunkSourceWebCorerenderingRenderLayercpp">trunk/Source/WebCore/rendering/RenderLayer.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastoverflowscrollanchorinoverflowinpositionfixedexpectedtxt">trunk/LayoutTests/fast/overflow/scroll-anchor-in-overflow-in-position-fixed-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastoverflowscrollanchorinoverflowinpositionfixedhtml">trunk/LayoutTests/fast/overflow/scroll-anchor-in-overflow-in-position-fixed.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (211432 => 211433)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2017-01-31 15:59:52 UTC (rev 211432)
+++ trunk/LayoutTests/ChangeLog 2017-01-31 16:09:38 UTC (rev 211433)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2017-01-31 Simon Fraser <simon.fraser@apple.com>
+
+ REGRESSION (r209411): Scrolling to a fragment identifier in overflow:scroll inside position:fixed no longer works
+ https://bugs.webkit.org/show_bug.cgi?id=167630
+ rdar://problem/30091558
+
+ Reviewed by Zalan Bujtas.
+
+ * fast/overflow/scroll-anchor-in-overflow-in-position-fixed-expected.txt: Added.
+ * fast/overflow/scroll-anchor-in-overflow-in-position-fixed.html: Added.
+
</ins><span class="cx"> 2017-01-31 Zan Dobersek <zdobersek@igalia.com>
</span><span class="cx">
</span><span class="cx"> [EME] InitDataRegistry should use base64url encoding and decoding for keyids
</span></span></pre></div>
<a id="trunkLayoutTestsfastoverflowscrollanchorinoverflowinpositionfixedexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/overflow/scroll-anchor-in-overflow-in-position-fixed-expected.txt (0 => 211433)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/overflow/scroll-anchor-in-overflow-in-position-fixed-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/overflow/scroll-anchor-in-overflow-in-position-fixed-expected.txt 2017-01-31 16:09:38 UTC (rev 211433)
</span><span class="lines">@@ -0,0 +1,13 @@
</span><ins>+Tests scrolling to an anchor inside overflow:scroll inside position:fixed correctly scrolls the overflow, and not the page
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS scroller.scrollTop is 465
+PASS scroller.scrollLeft is 0
+PASS document.scrollingElement.scrollTop is 800
+PASS document.scrollingElement.scrollLeft is 100
+PASS successfullyParsed is true
+
+TEST COMPLETE
+Anchor is here
</ins></span></pre></div>
<a id="trunkLayoutTestsfastoverflowscrollanchorinoverflowinpositionfixedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/overflow/scroll-anchor-in-overflow-in-position-fixed.html (0 => 211433)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/overflow/scroll-anchor-in-overflow-in-position-fixed.html (rev 0)
+++ trunk/LayoutTests/fast/overflow/scroll-anchor-in-overflow-in-position-fixed.html 2017-01-31 16:09:38 UTC (rev 211433)
</span><span class="lines">@@ -0,0 +1,76 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+ <style>
+ body {
+ height: 2000px;
+ width: 2000px;
+ }
+
+ .fixed {
+ position: fixed;
+ top: 250px;
+ left: 40px;
+ height: 200px;
+ width: 200px;
+ border: 1px solid black;
+ }
+
+ #scroller {
+ height: 100%;
+ width: 100%;
+ overflow: scroll;
+ }
+
+ #scroller > a {
+ display: block;
+ height: 50px;
+ margin-top: 600px;
+ }
+ </style>
+ <script src="../../resources/js-test-pre.js"></script>
+ <script>
+ description("Tests scrolling to an anchor inside overflow:scroll inside position:fixed correctly scrolls the overflow, and not the page");
+ window.jsTestIsAsync = true;
+
+ function runTest()
+ {
+ window.scrollTo(100, 800);
+ setTimeout(function() {
+ window.location='#anchor';
+ setTimeout(finishTest, 0);
+ }, 0);
+ }
+
+ var scroller;
+ function finishTest()
+ {
+ if (window.location.toString().indexOf("#") == -1) {
+ setTimeout(finishTest, 0);
+ return;
+ }
+
+ scroller = document.getElementById('scroller');
+
+ shouldBe('scroller.scrollTop', '465');
+ shouldBe('scroller.scrollLeft', '0');
+
+ shouldBe('document.scrollingElement.scrollTop', '800');
+ shouldBe('document.scrollingElement.scrollLeft', '100');
+
+ window.scrollTo(0, 0);
+ finishJSTest();
+ }
+ </script>
+</head>
+<body onload="runTest()">
+
+<div class="fixed">
+ <div id="scroller">
+ <a name="anchor">Anchor is here</a>
+ </div>
+</div>
+
+<script src="../../resources/js-test-post.js"></script>
+
+</body></html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (211432 => 211433)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-01-31 15:59:52 UTC (rev 211432)
+++ trunk/Source/WebCore/ChangeLog 2017-01-31 16:09:38 UTC (rev 211433)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2017-01-31 Simon Fraser <simon.fraser@apple.com>
+
+ REGRESSION (r209411): Scrolling to a fragment identifier in overflow:scroll inside position:fixed no longer works
+ https://bugs.webkit.org/show_bug.cgi?id=167630
+ rdar://problem/30091558
+
+ Reviewed by Zalan Bujtas.
+
+ r209411 added special handling for scrolling inside position:fixed, but cut off all scrolling, breaking
+ overflow:scroll inside position:fixed. Fix by only handling the position:fixed case when we get to
+ the root layer, which is where we scroll the document.
+
+ Test: fast/overflow/scroll-anchor-in-overflow-in-position-fixed.html
+
+ * rendering/RenderLayer.cpp:
+ (WebCore::RenderLayer::getRectToExpose):
+
</ins><span class="cx"> 2017-01-31 Zan Dobersek <zdobersek@igalia.com>
</span><span class="cx">
</span><span class="cx"> [EME] InitDataRegistry should use base64url encoding and decoding for keyids
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayer.cpp (211432 => 211433)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayer.cpp 2017-01-31 15:59:52 UTC (rev 211432)
+++ trunk/Source/WebCore/rendering/RenderLayer.cpp 2017-01-31 16:09:38 UTC (rev 211433)
</span><span class="lines">@@ -2602,7 +2602,7 @@
</span><span class="cx"> LayoutRect RenderLayer::getRectToExpose(const LayoutRect &visibleRect, const LayoutRect &exposeRect, bool insideFixed, const ScrollAlignment& alignX, const ScrollAlignment& alignY) const
</span><span class="cx"> {
</span><span class="cx"> FrameView& frameView = renderer().view().frameView();
</span><del>- if (insideFixed) {
</del><ins>+ if (renderer().isRenderView() && insideFixed) {
</ins><span class="cx"> // If the element is inside position:fixed and we're not scaled, no amount of scrolling is going to move things around.
</span><span class="cx"> if (frameView.frameScaleFactor() == 1)
</span><span class="cx"> return visibleRect;
</span></span></pre>
</div>
</div>
</body>
</html>