<!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>[185606] 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/185606">185606</a></dd>
<dt>Author</dt> <dd>bfulgham@apple.com</dd>
<dt>Date</dt> <dd>2015-06-16 13:44:18 -0700 (Tue, 16 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>CSS Scroll Snap - support snapping to nested elements
https://bugs.webkit.org/show_bug.cgi?id=145843
<rdar://problem/21339581>
Reviewed by Darin Adler.
Source/WebCore:
Tested by css3/scroll-snap/nested-elements.html
The Scroll Snap Point implementation was not properly handling nested elements.
This could be resolved by recursively calling 'appendChildSnapOffsets', but this
seemed like an inefficient approach, especially considering how often this method
is called during various scaling and other operations.
Instead, do the following:
(1) Add a new HashSet to RenderView that holds a collection of RenderElements that
have scroll-snap-coordinates.
(2) During RenderElement::styleWillChange, register all elements that have the
scroll-snap-coordinates style with the RenderView.
(3) When performing 'appendChildSnapOffsets', refer to the HashSet of elements, select the
subset of these entries relevant to the current scrolling container, and build up the
set of scroll-snap-coordinates needed for the current scrolling container.
* page/scrolling/AxisScrollSnapOffsets.cpp:
(WebCore::appendChildSnapOffsets): Check the scroll-snap-coordinate RenderElement HashSet
for the RenderView to find all elements that are children of the current scrolling container.
Add the scroll-snap-coordinates for these RenderElements to the current set of snap points.
* rendering/RenderElement.cpp:
(WebCore::findEnclosingScrollableContainer): New helper function.
(WebCore::RenderElement::styleWillChange): If the current element has scroll-snap-coordinate
defined, remember it for later so we can use it with the relevant scrolling container
after layout completes.
(WebCore::RenderElement::willBeRemovedFromTree): Unregister the current element from the
RenderView.
(WebCore::RenderElement::findEnclosingScrollableContainer): Added. Locate the relevant
scrolling container for the current object.
* rendering/RenderElement.h:
* rendering/RenderView.cpp:
(WebCore::Document::registerRenderElementWithScrollSnapCoordinates): Added.
(WebCore::Document::unregisterRenderElementWithScrollSnapCoordinates): Added.
* rendering/RenderView.h:
LayoutTests:
* css3/scroll-snap/nested-elements-expected.txt: Added.
* css3/scroll-snap/nested-elements.html: Added.
* css3/scroll-snap/scroll-snap-offsets-expected.txt: Updated to
account for 50%/50% scroll-snap-coordinates.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestscss3scrollsnapscrollsnapoffsetsexpectedtxt">trunk/LayoutTests/css3/scroll-snap/scroll-snap-offsets-expected.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorepagescrollingAxisScrollSnapOffsetscpp">trunk/Source/WebCore/page/scrolling/AxisScrollSnapOffsets.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBoxcpp">trunk/Source/WebCore/rendering/RenderBox.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBoxh">trunk/Source/WebCore/rendering/RenderBox.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderElementcpp">trunk/Source/WebCore/rendering/RenderElement.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderViewcpp">trunk/Source/WebCore/rendering/RenderView.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderViewh">trunk/Source/WebCore/rendering/RenderView.h</a></li>
<li><a href="#trunkWebKitxcworkspacexcshareddataxcschemesAllSourcetargetWebProcessxcscheme">trunk/WebKit.xcworkspace/xcshareddata/xcschemes/All Source (target WebProcess).xcscheme</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestscss3scrollsnapnestedelementsexpectedtxt">trunk/LayoutTests/css3/scroll-snap/nested-elements-expected.txt</a></li>
<li><a href="#trunkLayoutTestscss3scrollsnapnestedelementshtml">trunk/LayoutTests/css3/scroll-snap/nested-elements.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (185605 => 185606)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-06-16 20:27:51 UTC (rev 185605)
+++ trunk/LayoutTests/ChangeLog 2015-06-16 20:44:18 UTC (rev 185606)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2015-06-16 Brent Fulgham <bfulgham@apple.com>
+
+ CSS Scroll Snap - support snapping to nested elements
+ https://bugs.webkit.org/show_bug.cgi?id=145843
+ <rdar://problem/21339581>
+
+ Reviewed by Darin Adler.
+
+ * css3/scroll-snap/nested-elements-expected.txt: Added.
+ * css3/scroll-snap/nested-elements.html: Added.
+ * css3/scroll-snap/scroll-snap-offsets-expected.txt: Updated to
+ account for 50%/50% scroll-snap-coordinates.
+
</ins><span class="cx"> 2015-06-16 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> [IndexedDB] array index keys are concatenated across cursor lifetime
</span></span></pre></div>
<a id="trunkLayoutTestscss3scrollsnapnestedelementsexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/css3/scroll-snap/nested-elements-expected.txt (0 => 185606)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/scroll-snap/nested-elements-expected.txt (rev 0)
+++ trunk/LayoutTests/css3/scroll-snap/nested-elements-expected.txt 2015-06-16 20:44:18 UTC (rev 185606)
</span><span class="lines">@@ -0,0 +1,9 @@
</span><ins>+PASS successfullyParsed is true
+
+TEST COMPLETE
+Scroll-snap offsets for 'container': vertical = { 0, 101, 218, 335, 452, 569, 686, 803, 920, 1037, 1154, 1271, 1388, 1505, 1622, 1739, 1856, 1973, 2090, 2207, 4938 }
+PASS Scroll-snap offsets for 'invalidContainer': UNDEFINED
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestscss3scrollsnapnestedelementshtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/css3/scroll-snap/nested-elements.html (0 => 185606)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/scroll-snap/nested-elements.html (rev 0)
+++ trunk/LayoutTests/css3/scroll-snap/nested-elements.html 2015-06-16 20:44:18 UTC (rev 185606)
</span><span class="lines">@@ -0,0 +1,155 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+ <title>Snap points - nested snap coordinates</title>
+ <style>
+ .scrollable {
+ overflow: scroll;
+ -webkit-overflow-scrolling: touch;
+ border: 1px dashed black;
+ height: 300px;
+ margin: 0 10px;
+ }
+
+ .center-snap-receiver {
+ -webkit-scroll-snap-type: mandatory;
+ -webkit-scroll-snap-destination: 0 0;
+ }
+
+ .snap-point {
+ margin-top: 100px;
+ width: 15px;
+ height: 15px;
+ border: 1px solid black;
+ -webkit-scroll-snap-coordinate: 0 0px;
+ }
+
+ .snap-point::after {
+ font-size: 1em;
+ position: relative;
+ content: '+';
+ }
+
+ .nested > .snap-point {
+ margin-left: 50px;
+ border: 1px solid red;
+ }
+ .nested > .nested > .snap-point {
+ margin-left: 100px;
+ border: 1px solid blue;
+ }
+
+ .large-content {
+ height: 3000px;
+ width: 100%;
+ }
+
+ .small-content {
+ height: 200px;
+ width: 100%;
+ }
+
+ .invalidContainer {
+ border: 1px dashed black;
+ height: 300px;
+ margin: 0 10px;
+ opacity: 0.5;
+ overflow: hidden;
+ }
+ </style>
+ <script src="../../resources/js-test-pre.js"></script>
+ <script>
+ function runTest()
+ {
+ var container = document.getElementById('container');
+ debug("Scroll-snap offsets for 'container': " + window.internals.scrollSnapOffsets(container));
+
+ var invalidContainer = document.getElementById('invalidContainer');
+ try {
+ testFailed("Scroll-snap offsets for 'invalidContainer': " + window.internals.scrollSnapOffsets(invalidContainer));
+ } catch(ex) {
+ testPassed("Scroll-snap offsets for 'invalidContainer': UNDEFINED");
+ }
+
+ finishJSTest();
+ testRunner.notifyDone();
+ }
+
+ function onLoad()
+ {
+ if (window.testRunner) {
+ window.jsTestIsAsync = true;
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
+ setTimeout(runTest, 0);
+ }
+ }
+ </script>
+</head>
+<body onload="onLoad();">
+ <div id="container" class="center-snap-receiver scrollable">
+ <div class="snap-point"></div>
+ <div class="nested">
+ <div class="snap-point"></div>
+ </div>
+ <div class="nested">
+ <div class="nested">
+ <div class="snap-point"></div>
+ </div>
+ </div>
+ <div class="snap-point"></div>
+ <div class="snap-point"></div>
+ <div class="nested">
+ <div class="snap-point"></div>
+ </div>
+ <div class="nested">
+ <div class="nested">
+ <div class="snap-point"></div>
+ </div>
+ </div>
+ <div class="nested">
+ <div class="snap-point"></div>
+ </div>
+ <div class="snap-point"></div>
+ <div class="nested">
+ <div class="snap-point"></div>
+ </div>
+ <div class="snap-point"></div>
+ <div class="snap-point"></div>
+ <div class="nested">
+ <div class="snap-point"></div>
+ </div>
+ <div class="snap-point"></div>
+ <div class="nested">
+ <div class="snap-point"></div>
+ </div>
+ <div class="nested">
+ <div class="nested">
+ <div class="snap-point"></div>
+ </div>
+ </div>
+ <div class="snap-point"></div>
+ <div class="nested">
+ <div class="snap-point"></div>
+ </div>
+ <div class="nested">
+ <div class="nested">
+ <div class="snap-point"></div>
+ </div>
+ </div>
+ <div class="large-content"></div>
+ </div>
+ <div id="invalidContainer" class="center-snap-receiver invalidContainer">
+ <div class="snap-point"></div>
+ <div class="nested">
+ <div class="snap-point"></div>
+ </div>
+ <div class="nested">
+ <div class="nested">
+ <div class="snap-point"></div>
+ </div>
+ </div>
+ </div>
+ <script src="../../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestscss3scrollsnapscrollsnapoffsetsexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/css3/scroll-snap/scroll-snap-offsets-expected.txt (185605 => 185606)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/scroll-snap/scroll-snap-offsets-expected.txt 2015-06-16 20:27:51 UTC (rev 185605)
+++ trunk/LayoutTests/css3/scroll-snap/scroll-snap-offsets-expected.txt 2015-06-16 20:44:18 UTC (rev 185606)
</span><span class="lines">@@ -2,16 +2,16 @@
</span><span class="cx"> PASS successfullyParsed is true
</span><span class="cx">
</span><span class="cx"> TEST COMPLETE
</span><del>-Scroll-snap offsets for horizontalTarget: horizontal = { 0, 30, 60, 90, 120, 150 }, vertical = { 0, 15 }
-Scroll-snap offsets for verticalTarget: horizontal = { 0, 15 }, vertical = { 0, 30, 60, 90, 120, 150 }
-Scroll-snap offsets for horizontalBorderedTarget: horizontal = { 0, 30, 60, 90, 120, 150 }, vertical = { 0, 15 }
-Scroll-snap offsets for verticalBorderedTarget: horizontal = { 0, 15 }, vertical = { 0, 30, 60, 90, 120, 150 }
-Scroll-snap offsets for horizontalPaddedTarget: horizontal = { 0, 30, 60, 90, 120, 150, 170 }, vertical = { 0, 39 }
-Scroll-snap offsets for verticalPaddedTarget: horizontal = { 0, 35 }, vertical = { 0, 30, 60, 90, 120, 150, 174 }
-Scroll-snap offsets for horizontalBorderedPaddedTarget: horizontal = { 0, 30, 60, 90, 120, 150, 170 }, vertical = { 0, 39 }
-Scroll-snap offsets for verticalBorderedPaddedTarget: horizontal = { 0, 35 }, vertical = { 0, 30, 60, 90, 120, 150, 174 }
-Scroll-snap offsets for horizontalRotatedTarget: horizontal = { 0, 30, 60, 90, 120, 150, 170 }, vertical = { 0, 39 }
-Scroll-snap offsets for verticalRotatedTarget: horizontal = { 0, 35 }, vertical = { 0, 30, 60, 90, 120, 150, 174 }
</del><ins>+Scroll-snap offsets for horizontalTarget: horizontal = { 0, 30, 60, 90, 120, 150 }, vertical = { 0, 7, 15 }
+Scroll-snap offsets for verticalTarget: horizontal = { 0, 7, 15 }, vertical = { 0, 30, 60, 90, 120, 150 }
+Scroll-snap offsets for horizontalBorderedTarget: horizontal = { 0, 30, 60, 90, 120, 150 }, vertical = { 0, 7, 15 }
+Scroll-snap offsets for verticalBorderedTarget: horizontal = { 0, 7, 15 }, vertical = { 0, 30, 60, 90, 120, 150 }
+Scroll-snap offsets for horizontalPaddedTarget: horizontal = { 0, 30, 60, 90, 120, 150, 170 }, vertical = { 0, 7, 39 }
+Scroll-snap offsets for verticalPaddedTarget: horizontal = { 0, 7, 35 }, vertical = { 0, 30, 60, 90, 120, 150, 174 }
+Scroll-snap offsets for horizontalBorderedPaddedTarget: horizontal = { 0, 30, 60, 90, 120, 150, 170 }, vertical = { 0, 7, 39 }
+Scroll-snap offsets for verticalBorderedPaddedTarget: horizontal = { 0, 7, 35 }, vertical = { 0, 30, 60, 90, 120, 150, 174 }
+Scroll-snap offsets for horizontalRotatedTarget: horizontal = { 0, 30, 60, 90, 120, 150, 170 }, vertical = { 0, 7, 39 }
+Scroll-snap offsets for verticalRotatedTarget: horizontal = { 0, 7, 35 }, vertical = { 0, 30, 60, 90, 120, 150, 174 }
</ins><span class="cx"> PASS successfullyParsed is true
</span><span class="cx">
</span><span class="cx"> TEST COMPLETE
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (185605 => 185606)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-06-16 20:27:51 UTC (rev 185605)
+++ trunk/Source/WebCore/ChangeLog 2015-06-16 20:44:18 UTC (rev 185606)
</span><span class="lines">@@ -1,3 +1,46 @@
</span><ins>+2015-06-16 Brent Fulgham <bfulgham@apple.com>
+
+ CSS Scroll Snap - support snapping to nested elements
+ https://bugs.webkit.org/show_bug.cgi?id=145843
+ <rdar://problem/21339581>
+
+ Reviewed by Darin Adler.
+
+ Tested by css3/scroll-snap/nested-elements.html
+
+ The Scroll Snap Point implementation was not properly handling nested elements.
+ This could be resolved by recursively calling 'appendChildSnapOffsets', but this
+ seemed like an inefficient approach, especially considering how often this method
+ is called during various scaling and other operations.
+
+ Instead, do the following:
+ (1) Add a new HashSet to RenderView that holds a collection of RenderElements that
+ have scroll-snap-coordinates.
+ (2) During RenderElement::styleWillChange, register all elements that have the
+ scroll-snap-coordinates style with the RenderView.
+ (3) When performing 'appendChildSnapOffsets', refer to the HashSet of elements, select the
+ subset of these entries relevant to the current scrolling container, and build up the
+ set of scroll-snap-coordinates needed for the current scrolling container.
+
+ * page/scrolling/AxisScrollSnapOffsets.cpp:
+ (WebCore::appendChildSnapOffsets): Check the scroll-snap-coordinate RenderElement HashSet
+ for the RenderView to find all elements that are children of the current scrolling container.
+ Add the scroll-snap-coordinates for these RenderElements to the current set of snap points.
+ * rendering/RenderElement.cpp:
+ (WebCore::findEnclosingScrollableContainer): New helper function.
+ (WebCore::RenderElement::styleWillChange): If the current element has scroll-snap-coordinate
+ defined, remember it for later so we can use it with the relevant scrolling container
+ after layout completes.
+ (WebCore::RenderElement::willBeRemovedFromTree): Unregister the current element from the
+ RenderView.
+ (WebCore::RenderElement::findEnclosingScrollableContainer): Added. Locate the relevant
+ scrolling container for the current object.
+ * rendering/RenderElement.h:
+ * rendering/RenderView.cpp:
+ (WebCore::Document::registerRenderElementWithScrollSnapCoordinates): Added.
+ (WebCore::Document::unregisterRenderElementWithScrollSnapCoordinates): Added.
+ * rendering/RenderView.h:
+
</ins><span class="cx"> 2015-06-16 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> [IndexedDB] array index keys are concatenated across cursor lifetime
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingAxisScrollSnapOffsetscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/AxisScrollSnapOffsets.cpp (185605 => 185606)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/AxisScrollSnapOffsets.cpp 2015-06-16 20:27:51 UTC (rev 185605)
+++ trunk/Source/WebCore/page/scrolling/AxisScrollSnapOffsets.cpp 2015-06-16 20:44:18 UTC (rev 185606)
</span><span class="lines">@@ -31,6 +31,7 @@
</span><span class="cx"> #include "HTMLElement.h"
</span><span class="cx"> #include "Length.h"
</span><span class="cx"> #include "RenderBox.h"
</span><ins>+#include "RenderView.h"
</ins><span class="cx"> #include "ScrollableArea.h"
</span><span class="cx"> #include "StyleScrollSnapPoints.h"
</span><span class="cx">
</span><span class="lines">@@ -40,28 +41,34 @@
</span><span class="cx">
</span><span class="cx"> static void appendChildSnapOffsets(HTMLElement& parent, bool shouldAddHorizontalChildOffsets, Vector<LayoutUnit>& horizontalSnapOffsetSubsequence, bool shouldAddVerticalChildOffsets, Vector<LayoutUnit>& verticalSnapOffsetSubsequence)
</span><span class="cx"> {
</span><del>- // FIXME: Instead of traversing all children, register children with snap coordinates before appending to snapOffsetSubsequence.
- for (auto& child : childrenOfType<Element>(parent)) {
- if (RenderBox* box = child.renderBox()) {
- const auto& scrollSnapCoordinates = box->style().scrollSnapCoordinates();
- if (scrollSnapCoordinates.isEmpty())
- continue;
</del><ins>+ RenderElement* scrollContainer = parent.renderer();
+ ASSERT(scrollContainer);
+
+ RenderView& renderView = scrollContainer->view();
</ins><span class="cx">
</span><del>- LayoutRect viewSize = box->contentBoxRect();
- LayoutUnit viewWidth = viewSize.width();
- LayoutUnit viewHeight = viewSize.height();
- FloatPoint position = box->localToContainerPoint(FloatPoint(), parent.renderBox());
- LayoutUnit left = position.x();
- LayoutUnit top = position.y();
- for (auto& coordinate : scrollSnapCoordinates) {
- LayoutUnit lastPotentialSnapPositionX = left + valueForLength(coordinate.width(), viewWidth);
- if (shouldAddHorizontalChildOffsets && lastPotentialSnapPositionX > 0)
- horizontalSnapOffsetSubsequence.append(lastPotentialSnapPositionX);
</del><ins>+ Vector<const RenderBox*> elements;
+ for (auto& element : renderView.boxesWithScrollSnapCoordinates()) {
+ if (element->findEnclosingScrollableContainer() != scrollContainer)
+ continue;
</ins><span class="cx">
</span><del>- LayoutUnit lastPotentialSnapPositionY = top + valueForLength(coordinate.height(), viewHeight);
- if (shouldAddVerticalChildOffsets && lastPotentialSnapPositionY > 0)
- verticalSnapOffsetSubsequence.append(lastPotentialSnapPositionY);
- }
</del><ins>+ elements.append(element);
+ }
+
+ for (auto& box : elements) {
+ auto& scrollSnapCoordinates = box->style().scrollSnapCoordinates();
+ if (scrollSnapCoordinates.isEmpty())
+ continue;
+
+ LayoutRect viewSize = box->contentBoxRect();
+ FloatPoint position = box->localToContainerPoint(FloatPoint(), parent.renderBox());
+ for (auto& coordinate : scrollSnapCoordinates) {
+ LayoutUnit lastPotentialSnapPositionX = position.x() + valueForLength(coordinate.width(), viewSize.width());
+ if (shouldAddHorizontalChildOffsets && lastPotentialSnapPositionX > 0)
+ horizontalSnapOffsetSubsequence.append(lastPotentialSnapPositionX);
+
+ LayoutUnit lastPotentialSnapPositionY = position.y() + valueForLength(coordinate.height(), viewSize.height());
+ if (shouldAddVerticalChildOffsets && lastPotentialSnapPositionY > 0)
+ verticalSnapOffsetSubsequence.append(lastPotentialSnapPositionY);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBox.cpp (185605 => 185606)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBox.cpp 2015-06-16 20:27:51 UTC (rev 185605)
+++ trunk/Source/WebCore/rendering/RenderBox.cpp 2015-06-16 20:44:18 UTC (rev 185606)
</span><span class="lines">@@ -4948,4 +4948,14 @@
</span><span class="cx"> return containerBlock->offsetFromLogicalTopOfFirstPage() + logicalTop();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+const RenderBox* RenderBox::findEnclosingScrollableContainer() const
+{
+ for (auto& candidate : lineageOfType<RenderBox>(*this)) {
+ if (candidate.hasOverflowClip())
+ return &candidate;
+ }
+
+ return nullptr;
+}
+
</ins><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBoxh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBox.h (185605 => 185606)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBox.h 2015-06-16 20:27:51 UTC (rev 185605)
+++ trunk/Source/WebCore/rendering/RenderBox.h 2015-06-16 20:44:18 UTC (rev 185606)
</span><span class="lines">@@ -625,6 +625,8 @@
</span><span class="cx"> bool canHaveOutsideRegionRange() const { return !isInFlowRenderFlowThread(); }
</span><span class="cx"> virtual bool needsLayoutAfterRegionRangeChange() const { return false; }
</span><span class="cx">
</span><ins>+ const RenderBox* findEnclosingScrollableContainer() const;
+
</ins><span class="cx"> protected:
</span><span class="cx"> RenderBox(Element&, Ref<RenderStyle>&&, unsigned baseTypeFlags);
</span><span class="cx"> RenderBox(Document&, Ref<RenderStyle>&&, unsigned baseTypeFlags);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderElement.cpp (185605 => 185606)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderElement.cpp 2015-06-16 20:27:51 UTC (rev 185605)
+++ trunk/Source/WebCore/rendering/RenderElement.cpp 2015-06-16 20:44:18 UTC (rev 185606)
</span><span class="lines">@@ -3,7 +3,7 @@
</span><span class="cx"> * (C) 1999 Antti Koivisto (koivisto@kde.org)
</span><span class="cx"> * (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com)
</span><span class="cx"> * (C) 2005, 2006 Samuel Weinig (sam.weinig@gmail.com)
</span><del>- * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2013 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2013, 2015 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2010, 2012 Google Inc. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * This library is free software; you can redistribute it and/or
</span><span class="lines">@@ -904,6 +904,16 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if ENABLE(CSS_SCROLL_SNAP)
+ if (!newStyle.scrollSnapCoordinates().isEmpty() || (oldStyle && !oldStyle->scrollSnapCoordinates().isEmpty())) {
+ ASSERT(is<RenderBox>(this));
+ if (newStyle.scrollSnapCoordinates().isEmpty())
+ view().unregisterBoxWithScrollSnapCoordinates(downcast<RenderBox>(*this));
+ else
+ view().registerBoxWithScrollSnapCoordinates(downcast<RenderBox>(*this));
+ }
+#endif
+
</ins><span class="cx"> if (isRoot() || isBody())
</span><span class="cx"> view().frameView().updateExtendBackgroundIfNecessary();
</span><span class="cx"> }
</span><span class="lines">@@ -1058,6 +1068,14 @@
</span><span class="cx"> if (auto* containerFlowThread = parent()->renderNamedFlowThreadWrapper())
</span><span class="cx"> containerFlowThread->removeFlowChild(*this);
</span><span class="cx">
</span><ins>+
+#if ENABLE(CSS_SCROLL_SNAP)
+ if (!m_style->scrollSnapCoordinates().isEmpty()) {
+ ASSERT(is<RenderBox>(this));
+ view().unregisterBoxWithScrollSnapCoordinates(downcast<RenderBox>(*this));
+ }
+#endif
+
</ins><span class="cx"> RenderObject::willBeRemovedFromTree();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderView.cpp (185605 => 185606)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderView.cpp 2015-06-16 20:27:51 UTC (rev 185605)
+++ trunk/Source/WebCore/rendering/RenderView.cpp 2015-06-16 20:44:18 UTC (rev 185606)
</span><span class="lines">@@ -1428,4 +1428,16 @@
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if ENABLE(CSS_SCROLL_SNAP)
+void RenderView::registerBoxWithScrollSnapCoordinates(const RenderBox& box)
+{
+ m_boxesWithScrollSnapCoordinates.add(&box);
+}
+
+void RenderView::unregisterBoxWithScrollSnapCoordinates(const RenderBox& box)
+{
+ m_boxesWithScrollSnapCoordinates.remove(&box);
+}
+#endif
+
</ins><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderView.h (185605 => 185606)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderView.h 2015-06-16 20:27:51 UTC (rev 185605)
+++ trunk/Source/WebCore/rendering/RenderView.h 2015-06-16 20:44:18 UTC (rev 185606)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
</span><del>- * Copyright (C) 2006 Apple Inc.
</del><ins>+ * Copyright (C) 2006, 2015 Apple Inc.
</ins><span class="cx"> *
</span><span class="cx"> * This library is free software; you can redistribute it and/or
</span><span class="cx"> * modify it under the terms of the GNU Library General Public
</span><span class="lines">@@ -245,6 +245,12 @@
</span><span class="cx"> void protectRenderWidgetUntilLayoutIsDone(RenderWidget& widget) { m_protectedRenderWidgets.append(&widget); }
</span><span class="cx"> void releaseProtectedRenderWidgets() { m_protectedRenderWidgets.clear(); }
</span><span class="cx">
</span><ins>+#if ENABLE(CSS_SCROLL_SNAP)
+ void registerBoxWithScrollSnapCoordinates(const RenderBox&);
+ void unregisterBoxWithScrollSnapCoordinates(const RenderBox&);
+ const HashSet<const RenderBox*>& boxesWithScrollSnapCoordinates() { return m_boxesWithScrollSnapCoordinates; }
+#endif
+
</ins><span class="cx"> protected:
</span><span class="cx"> virtual void mapLocalToContainer(const RenderLayerModelObject* repaintContainer, TransformState&, MapCoordinatesFlags, bool* wasFixed) const override;
</span><span class="cx"> virtual const RenderObject* pushMappingToContainer(const RenderLayerModelObject* ancestorToStopAt, RenderGeometryMap&) const override;
</span><span class="lines">@@ -367,6 +373,9 @@
</span><span class="cx"> #if ENABLE(SERVICE_CONTROLS)
</span><span class="cx"> SelectionRectGatherer m_selectionRectGatherer;
</span><span class="cx"> #endif
</span><ins>+#if ENABLE(CSS_SCROLL_SNAP)
+ HashSet<const RenderBox*> m_boxesWithScrollSnapCoordinates;
+#endif
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> // Stack-based class to assist with LayoutState push/pop
</span></span></pre></div>
<a id="trunkWebKitxcworkspacexcshareddataxcschemesAllSourcetargetWebProcessxcscheme"></a>
<div class="modfile"><h4>Modified: trunk/WebKit.xcworkspace/xcshareddata/xcschemes/All Source (target WebProcess).xcscheme (185605 => 185606)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit.xcworkspace/xcshareddata/xcschemes/All Source (target WebProcess).xcscheme 2015-06-16 20:27:51 UTC (rev 185605)
+++ trunk/WebKit.xcworkspace/xcshareddata/xcschemes/All Source (target WebProcess).xcscheme 2015-06-16 20:44:18 UTC (rev 185606)
</span><span class="lines">@@ -153,6 +153,8 @@
</span><span class="cx"> ReferencedContainer = "container:Source/WebKit2/WebKit2.xcodeproj">
</span><span class="cx"> </BuildableReference>
</span><span class="cx"> </MacroExpansion>
</span><ins>+ <AdditionalOptions>
+ </AdditionalOptions>
</ins><span class="cx"> </TestAction>
</span><span class="cx"> <LaunchAction
</span><span class="cx"> selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
</span><span class="lines">@@ -162,8 +164,10 @@
</span><span class="cx"> buildConfiguration = "Debug"
</span><span class="cx"> ignoresPersistentStateOnLaunch = "NO"
</span><span class="cx"> debugDocumentVersioning = "YES"
</span><ins>+ debugServiceExtension = "internal"
</ins><span class="cx"> allowLocationSimulation = "YES">
</span><del>- <BuildableProductRunnable>
</del><ins>+ <BuildableProductRunnable
+ runnableDebuggingMode = "0">
</ins><span class="cx"> <BuildableReference
</span><span class="cx"> BuildableIdentifier = "primary"
</span><span class="cx"> BlueprintIdentifier = "1A50DB1D110A3BDC000D3FE5"
</span></span></pre>
</div>
</div>
</body>
</html>