<!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>[188784] branches/safari-601.1.46-branch</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/188784">188784</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2015-08-21 14:57:42 -0700 (Fri, 21 Aug 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/188340">r188340</a>. rdar://problem/22375876</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari601146branchLayoutTestsChangeLog">branches/safari-601.1.46-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari601146branchSourceWebCoreChangeLog">branches/safari-601.1.46-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari601146branchSourceWebCorerenderingRenderElementcpp">branches/safari-601.1.46-branch/Source/WebCore/rendering/RenderElement.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari601146branchLayoutTestscss3scrollsnapimpropersnappointscrashexpectedtxt">branches/safari-601.1.46-branch/LayoutTests/css3/scroll-snap/improper-snap-points-crash-expected.txt</a></li>
<li><a href="#branchessafari601146branchLayoutTestscss3scrollsnapimpropersnappointscrashhtml">branches/safari-601.1.46-branch/LayoutTests/css3/scroll-snap/improper-snap-points-crash.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari601146branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/LayoutTests/ChangeLog (188783 => 188784)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/ChangeLog 2015-08-21 21:56:29 UTC (rev 188783)
+++ branches/safari-601.1.46-branch/LayoutTests/ChangeLog 2015-08-21 21:57:42 UTC (rev 188784)
</span><span class="lines">@@ -1,5 +1,20 @@
</span><span class="cx"> 2015-08-21 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><ins>+ Merge r188340.
+
+ 2015-08-12 Brent Fulgham <bfulgham@apple.com>
+
+ REGRESSION(r185606): ASSERT in WebCore::RenderElement::styleWillChange
+ https://bugs.webkit.org/show_bug.cgi?id=147596
+ <rdar://problem/21963355>
+
+ Reviewed by Jon Honeycutt.
+
+ * css3/scroll-snap/improper-snap-points-crash-expected.txt: Added.
+ * css3/scroll-snap/improper-snap-points-crash.html: Added.
+
+2015-08-21 Babak Shafiei <bshafiei@apple.com>
+
</ins><span class="cx"> Merge r188014.
</span><span class="cx">
</span><span class="cx"> 2015-08-05 Chris Dumez <cdumez@apple.com>
</span></span></pre></div>
<a id="branchessafari601146branchLayoutTestscss3scrollsnapimpropersnappointscrashexpectedtxtfromrev188340trunkLayoutTestscss3scrollsnapimpropersnappointscrashexpectedtxt"></a>
<div class="copfile"><h4>Copied: branches/safari-601.1.46-branch/LayoutTests/css3/scroll-snap/improper-snap-points-crash-expected.txt (from rev 188340, trunk/LayoutTests/css3/scroll-snap/improper-snap-points-crash-expected.txt) (0 => 188784)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/css3/scroll-snap/improper-snap-points-crash-expected.txt (rev 0)
+++ branches/safari-601.1.46-branch/LayoutTests/css3/scroll-snap/improper-snap-points-crash-expected.txt 2015-08-21 21:57:42 UTC (rev 188784)
</span><span class="lines">@@ -0,0 +1,15 @@
</span><ins>+The test passes if this page renders without crashing.
+
+
+
+PASS successfullyParsed is true
+
+TEST COMPLETE
+Scroll-snap offsets for horizontalTarget: horizontal = { 0, 100, 200, 300, 400, 500 }
+Scroll-snap offsets for first:
+Scroll-snap offsets for second:
+Scroll-snap offsets for third:
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="branchessafari601146branchLayoutTestscss3scrollsnapimpropersnappointscrashhtmlfromrev188340trunkLayoutTestscss3scrollsnapimpropersnappointscrashhtml"></a>
<div class="copfile"><h4>Copied: branches/safari-601.1.46-branch/LayoutTests/css3/scroll-snap/improper-snap-points-crash.html (from rev 188340, trunk/LayoutTests/css3/scroll-snap/improper-snap-points-crash.html) (0 => 188784)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/css3/scroll-snap/improper-snap-points-crash.html (rev 0)
+++ branches/safari-601.1.46-branch/LayoutTests/css3/scroll-snap/improper-snap-points-crash.html 2015-08-21 21:57:42 UTC (rev 188784)
</span><span class="lines">@@ -0,0 +1,80 @@
</span><ins>+<!DOCTYPE html>
+<html>
+ <head>
+ <style>
+ .horizontalGallery {
+ width: 100px;
+ height: 100px;
+ overflow-y: hidden;
+ overflow-x: auto;
+ margin: 2px;
+ -webkit-overflow-scrolling: touch;
+ -webkit-scroll-snap-points-x: repeat(100%);
+ -webkit-scroll-snap-type: mandatory;
+ -webkit-scroll-snap-coordinate: 50% 50%;
+ }
+ .horizontalGalleryDrawer {
+ width: 600px;
+ height: 100px;
+ }
+ .colorBox {
+ height: 100px;
+ width: 100px;
+ float: left;
+ }
+ #item0 { background-color: red; }
+ #item1 { background-color: green; }
+ #item2 { background-color: blue; }
+ #item3 { background-color: aqua; }
+ #item4 { background-color: yellow; }
+ #item5 { background-color: fuchsia; }
+ </style>
+ <script src="../../resources/js-test-pre.js"></script>
+ <script>
+ function reportResult(horizontalTargetID)
+ {
+ var horizontalTarget = document.getElementById(horizontalTargetID);
+
+ debug("Scroll-snap offsets for " + horizontalTargetID + ": " + window.internals.scrollSnapOffsets(horizontalTarget));
+ }
+
+ function runTest()
+ {
+ reportResult('horizontalTarget');
+ reportResult('first');
+ reportResult('second');
+ reportResult('third');
+
+ 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; width: 300px">
+ <div>The test passes if this page renders without crashing.</div>
+ <div class="horizontalGallery" id="horizontalTarget">
+ <div class="horizontalGalleryDrawer">
+ <div id="item0" class="colorBox"></div>
+ <div id="item1" class="colorBox"></div>
+ <div id="item2" class="colorBox"></div>
+ <br id="first" />
+ <br class="horizontalGallery" id="second" />
+ </div>
+ </div>
+ <br class="horizontalGallery" id="third" />
+ <div id="console"></div>
+ </div>
+ <script src="../../resources/js-test-post.js"></script>
+ </body>
+</html>
</ins></span></pre></div>
<a id="branchessafari601146branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/ChangeLog (188783 => 188784)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/ChangeLog 2015-08-21 21:56:29 UTC (rev 188783)
+++ branches/safari-601.1.46-branch/Source/WebCore/ChangeLog 2015-08-21 21:57:42 UTC (rev 188784)
</span><span class="lines">@@ -1,5 +1,26 @@
</span><span class="cx"> 2015-08-21 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><ins>+ Merge r188340.
+
+ 2015-08-12 Brent Fulgham <bfulgham@apple.com>
+
+ REGRESSION(r185606): ASSERT in WebCore::RenderElement::styleWillChange
+ https://bugs.webkit.org/show_bug.cgi?id=147596
+ <rdar://problem/21963355>
+
+ Reviewed by Jon Honeycutt.
+
+ Only add (or remove) a RenderElement from the container of RenderBoxes with
+ scroll snap coordinates if the element actually is a RenderBox.
+
+ Tested by css3/scroll-snap/improper-snap-points-crash.html.
+
+ * rendering/RenderElement.cpp:
+ (WebCore::RenderElement::styleWillChange):
+ (WebCore::RenderElement::willBeRemovedFromTree):
+
+2015-08-21 Babak Shafiei <bshafiei@apple.com>
+
</ins><span class="cx"> Merge r188014.
</span><span class="cx">
</span><span class="cx"> 2015-08-05 Chris Dumez <cdumez@apple.com>
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCorerenderingRenderElementcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/rendering/RenderElement.cpp (188783 => 188784)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/rendering/RenderElement.cpp 2015-08-21 21:56:29 UTC (rev 188783)
+++ branches/safari-601.1.46-branch/Source/WebCore/rendering/RenderElement.cpp 2015-08-21 21:57:42 UTC (rev 188784)
</span><span class="lines">@@ -900,11 +900,12 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(CSS_SCROLL_SNAP)
</span><span class="cx"> if (!newStyle.scrollSnapCoordinates().isEmpty() || (oldStyle && !oldStyle->scrollSnapCoordinates().isEmpty())) {
</span><del>- ASSERT(is<RenderBox>(this));
- if (newStyle.scrollSnapCoordinates().isEmpty())
- view().unregisterBoxWithScrollSnapCoordinates(downcast<RenderBox>(*this));
- else
- view().registerBoxWithScrollSnapCoordinates(downcast<RenderBox>(*this));
</del><ins>+ if (is<RenderBox>(*this)) {
+ if (newStyle.scrollSnapCoordinates().isEmpty())
+ view().unregisterBoxWithScrollSnapCoordinates(downcast<RenderBox>(*this));
+ else
+ view().registerBoxWithScrollSnapCoordinates(downcast<RenderBox>(*this));
+ }
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -1065,8 +1066,8 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(CSS_SCROLL_SNAP)
</span><span class="cx"> if (!m_style->scrollSnapCoordinates().isEmpty()) {
</span><del>- ASSERT(is<RenderBox>(this));
- view().unregisterBoxWithScrollSnapCoordinates(downcast<RenderBox>(*this));
</del><ins>+ if (is<RenderBox>(*this))
+ view().unregisterBoxWithScrollSnapCoordinates(downcast<RenderBox>(*this));
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>