<!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>[186865] 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/186865">186865</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-07-15 15:33:44 -0700 (Wed, 15 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Scroll snapping to elements is broken for main frame scrolling
https://bugs.webkit.org/show_bug.cgi?id=146957
Patch by Wenson Hsieh <wenson_hsieh@apple.com> on 2015-07-15
Reviewed by Brent Fulgham.
Source/WebCore:
Fixes the case of elements with scroll snap coordinates in a scroll snapping mainframe by changing
RenderBox::findEnclosingScrollableContainer to return the body's RenderBox when all enclosing elements
are not overflow scrollable but the mainframe can scroll.
Test: css3/scroll-snap/scroll-snap-coordinate-mainframe.html
* page/FrameView.h: Export isScrollable so that the Internals API can use it.
* rendering/RenderBox.cpp: Include MainFrame.h.
(WebCore::RenderBox::findEnclosingScrollableContainer): Changed to return the body's RenderBox if
none of its parent elements are overflow scrolling.
* testing/Internals.cpp:
(WebCore::Internals::scrollSnapOffsets): Updated to return snap offsets for the body element,
allowing us to call window.internals.scrollSnapOffsets(document.body).
LayoutTests:
Tests that basic scroll snap coordinates in the mainframe works.
* css3/scroll-snap/scroll-snap-coordinate-mainframe-expected.txt: Added.
* css3/scroll-snap/scroll-snap-coordinate-mainframe.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="#trunkSourceWebCorepageFrameViewh">trunk/Source/WebCore/page/FrameView.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBoxcpp">trunk/Source/WebCore/rendering/RenderBox.cpp</a></li>
<li><a href="#trunkSourceWebCoretestingInternalscpp">trunk/Source/WebCore/testing/Internals.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestscss3scrollsnapscrollsnapcoordinatemainframeexpectedtxt">trunk/LayoutTests/css3/scroll-snap/scroll-snap-coordinate-mainframe-expected.txt</a></li>
<li><a href="#trunkLayoutTestscss3scrollsnapscrollsnapcoordinatemainframehtml">trunk/LayoutTests/css3/scroll-snap/scroll-snap-coordinate-mainframe.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (186864 => 186865)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-07-15 22:30:00 UTC (rev 186864)
+++ trunk/LayoutTests/ChangeLog 2015-07-15 22:33:44 UTC (rev 186865)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2015-07-15 Wenson Hsieh <wenson_hsieh@apple.com>
+
+ Scroll snapping to elements is broken for main frame scrolling
+ https://bugs.webkit.org/show_bug.cgi?id=146957
+
+ Reviewed by Brent Fulgham.
+
+ Tests that basic scroll snap coordinates in the mainframe works.
+
+ * css3/scroll-snap/scroll-snap-coordinate-mainframe-expected.txt: Added.
+ * css3/scroll-snap/scroll-snap-coordinate-mainframe.html: Added.
+
</ins><span class="cx"> 2015-07-15 Saam barati <saambarati1@gmail.com>
</span><span class="cx">
</span><span class="cx"> [ES6] implement block scoping to enable 'let'
</span></span></pre></div>
<a id="trunkLayoutTestscss3scrollsnapscrollsnapcoordinatemainframeexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/css3/scroll-snap/scroll-snap-coordinate-mainframe-expected.txt (0 => 186865)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/scroll-snap/scroll-snap-coordinate-mainframe-expected.txt (rev 0)
+++ trunk/LayoutTests/css3/scroll-snap/scroll-snap-coordinate-mainframe-expected.txt 2015-07-15 22:33:44 UTC (rev 186865)
</span><span class="lines">@@ -0,0 +1,8 @@
</span><ins>+PASS successfullyParsed is true
+
+TEST COMPLETE
+Scroll-snap offsets: vertical = { 0, 600, 1200, 1800, 2400, 3000 }
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestscss3scrollsnapscrollsnapcoordinatemainframehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/css3/scroll-snap/scroll-snap-coordinate-mainframe.html (0 => 186865)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/scroll-snap/scroll-snap-coordinate-mainframe.html (rev 0)
+++ trunk/LayoutTests/css3/scroll-snap/scroll-snap-coordinate-mainframe.html 2015-07-15 22:33:44 UTC (rev 186865)
</span><span class="lines">@@ -0,0 +1,47 @@
</span><ins>+<html>
+
+<head>
+ <style>
+ body {
+ margin: 0;
+ -webkit-scroll-snap-type: mandatory;
+ }
+
+ .vertical {
+ width: 100%;
+ height: 600px;
+ -webkit-scroll-snap-coordinate: 0px 0px;
+ }
+ </style>
+
+ <script src="../../resources/js-test-pre.js"></script>
+ <script>
+ function runTest()
+ {
+ debug("Scroll-snap offsets: " + window.internals.scrollSnapOffsets(document.body));
+ finishJSTest();
+ }
+
+ function setup()
+ {
+ if (window.testRunner) {
+ window.jsTestIsAsync = true;
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
+ setTimeout(runTest, 0);
+ }
+ }
+ </script>
+</head>
+
+<body onload="setup()">
+ <div id="child00" class="vertical"><div id="console"></div></div>
+ <div id="child01" class="vertical"></div>
+ <div id="child02" class="vertical"></div>
+ <div id="child03" class="vertical"></div>
+ <div id="child04" class="vertical"></div>
+ <div id="child05" class="vertical"></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 (186864 => 186865)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-07-15 22:30:00 UTC (rev 186864)
+++ trunk/Source/WebCore/ChangeLog 2015-07-15 22:33:44 UTC (rev 186865)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2015-07-15 Wenson Hsieh <wenson_hsieh@apple.com>
+
+ Scroll snapping to elements is broken for main frame scrolling
+ https://bugs.webkit.org/show_bug.cgi?id=146957
+
+ Reviewed by Brent Fulgham.
+
+ Fixes the case of elements with scroll snap coordinates in a scroll snapping mainframe by changing
+ RenderBox::findEnclosingScrollableContainer to return the body's RenderBox when all enclosing elements
+ are not overflow scrollable but the mainframe can scroll.
+
+ Test: css3/scroll-snap/scroll-snap-coordinate-mainframe.html
+
+ * page/FrameView.h: Export isScrollable so that the Internals API can use it.
+ * rendering/RenderBox.cpp: Include MainFrame.h.
+ (WebCore::RenderBox::findEnclosingScrollableContainer): Changed to return the body's RenderBox if
+ none of its parent elements are overflow scrolling.
+ * testing/Internals.cpp:
+ (WebCore::Internals::scrollSnapOffsets): Updated to return snap offsets for the body element,
+ allowing us to call window.internals.scrollSnapOffsets(document.body).
+
</ins><span class="cx"> 2015-07-15 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> WebKit document.cookie mis-parsing.
</span></span></pre></div>
<a id="trunkSourceWebCorepageFrameViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/FrameView.h (186864 => 186865)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/FrameView.h 2015-07-15 22:30:00 UTC (rev 186864)
+++ trunk/Source/WebCore/page/FrameView.h 2015-07-15 22:33:44 UTC (rev 186865)
</span><span class="lines">@@ -429,7 +429,7 @@
</span><span class="cx"> // to rubber-band, which the main frame might be allowed to do even if there is no content to scroll to. In that case,
</span><span class="cx"> // callers use Scrollability::ScrollableOrRubberbandable.
</span><span class="cx"> enum class Scrollability { Scrollable, ScrollableOrRubberbandable };
</span><del>- bool isScrollable(Scrollability definitionOfScrollable = Scrollability::Scrollable);
</del><ins>+ WEBCORE_EXPORT bool isScrollable(Scrollability definitionOfScrollable = Scrollability::Scrollable);
</ins><span class="cx">
</span><span class="cx"> virtual bool isScrollableOrRubberbandable() override;
</span><span class="cx"> virtual bool hasScrollableOrRubberbandableAncestor() override;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBox.cpp (186864 => 186865)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBox.cpp 2015-07-15 22:30:00 UTC (rev 186864)
+++ trunk/Source/WebCore/rendering/RenderBox.cpp 2015-07-15 22:33:44 UTC (rev 186865)
</span><span class="lines">@@ -43,6 +43,7 @@
</span><span class="cx"> #include "HTMLTextAreaElement.h"
</span><span class="cx"> #include "HitTestResult.h"
</span><span class="cx"> #include "InlineElementBox.h"
</span><ins>+#include "MainFrame.h"
</ins><span class="cx"> #include "Page.h"
</span><span class="cx"> #include "PaintInfo.h"
</span><span class="cx"> #include "RenderBoxRegionInfo.h"
</span><span class="lines">@@ -5003,6 +5004,9 @@
</span><span class="cx"> if (candidate.hasOverflowClip())
</span><span class="cx"> return &candidate;
</span><span class="cx"> }
</span><ins>+ // If all parent elements are not overflow scrollable, check the body.
+ if (document().body() && frame().mainFrame().view() && frame().mainFrame().view()->isScrollable())
+ return document().body()->renderBox();
</ins><span class="cx">
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/Internals.cpp (186864 => 186865)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/Internals.cpp 2015-07-15 22:30:00 UTC (rev 186864)
+++ trunk/Source/WebCore/testing/Internals.cpp 2015-07-15 22:33:44 UTC (rev 186865)
</span><span class="lines">@@ -2887,29 +2887,40 @@
</span><span class="cx"> return String();
</span><span class="cx">
</span><span class="cx"> RenderBox& box = *element->renderBox();
</span><del>- if (!box.canBeScrolledAndHasScrollableArea()) {
- ec = INVALID_ACCESS_ERR;
- return String();
</del><ins>+ ScrollableArea* scrollableArea;
+
+ if (box.isBody()) {
+ FrameView* frameView = box.frame().mainFrame().view();
+ if (!frameView || !frameView->isScrollable()) {
+ ec = INVALID_ACCESS_ERR;
+ return String();
+ }
+ scrollableArea = frameView;
+
+ } else {
+ if (!box.canBeScrolledAndHasScrollableArea()) {
+ ec = INVALID_ACCESS_ERR;
+ return String();
+ }
+ scrollableArea = box.layer();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- if (!box.layer())
</del><ins>+ if (!scrollableArea)
</ins><span class="cx"> return String();
</span><span class="cx">
</span><del>- ScrollableArea& scrollableArea = *box.layer();
-
</del><span class="cx"> StringBuilder result;
</span><span class="cx">
</span><del>- if (scrollableArea.horizontalSnapOffsets()) {
</del><ins>+ if (scrollableArea->horizontalSnapOffsets()) {
</ins><span class="cx"> result.append("horizontal = ");
</span><del>- appendOffsets(result, *scrollableArea.horizontalSnapOffsets());
</del><ins>+ appendOffsets(result, *scrollableArea->horizontalSnapOffsets());
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- if (scrollableArea.verticalSnapOffsets()) {
</del><ins>+ if (scrollableArea->verticalSnapOffsets()) {
</ins><span class="cx"> if (result.length())
</span><span class="cx"> result.append(", ");
</span><span class="cx">
</span><span class="cx"> result.append("vertical = ");
</span><del>- appendOffsets(result, *scrollableArea.verticalSnapOffsets());
</del><ins>+ appendOffsets(result, *scrollableArea->verticalSnapOffsets());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return result.toString();
</span></span></pre>
</div>
</div>
</body>
</html>