<!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>[204794] releases/WebKitGTK/webkit-2.12</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/204794">204794</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2016-08-23 03:15:08 -0700 (Tue, 23 Aug 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/203684">r203684</a> - The web process hangs when computing elements-based snap points for a container with large max scroll offset
https://bugs.webkit.org/show_bug.cgi?id=152605
<rdar://problem/25353661>
Reviewed by Simon Fraser.
Source/WebCore:
Fixes a bug in the computation of axis snap points. The ScrollSnapPoints object, which tracks
snap points along a particular axis, has two flags, hasRepeat and usesElements. For elements-
based snapping, both flags would be turned on, since StyleBuilderConverter::convertScrollSnapPoints
short-circuits for elements-based snapping and does not default usesRepeat to false. To address this,
we make ScrollSnapPoints not repeat(100%) by default.
Test: css3/scroll-snap/scroll-snap-elements-container-larger-than-children.html
* css/StyleBuilderConverter.h:
(WebCore::StyleBuilderConverter::convertScrollSnapPoints): Deleted.
* rendering/style/StyleScrollSnapPoints.cpp:
(WebCore::ScrollSnapPoints::ScrollSnapPoints):
LayoutTests:
Adds a scroll snap offset computation test case that would have previously
caused the web process to hang before this patch.
* css3/scroll-snap/scroll-snap-elements-container-larger-than-children-expected.txt: Added.
* css3/scroll-snap/scroll-snap-elements-container-larger-than-children.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit212LayoutTestsChangeLog">releases/WebKitGTK/webkit-2.12/LayoutTests/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit212SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit212SourceWebCorecssStyleBuilderConverterh">releases/WebKitGTK/webkit-2.12/Source/WebCore/css/StyleBuilderConverter.h</a></li>
<li><a href="#releasesWebKitGTKwebkit212SourceWebCorerenderingstyleStyleScrollSnapPointscpp">releases/WebKitGTK/webkit-2.12/Source/WebCore/rendering/style/StyleScrollSnapPoints.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit212LayoutTestscss3scrollsnapscrollsnapelementscontainerlargerthanchildrenexpectedtxt">releases/WebKitGTK/webkit-2.12/LayoutTests/css3/scroll-snap/scroll-snap-elements-container-larger-than-children-expected.txt</a></li>
<li><a href="#releasesWebKitGTKwebkit212LayoutTestscss3scrollsnapscrollsnapelementscontainerlargerthanchildrenhtml">releases/WebKitGTK/webkit-2.12/LayoutTests/css3/scroll-snap/scroll-snap-elements-container-larger-than-children.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit212LayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/LayoutTests/ChangeLog (204793 => 204794)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/LayoutTests/ChangeLog 2016-08-23 10:09:25 UTC (rev 204793)
+++ releases/WebKitGTK/webkit-2.12/LayoutTests/ChangeLog 2016-08-23 10:15:08 UTC (rev 204794)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2016-07-24 Wenson Hsieh <wenson_hsieh@apple.com>
+
+ The web process hangs when computing elements-based snap points for a container with large max scroll offset
+ https://bugs.webkit.org/show_bug.cgi?id=152605
+ <rdar://problem/25353661>
+
+ Reviewed by Simon Fraser.
+
+ Adds a scroll snap offset computation test case that would have previously
+ caused the web process to hang before this patch.
+
+ * css3/scroll-snap/scroll-snap-elements-container-larger-than-children-expected.txt: Added.
+ * css3/scroll-snap/scroll-snap-elements-container-larger-than-children.html: Added.
+
</ins><span class="cx"> 2016-06-30 Antoine Quint <graouts@apple.com>
</span><span class="cx">
</span><span class="cx"> Drawing an SVG image into a <canvas> that is not in the DOM draws the wrong region
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit212LayoutTestscss3scrollsnapscrollsnapelementscontainerlargerthanchildrenexpectedtxt"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.12/LayoutTests/css3/scroll-snap/scroll-snap-elements-container-larger-than-children-expected.txt (0 => 204794)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/LayoutTests/css3/scroll-snap/scroll-snap-elements-container-larger-than-children-expected.txt (rev 0)
+++ releases/WebKitGTK/webkit-2.12/LayoutTests/css3/scroll-snap/scroll-snap-elements-container-larger-than-children-expected.txt 2016-08-23 10:15:08 UTC (rev 204794)
</span><span class="lines">@@ -0,0 +1,8 @@
</span><ins>+PASS successfullyParsed is true
+
+TEST COMPLETE
+Scroll-snap offsets: horizontal = { 0, 200, 400, 600, 800, 1000, 1500 }
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit212LayoutTestscss3scrollsnapscrollsnapelementscontainerlargerthanchildrenhtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.12/LayoutTests/css3/scroll-snap/scroll-snap-elements-container-larger-than-children.html (0 => 204794)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/LayoutTests/css3/scroll-snap/scroll-snap-elements-container-larger-than-children.html (rev 0)
+++ releases/WebKitGTK/webkit-2.12/LayoutTests/css3/scroll-snap/scroll-snap-elements-container-larger-than-children.html 2016-08-23 10:15:08 UTC (rev 204794)
</span><span class="lines">@@ -0,0 +1,61 @@
</span><ins>+<!DOCTYPE html>
+<html>
+ <head>
+ <style>
+ #outer-container {
+ width: 300px;
+ height: 300px;
+ overflow-y: hidden;
+ overflow-x: auto;
+ -webkit-scroll-snap-points-x: elements;
+ -webkit-scroll-snap-type: mandatory;
+ }
+ #inner-container {
+ width: 1800px;
+ height: 300px;
+ }
+ .snap-child {
+ height: 300px;
+ float: left;
+ min-width: 200px;
+ -webkit-scroll-snap-coordinate: 0 0;
+ }
+ </style>
+ <script src="../../resources/js-test-pre.js"></script>
+ <script>
+ function runTest()
+ {
+ var container = document.getElementById("outer-container");
+ debug("Scroll-snap offsets: " + window.internals.scrollSnapOffsets(container));
+
+ finishJSTest();
+ testRunner.notifyDone();
+ }
+
+ function onLoad()
+ {
+ if (window.testRunner) {
+ window.jsTestIsAsync = true;
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
+ setTimeout(runTest, 0);
+ }
+ }
+ </script>
+ </head>
+ <body onload=onLoad()>
+ <div style="position: relative; height: 500px; width: 500px">
+ <div id="outer-container">
+ <div id="inner-container">
+ <div id="item0" class="snap-child"></div>
+ <div id="item1" class="snap-child"></div>
+ <div id="item2" class="snap-child"></div>
+ <div id="item3" class="snap-child"></div>
+ <div id="item4" class="snap-child"></div>
+ <div id="item5" class="snap-child"></div>
+ </div>
+ </div>
+ </div>
+ <script src="../../resources/js-test-post.js"></script>
+ </body>
+</html>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit212SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog (204793 => 204794)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog 2016-08-23 10:09:25 UTC (rev 204793)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog 2016-08-23 10:15:08 UTC (rev 204794)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2016-07-24 Wenson Hsieh <wenson_hsieh@apple.com>
+
+ The web process hangs when computing elements-based snap points for a container with large max scroll offset
+ https://bugs.webkit.org/show_bug.cgi?id=152605
+ <rdar://problem/25353661>
+
+ Reviewed by Simon Fraser.
+
+ Fixes a bug in the computation of axis snap points. The ScrollSnapPoints object, which tracks
+ snap points along a particular axis, has two flags, hasRepeat and usesElements. For elements-
+ based snapping, both flags would be turned on, since StyleBuilderConverter::convertScrollSnapPoints
+ short-circuits for elements-based snapping and does not default usesRepeat to false. To address this,
+ we make ScrollSnapPoints not repeat(100%) by default.
+
+ Test: css3/scroll-snap/scroll-snap-elements-container-larger-than-children.html
+
+ * css/StyleBuilderConverter.h:
+ (WebCore::StyleBuilderConverter::convertScrollSnapPoints): Deleted.
+ * rendering/style/StyleScrollSnapPoints.cpp:
+ (WebCore::ScrollSnapPoints::ScrollSnapPoints):
+
</ins><span class="cx"> 2016-06-30 Antoine Quint <graouts@apple.com>
</span><span class="cx">
</span><span class="cx"> Drawing an SVG image into a <canvas> that is not in the DOM draws the wrong region
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit212SourceWebCorecssStyleBuilderConverterh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/css/StyleBuilderConverter.h (204793 => 204794)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/Source/WebCore/css/StyleBuilderConverter.h 2016-08-23 10:09:25 UTC (rev 204793)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/css/StyleBuilderConverter.h 2016-08-23 10:15:08 UTC (rev 204794)
</span><span class="lines">@@ -735,7 +735,6 @@
</span><span class="cx"> return points;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- points->hasRepeat = false;
</del><span class="cx"> for (auto& currentValue : downcast<CSSValueList>(value)) {
</span><span class="cx"> auto& itemValue = downcast<CSSPrimitiveValue>(currentValue.get());
</span><span class="cx"> if (auto* lengthRepeat = itemValue.getLengthRepeatValue()) {
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit212SourceWebCorerenderingstyleStyleScrollSnapPointscpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/rendering/style/StyleScrollSnapPoints.cpp (204793 => 204794)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/Source/WebCore/rendering/style/StyleScrollSnapPoints.cpp 2016-08-23 10:09:25 UTC (rev 204793)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/rendering/style/StyleScrollSnapPoints.cpp 2016-08-23 10:15:08 UTC (rev 204794)
</span><span class="lines">@@ -31,8 +31,8 @@
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> ScrollSnapPoints::ScrollSnapPoints()
</span><del>- : repeatOffset(100, Percent)
- , hasRepeat(true)
</del><ins>+ : repeatOffset(0, Fixed)
+ , hasRepeat(false)
</ins><span class="cx"> , usesElements(false)
</span><span class="cx"> {
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>