<!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>[207631] 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/207631">207631</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2016-10-20 12:15:59 -0700 (Thu, 20 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Stop searching for first-letter containers at multi-column boundary.
https://bugs.webkit.org/show_bug.cgi?id=163739
<rdar://problem/28810750>
Source/WebCore:
We should not cross the multi-column boundary while searching for the first-letter container.
While moving first-letter renderers to a multi-column parent, it could result in finding the wrong
container and end up adding a new wrapper under the original container (from where we are moving the renderers).
Reviewed by David Hyatt.
Test: fast/css-generated-content/first-letter-move-to-multicolumn-crash.html
* rendering/RenderBoxModelObject.cpp:
(WebCore::RenderBoxModelObject::moveChildrenTo):
* rendering/RenderTextFragment.cpp:
(WebCore::RenderTextFragment::blockForAccompanyingFirstLetter):
LayoutTests:
Reviewed by David Hyatt.
* fast/css-generated-content/first-letter-move-to-multicolumn-crash-expected.txt: Added.
* fast/css-generated-content/first-letter-move-to-multicolumn-crash.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="#trunkSourceWebCorerenderingRenderBoxModelObjectcpp">trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderTextFragmentcpp">trunk/Source/WebCore/rendering/RenderTextFragment.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastcssgeneratedcontentfirstlettermovetomulticolumncrashexpectedtxt">trunk/LayoutTests/fast/css-generated-content/first-letter-move-to-multicolumn-crash-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastcssgeneratedcontentfirstlettermovetomulticolumncrashhtml">trunk/LayoutTests/fast/css-generated-content/first-letter-move-to-multicolumn-crash.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (207630 => 207631)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-10-20 19:09:30 UTC (rev 207630)
+++ trunk/LayoutTests/ChangeLog 2016-10-20 19:15:59 UTC (rev 207631)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-10-20 Zalan Bujtas <zalan@apple.com>
+
+ Stop searching for first-letter containers at multi-column boundary.
+ https://bugs.webkit.org/show_bug.cgi?id=163739
+ <rdar://problem/28810750>
+
+ Reviewed by David Hyatt.
+
+ * fast/css-generated-content/first-letter-move-to-multicolumn-crash-expected.txt: Added.
+ * fast/css-generated-content/first-letter-move-to-multicolumn-crash.html: Added.
+
</ins><span class="cx"> 2016-10-19 Dean Jackson <dino@apple.com>
</span><span class="cx">
</span><span class="cx"> Support CSS Shapes Level 1 without a prefix
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgeneratedcontentfirstlettermovetomulticolumncrashexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/css-generated-content/first-letter-move-to-multicolumn-crash-expected.txt (0 => 207631)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-generated-content/first-letter-move-to-multicolumn-crash-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/css-generated-content/first-letter-move-to-multicolumn-crash-expected.txt 2016-10-20 19:15:59 UTC (rev 207631)
</span><span class="lines">@@ -0,0 +1,2 @@
</span><ins>+PASS if no crash or ASSERT.
+f
</ins></span></pre></div>
<a id="trunkLayoutTestsfastcssgeneratedcontentfirstlettermovetomulticolumncrashhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/css-generated-content/first-letter-move-to-multicolumn-crash.html (0 => 207631)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-generated-content/first-letter-move-to-multicolumn-crash.html (rev 0)
+++ trunk/LayoutTests/fast/css-generated-content/first-letter-move-to-multicolumn-crash.html 2016-10-20 19:15:59 UTC (rev 207631)
</span><span class="lines">@@ -0,0 +1,35 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<title>This tests that we can move first-letter elements to column content and back.</title>
+<style>
+.original::first-letter{
+ -webkit-columns: 2;
+}
+.newClass::first-letter{
+ float: left;
+}
+</style>
+<script>
+if (window.testRunner)
+ testRunner.dumpAsText();
+
+function runTest() {
+ li.style.webkitColumns = "2";
+ li.offsetParent;
+
+ li.className = "newClass";
+ li.style.cssText = "letter-spacing: 10px;"
+ li.offsetParent;
+
+ li.style.webkitColumns = "2";
+ li.offsetParent;
+}
+</script>
+</head>
+<body onload="runTest()">
+PASS if no crash or ASSERT.
+<li class=original id="li">f<script></script>
+</li>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (207630 => 207631)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-10-20 19:09:30 UTC (rev 207630)
+++ trunk/Source/WebCore/ChangeLog 2016-10-20 19:15:59 UTC (rev 207631)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2016-10-20 Zalan Bujtas <zalan@apple.com>
+
+ Stop searching for first-letter containers at multi-column boundary.
+ https://bugs.webkit.org/show_bug.cgi?id=163739
+ <rdar://problem/28810750>
+
+ We should not cross the multi-column boundary while searching for the first-letter container.
+ While moving first-letter renderers to a multi-column parent, it could result in finding the wrong
+ container and end up adding a new wrapper under the original container (from where we are moving the renderers).
+
+ Reviewed by David Hyatt.
+
+ Test: fast/css-generated-content/first-letter-move-to-multicolumn-crash.html
+
+ * rendering/RenderBoxModelObject.cpp:
+ (WebCore::RenderBoxModelObject::moveChildrenTo):
+ * rendering/RenderTextFragment.cpp:
+ (WebCore::RenderTextFragment::blockForAccompanyingFirstLetter):
+
</ins><span class="cx"> 2016-10-19 Dean Jackson <dino@apple.com>
</span><span class="cx">
</span><span class="cx"> Support CSS Shapes Level 1 without a prefix
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBoxModelObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp (207630 => 207631)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp 2016-10-20 19:09:30 UTC (rev 207630)
+++ trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp 2016-10-20 19:15:59 UTC (rev 207631)
</span><span class="lines">@@ -2529,9 +2529,11 @@
</span><span class="cx"> // Save our next sibling as moveChildTo will clear it.
</span><span class="cx"> RenderObject* nextSibling = child->nextSibling();
</span><span class="cx">
</span><ins>+ // FIXME: This logic here fails to detect the first letter in certain cases
+ // and skips a valid sibling renderer (see webkit.org/b/163737).
</ins><span class="cx"> // Check to make sure we're not saving the firstLetter as the nextSibling.
</span><span class="cx"> // When the |child| object will be moved, its firstLetter will be recreated,
</span><del>- // so saving it now in nextSibling would let us with a destroyed object.
</del><ins>+ // so saving it now in nextSibling would leave us with a stale object.
</ins><span class="cx"> if (is<RenderTextFragment>(*child) && is<RenderText>(nextSibling)) {
</span><span class="cx"> RenderObject* firstLetterObj = nullptr;
</span><span class="cx"> if (RenderBlock* block = downcast<RenderTextFragment>(*child).blockForAccompanyingFirstLetter()) {
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderTextFragmentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderTextFragment.cpp (207630 => 207631)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderTextFragment.cpp 2016-10-20 19:09:30 UTC (rev 207630)
+++ trunk/Source/WebCore/rendering/RenderTextFragment.cpp 2016-10-20 19:15:59 UTC (rev 207631)
</span><span class="lines">@@ -25,6 +25,7 @@
</span><span class="cx">
</span><span class="cx"> #include "RenderBlock.h"
</span><span class="cx"> #include "RenderIterator.h"
</span><ins>+#include "RenderMultiColumnFlowThread.h"
</ins><span class="cx"> #include "Text.h"
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -112,6 +113,8 @@
</span><span class="cx"> if (!m_firstLetter)
</span><span class="cx"> return nullptr;
</span><span class="cx"> for (auto& block : ancestorsOfType<RenderBlock>(*m_firstLetter)) {
</span><ins>+ if (is<RenderMultiColumnFlowThread>(block))
+ break;
</ins><span class="cx"> if (block.style().hasPseudoStyle(FIRST_LETTER) && block.canHaveChildren())
</span><span class="cx"> return &block;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>