<!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>[207727] 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/207727">207727</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2016-10-23 09:27:35 -0700 (Sun, 23 Oct 2016)</dd>
</dl>

<h3>Log Message</h3>
<pre>Do not update selection rect on dirty lineboxes.
https://bugs.webkit.org/show_bug.cgi?id=163862
&lt;rdar://problem/28813156&gt;

Reviewed by Simon Fraser.

Source/WebCore:

In addition to checking whether the renderer needs layout, we also need to check if its preferred
width is clean and stop computing the selection rects, if needed (while adding a renderer to the tree,
there's a transition phase where the parent's preferred width dirty bit is already set, but it does
not yet need layout).

Tests: fast/css-generated-content/dynamic-first-letter-selection-clear-crash.html

* rendering/RenderObject.cpp:
(WebCore::RenderObject::canUpdateSelectionOnRootLineBoxes):

LayoutTests:

* fast/css-generated-content/dynamic-first-letter-selection-clear-crash-expected.txt: Added.
* fast/css-generated-content/dynamic-first-letter-selection-clear-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="#trunkSourceWebCorerenderingRenderObjectcpp">trunk/Source/WebCore/rendering/RenderObject.cpp</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastcssgeneratedcontentdynamicfirstletterselectionclearcrashexpectedtxt">trunk/LayoutTests/fast/css-generated-content/dynamic-first-letter-selection-clear-crash-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastcssgeneratedcontentdynamicfirstletterselectionclearcrashhtml">trunk/LayoutTests/fast/css-generated-content/dynamic-first-letter-selection-clear-crash.html</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (207726 => 207727)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2016-10-23 07:23:28 UTC (rev 207726)
+++ trunk/LayoutTests/ChangeLog        2016-10-23 16:27:35 UTC (rev 207727)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-10-23  Zalan Bujtas  &lt;zalan@apple.com&gt;
+
+        Do not update selection rect on dirty lineboxes.
+        https://bugs.webkit.org/show_bug.cgi?id=163862
+        &lt;rdar://problem/28813156&gt;
+
+        Reviewed by Simon Fraser.
+
+        * fast/css-generated-content/dynamic-first-letter-selection-clear-crash-expected.txt: Added.
+        * fast/css-generated-content/dynamic-first-letter-selection-clear-crash.html: Added.
+
</ins><span class="cx"> 2016-10-22  Myles C. Maxfield  &lt;mmaxfield@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         ASSERTION FAILED: m_fonts in &amp;WebCore::FontCascade::primaryFont
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssgeneratedcontentdynamicfirstletterselectionclearcrashexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/css-generated-content/dynamic-first-letter-selection-clear-crash-expected.txt (0 => 207727)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-generated-content/dynamic-first-letter-selection-clear-crash-expected.txt                                (rev 0)
+++ trunk/LayoutTests/fast/css-generated-content/dynamic-first-letter-selection-clear-crash-expected.txt        2016-10-23 16:27:35 UTC (rev 207727)
</span><span class="lines">@@ -0,0 +1,2 @@
</span><ins>+Pass if
+no crash.
</ins></span></pre></div>
<a id="trunkLayoutTestsfastcssgeneratedcontentdynamicfirstletterselectionclearcrashhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/css-generated-content/dynamic-first-letter-selection-clear-crash.html (0 => 207727)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css-generated-content/dynamic-first-letter-selection-clear-crash.html                                (rev 0)
+++ trunk/LayoutTests/fast/css-generated-content/dynamic-first-letter-selection-clear-crash.html        2016-10-23 16:27:35 UTC (rev 207727)
</span><span class="lines">@@ -0,0 +1,33 @@
</span><ins>+&lt;!DOCTYPE html&gt;
+&lt;html&gt;
+&lt;head&gt;
+&lt;title&gt;This tests that we can clear selection properly on dynamic content with first letter.&lt;/title&gt;
+&lt;style&gt;
+.class1::first-letter {
+  float: right;
+}
+
+#innerBody {
+  column-count: 2;
+  height: 100px;
+}
+
+&lt;/style&gt;
+&lt;/head&gt;
+&lt;body&gt;
+&lt;li id=li style=&quot;float: right;&quot;&gt;Pass if&lt;span style=&quot;float: right;&quot;&gt;&lt;/span&gt;&lt;/li&gt;&lt;body id=innerBody&gt;&lt;span id=span style=&quot;display: none;&quot;&gt;&lt;/span&gt;no crash.&lt;/body&gt;
+&lt;script&gt;
+  if (window.testRunner)
+    testRunner.dumpAsText();
+  innerBody.style.webkitWritingMode = &quot;vertical-rl&quot;;
+  innerBody.className = &quot;class1&quot;;
+
+  document.getSelection().setBaseAndExtent(span, 0, innerBody, innerBody.childNodes.length);
+  window.getSelection().modify(&quot;extend&quot;, &quot;left&quot;, &quot;documentboundary&quot;);
+  innerBody.scrollIntoViewIfNeeded(true);
+  li.style.cssText = &quot;float: right; height: 40px; width: 40px;&quot;;
+  document.body.offsetHeight;
+  li.style.cssText = &quot;&quot;;
+&lt;/script&gt;
+&lt;/body&gt;
+&lt;/html&gt;
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (207726 => 207727)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2016-10-23 07:23:28 UTC (rev 207726)
+++ trunk/Source/WebCore/ChangeLog        2016-10-23 16:27:35 UTC (rev 207727)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2016-10-23  Zalan Bujtas  &lt;zalan@apple.com&gt;
+
+        Do not update selection rect on dirty lineboxes.
+        https://bugs.webkit.org/show_bug.cgi?id=163862
+        &lt;rdar://problem/28813156&gt;
+
+        Reviewed by Simon Fraser.
+
+        In addition to checking whether the renderer needs layout, we also need to check if its preferred
+        width is clean and stop computing the selection rects, if needed (while adding a renderer to the tree,
+        there's a transition phase where the parent's preferred width dirty bit is already set, but it does
+        not yet need layout).
+
+        Tests: fast/css-generated-content/dynamic-first-letter-selection-clear-crash.html
+
+        * rendering/RenderObject.cpp:
+        (WebCore::RenderObject::canUpdateSelectionOnRootLineBoxes):
+
</ins><span class="cx"> 2016-10-22  Myles C. Maxfield  &lt;mmaxfield@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         ASSERTION FAILED: m_fonts in &amp;WebCore::FontCascade::primaryFont
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderObject.cpp (207726 => 207727)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderObject.cpp        2016-10-23 07:23:28 UTC (rev 207726)
+++ trunk/Source/WebCore/rendering/RenderObject.cpp        2016-10-23 16:27:35 UTC (rev 207727)
</span><span class="lines">@@ -1778,8 +1778,14 @@
</span><span class="cx">     if (needsLayout())
</span><span class="cx">         return false;
</span><span class="cx"> 
</span><ins>+    if (preferredLogicalWidthsDirty())
+        return false;
+
</ins><span class="cx">     RenderBlock* containingBlock = this-&gt;containingBlock();
</span><del>-    return containingBlock ? !containingBlock-&gt;needsLayout() : true;
</del><ins>+    if (!containingBlock)
+        return true;
+
+    return !containingBlock-&gt;needsLayout() &amp;&amp; !containingBlock-&gt;preferredLogicalWidthsDirty();
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> // We only create &quot;generated&quot; child renderers like one for first-letter if:
</span></span></pre>
</div>
</div>

</body>
</html>