<!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>[193947] 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/193947">193947</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2015-12-10 23:31:28 -0800 (Thu, 10 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>ASSERTION FAILED: !simpleLineLayout() in WebCore::RenderText::collectSelectionRectsForLineBoxes
https://bugs.webkit.org/show_bug.cgi?id=152115
Reviewed by Simon Fraser.
document.execCommand("indent") generates a blockquote wrapper and moves the indented content inside.
If the indented content is already inside a selection, we need to make sure that newly created flow uses
normal line layout.
This patch fixes the generic case as re-parenting an already selected renderer is not specific to document.execCommand("indent").
Source/WebCore:
Test: fast/block/selection-inside-simple-line-layout.html
* rendering/SimpleLineLayout.cpp:
(WebCore::SimpleLineLayout::canUseForWithReason):
(WebCore::SimpleLineLayout::printReason):
LayoutTests:
* fast/block/selection-inside-simple-line-layout-expected.txt: Added.
* fast/block/selection-inside-simple-line-layout.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="#trunkSourceWebCorerenderingSimpleLineLayoutcpp">trunk/Source/WebCore/rendering/SimpleLineLayout.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastblockselectioninsidesimplelinelayoutexpectedtxt">trunk/LayoutTests/fast/block/selection-inside-simple-line-layout-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastblockselectioninsidesimplelinelayouthtml">trunk/LayoutTests/fast/block/selection-inside-simple-line-layout.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (193946 => 193947)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-12-11 05:26:15 UTC (rev 193946)
+++ trunk/LayoutTests/ChangeLog 2015-12-11 07:31:28 UTC (rev 193947)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2015-12-10 Zalan Bujtas <zalan@apple.com>
+
+ ASSERTION FAILED: !simpleLineLayout() in WebCore::RenderText::collectSelectionRectsForLineBoxes
+ https://bugs.webkit.org/show_bug.cgi?id=152115
+
+ Reviewed by Simon Fraser.
+
+ document.execCommand("indent") generates a blockquote wrapper and moves the indented content inside.
+ If the indented content is already inside a selection, we need to make sure that newly created flow uses
+ normal line layout.
+ This patch fixes the generic case as re-parenting an already selected renderer is not specific to document.execCommand("indent").
+
+ * fast/block/selection-inside-simple-line-layout-expected.txt: Added.
+ * fast/block/selection-inside-simple-line-layout.html: Added.
+
</ins><span class="cx"> 2015-12-10 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed TestExpectations gardening.
</span></span></pre></div>
<a id="trunkLayoutTestsfastblockselectioninsidesimplelinelayoutexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/block/selection-inside-simple-line-layout-expected.txt (0 => 193947)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/block/selection-inside-simple-line-layout-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/block/selection-inside-simple-line-layout-expected.txt 2015-12-11 07:31:28 UTC (rev 193947)
</span><span class="lines">@@ -0,0 +1,2 @@
</span><ins>+Pass if no assert in debug.
+b
</ins></span></pre></div>
<a id="trunkLayoutTestsfastblockselectioninsidesimplelinelayouthtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/block/selection-inside-simple-line-layout.html (0 => 193947)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/block/selection-inside-simple-line-layout.html (rev 0)
+++ trunk/LayoutTests/fast/block/selection-inside-simple-line-layout.html 2015-12-11 07:31:28 UTC (rev 193947)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+<script>
+if (window.testRunner)
+ testRunner.dumpAsText();
+window.onload = function() {
+ document.designMode = 'on';
+ document.execCommand('selectAll');
+ document.execCommand('indent');
+}
+</script>
+<ol><li></li></ol>Pass if no assert in debug.<div>b</div>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (193946 => 193947)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-12-11 05:26:15 UTC (rev 193946)
+++ trunk/Source/WebCore/ChangeLog 2015-12-11 07:31:28 UTC (rev 193947)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2015-12-10 Zalan Bujtas <zalan@apple.com>
+
+ ASSERTION FAILED: !simpleLineLayout() in WebCore::RenderText::collectSelectionRectsForLineBoxes
+ https://bugs.webkit.org/show_bug.cgi?id=152115
+
+ Reviewed by Simon Fraser.
+
+ document.execCommand("indent") generates a blockquote wrapper and moves the indented content inside.
+ If the indented content is already inside a selection, we need to make sure that newly created flow uses
+ normal line layout.
+ This patch fixes the generic case as re-parenting an already selected renderer is not specific to document.execCommand("indent").
+
+ Test: fast/block/selection-inside-simple-line-layout.html
+
+ * rendering/SimpleLineLayout.cpp:
+ (WebCore::SimpleLineLayout::canUseForWithReason):
+ (WebCore::SimpleLineLayout::printReason):
+
</ins><span class="cx"> 2015-12-10 Eric Carlson <eric.carlson@apple.com>
</span><span class="cx">
</span><span class="cx"> [MediaStream] Expose media capture devices persistent permissions to WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingSimpleLineLayoutcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/SimpleLineLayout.cpp (193946 => 193947)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/SimpleLineLayout.cpp 2015-12-11 05:26:15 UTC (rev 193946)
+++ trunk/Source/WebCore/rendering/SimpleLineLayout.cpp 2015-12-11 07:31:28 UTC (rev 193947)
</span><span class="lines">@@ -110,7 +110,8 @@
</span><span class="cx"> FeatureIsDisabled = 1LLU << 46,
</span><span class="cx"> FlowHasNoParent = 1LLU << 47,
</span><span class="cx"> FlowHasNoChild = 1LLU << 48,
</span><del>- EndOfReasons = 1LLU << 49
</del><ins>+ FlowChildIsSelected = 1LLU << 49,
+ EndOfReasons = 1LLU << 50
</ins><span class="cx"> };
</span><span class="cx"> const unsigned NoReason = 0;
</span><span class="cx">
</span><span class="lines">@@ -301,6 +302,8 @@
</span><span class="cx"> // This currently covers <blockflow>#text</blockflow>, <blockflow>#text<br></blockflow> and mutiple (sibling) RenderText cases.
</span><span class="cx"> // The <blockflow><inline>#text</inline></blockflow> case is also popular and should be relatively easy to cover.
</span><span class="cx"> for (const auto* child = flow.firstChild(); child;) {
</span><ins>+ if (child->selectionState() != RenderObject::SelectionNone)
+ SET_REASON_AND_RETURN_IF_NEEDED(FlowChildIsSelected, reasons, includeReasons);
</ins><span class="cx"> if (is<RenderText>(*child)) {
</span><span class="cx"> child = child->nextSibling();
</span><span class="cx"> continue;
</span><span class="lines">@@ -917,6 +920,9 @@
</span><span class="cx"> case FlowHasTextShadow:
</span><span class="cx"> stream << "text-shadow";
</span><span class="cx"> break;
</span><ins>+ case FlowChildIsSelected:
+ stream << "selected content";
+ break;
</ins><span class="cx"> case FlowTextIsEmpty:
</span><span class="cx"> case FlowHasNoChild:
</span><span class="cx"> case FlowHasNoParent:
</span></span></pre>
</div>
</div>
</body>
</html>