<!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>[244003] releases/WebKitGTK/webkit-2.24</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/244003">244003</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2019-04-08 05:38:48 -0700 (Mon, 08 Apr 2019)</dd>
</dl>

<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/242919">r242919</a> - Use RenderBox::previousSiblingBox/nextSiblingBox in RenderMultiColumnFlow
https://bugs.webkit.org/show_bug.cgi?id=195701
<rdar://problem/48448658>

Reviewed by Simon Fraser.

Source/WebCore:

It's safer to use existing RenderBox functions to get sibling boxes.

Test: fast/ruby/crash-when-paginated-ruby.html

* rendering/RenderMultiColumnFlow.cpp:
(WebCore::RenderMultiColumnFlow::nextColumnSetOrSpannerSiblingOf):
(WebCore::RenderMultiColumnFlow::previousColumnSetOrSpannerSiblingOf):

LayoutTests:

* fast/ruby/crash-when-paginated-ruby-expected.txt: Added.
* fast/ruby/crash-when-paginated-ruby.html: Added.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit224LayoutTestsChangeLog">releases/WebKitGTK/webkit-2.24/LayoutTests/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit224LayoutTestsplatformmacTestExpectations">releases/WebKitGTK/webkit-2.24/LayoutTests/platform/mac/TestExpectations</a></li>
<li><a href="#releasesWebKitGTKwebkit224SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.24/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit224SourceWebCorerenderingRenderMultiColumnFlowcpp">releases/WebKitGTK/webkit-2.24/Source/WebCore/rendering/RenderMultiColumnFlow.cpp</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit224LayoutTestsfastrubycrashwhenpaginatedrubyexpectedtxt">releases/WebKitGTK/webkit-2.24/LayoutTests/fast/ruby/crash-when-paginated-ruby-expected.txt</a></li>
<li><a href="#releasesWebKitGTKwebkit224LayoutTestsfastrubycrashwhenpaginatedrubyhtml">releases/WebKitGTK/webkit-2.24/LayoutTests/fast/ruby/crash-when-paginated-ruby.html</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit224LayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.24/LayoutTests/ChangeLog (244002 => 244003)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.24/LayoutTests/ChangeLog     2019-04-08 12:38:43 UTC (rev 244002)
+++ releases/WebKitGTK/webkit-2.24/LayoutTests/ChangeLog        2019-04-08 12:38:48 UTC (rev 244003)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2019-03-13  Zalan Bujtas  <zalan@apple.com>
+
+        Use RenderBox::previousSiblingBox/nextSiblingBox in RenderMultiColumnFlow
+        https://bugs.webkit.org/show_bug.cgi?id=195701
+        <rdar://problem/48448658>
+
+        Reviewed by Simon Fraser.
+
+        * fast/ruby/crash-when-paginated-ruby-expected.txt: Added.
+        * fast/ruby/crash-when-paginated-ruby.html: Added.
+
</ins><span class="cx"> 2019-03-13  Wenson Hsieh  <wenson_hsieh@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Fix an edge case where HTMLFormElement::removeFormElement is invoked twice with the same element
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit224LayoutTestsfastrubycrashwhenpaginatedrubyexpectedtxt"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.24/LayoutTests/fast/ruby/crash-when-paginated-ruby-expected.txt (0 => 244003)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.24/LayoutTests/fast/ruby/crash-when-paginated-ruby-expected.txt                              (rev 0)
+++ releases/WebKitGTK/webkit-2.24/LayoutTests/fast/ruby/crash-when-paginated-ruby-expected.txt 2019-04-08 12:38:48 UTC (rev 244003)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+click me Pass if no crash.
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit224LayoutTestsfastrubycrashwhenpaginatedrubyhtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.24/LayoutTests/fast/ruby/crash-when-paginated-ruby.html (0 => 244003)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.24/LayoutTests/fast/ruby/crash-when-paginated-ruby.html                              (rev 0)
+++ releases/WebKitGTK/webkit-2.24/LayoutTests/fast/ruby/crash-when-paginated-ruby.html 2019-04-08 12:38:48 UTC (rev 244003)
</span><span class="lines">@@ -0,0 +1,16 @@
</span><ins>+<style>
+ruby {
+    float:left;
+    column-count: 2;
+}
+</style>         
+<ruby id=ruby>content</ruby>
+Pass if no crash.
+<script>
+if (window.testRunner)
+    testRunner.dumpAsText();
+document.body.offsetHeight;
+ruby.innerHTML="<button>click me</button>";      
+styleSheet = document.styleSheets[0];
+styleSheet.addRule('#ruby::before','content: counter(coun2)');
+</script>
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit224LayoutTestsplatformmacTestExpectations"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.24/LayoutTests/platform/mac/TestExpectations (244002 => 244003)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.24/LayoutTests/platform/mac/TestExpectations 2019-04-08 12:38:43 UTC (rev 244002)
+++ releases/WebKitGTK/webkit-2.24/LayoutTests/platform/mac/TestExpectations    2019-04-08 12:38:48 UTC (rev 244003)
</span><span class="lines">@@ -149,6 +149,7 @@
</span><span class="cx"> 
</span><span class="cx"> # Asserts in debug.
</span><span class="cx"> [ Debug ] fast/images/large-size-image-crash.html [ Skip ]
</span><ins>+[ Debug ] fast/ruby/crash-when-paginated-ruby.html [ Skip ]
</ins><span class="cx"> 
</span><span class="cx"> webkit.org/b/188061 [ Debug ] webgl/2.0.0/conformance2/glsl3/compound-assignment-type-combination.html [ Slow ]
</span><span class="cx"> 
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit224SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.24/Source/WebCore/ChangeLog (244002 => 244003)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.24/Source/WebCore/ChangeLog  2019-04-08 12:38:43 UTC (rev 244002)
+++ releases/WebKitGTK/webkit-2.24/Source/WebCore/ChangeLog     2019-04-08 12:38:48 UTC (rev 244003)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2019-03-13  Zalan Bujtas  <zalan@apple.com>
+
+        Use RenderBox::previousSiblingBox/nextSiblingBox in RenderMultiColumnFlow
+        https://bugs.webkit.org/show_bug.cgi?id=195701
+        <rdar://problem/48448658>
+
+        Reviewed by Simon Fraser.
+
+        It's safer to use existing RenderBox functions to get sibling boxes.
+
+        Test: fast/ruby/crash-when-paginated-ruby.html
+
+        * rendering/RenderMultiColumnFlow.cpp:
+        (WebCore::RenderMultiColumnFlow::nextColumnSetOrSpannerSiblingOf):
+        (WebCore::RenderMultiColumnFlow::previousColumnSetOrSpannerSiblingOf):
+
</ins><span class="cx"> 2019-03-13  Wenson Hsieh  <wenson_hsieh@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Fix an edge case where HTMLFormElement::removeFormElement is invoked twice with the same element
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit224SourceWebCorerenderingRenderMultiColumnFlowcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.24/Source/WebCore/rendering/RenderMultiColumnFlow.cpp (244002 => 244003)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.24/Source/WebCore/rendering/RenderMultiColumnFlow.cpp        2019-04-08 12:38:43 UTC (rev 244002)
+++ releases/WebKitGTK/webkit-2.24/Source/WebCore/rendering/RenderMultiColumnFlow.cpp   2019-04-08 12:38:48 UTC (rev 244003)
</span><span class="lines">@@ -93,11 +93,7 @@
</span><span class="cx"> 
</span><span class="cx"> RenderBox* RenderMultiColumnFlow::nextColumnSetOrSpannerSiblingOf(const RenderBox* child)
</span><span class="cx"> {
</span><del>-    if (!child)
-        return nullptr;
-    if (RenderObject* sibling = child->nextSibling())
-        return downcast<RenderBox>(sibling);
-    return nullptr;
</del><ins>+    return child ? child->nextSiblingBox() : nullptr;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> RenderBox* RenderMultiColumnFlow::previousColumnSetOrSpannerSiblingOf(const RenderBox* child)
</span><span class="lines">@@ -104,10 +100,9 @@
</span><span class="cx"> {
</span><span class="cx">     if (!child)
</span><span class="cx">         return nullptr;
</span><del>-    if (RenderObject* sibling = child->previousSibling()) {
-        if (is<RenderFragmentedFlow>(*sibling))
-            return nullptr;
-        return downcast<RenderBox>(sibling);
</del><ins>+    if (auto* sibling = child->previousSiblingBox()) {
+        if (!is<RenderFragmentedFlow>(*sibling))
+            return sibling;
</ins><span class="cx">     }
</span><span class="cx">     return nullptr;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>

</body>
</html>