<!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>[186474] 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/186474">186474</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2015-07-07 13:09:22 -0700 (Tue, 07 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>REGRESSION(169105): CSS Regions: renderer returns wrong selection root when it is inside a column flow.
https://bugs.webkit.org/show_bug.cgi?id=146529
rdar://problem/21613670
Reviewed by Mihnea Ovidenie and David Kilzer.
This patch ensures that RenderObject::selectionRoot() handles column flows properly while searching for the associated
selection root.
When the renderer is inside a column flow and the column flow is part of a named flow, we stop
traversing the ancestor chain, searching for the selection root, when we reach the column flow.
Since the column flow is not a selection root, we mistakenly fall back to the RenderView as selection root.
Instead, we should check if the column is inside a named flow and return the selection root accordingly.
Returning the wrong selection root confuses RenderView::splitSelectionBetweenSubtrees() logic and this particular
RenderObject could end up in multiple selection trees.
Source/WebCore:
Test: fast/regions/selection/crash-when-element-is-inside-column-and-the-containing-block-is-inside-flow.html
* rendering/RenderObject.cpp:
(WebCore::RenderObject::selectionRoot):
LayoutTests:
* fast/regions/selection/crash-when-element-is-inside-column-and-the-containing-block-is-inside-flow-expected.txt: Added.
* fast/regions/selection/crash-when-element-is-inside-column-and-the-containing-block-is-inside-flow.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="#trunkLayoutTestsfastregionsselectioncrashwhenelementisinsidecolumnandthecontainingblockisinsideflowexpectedtxt">trunk/LayoutTests/fast/regions/selection/crash-when-element-is-inside-column-and-the-containing-block-is-inside-flow-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastregionsselectioncrashwhenelementisinsidecolumnandthecontainingblockisinsideflowhtml">trunk/LayoutTests/fast/regions/selection/crash-when-element-is-inside-column-and-the-containing-block-is-inside-flow.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (186473 => 186474)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-07-07 20:07:08 UTC (rev 186473)
+++ trunk/LayoutTests/ChangeLog 2015-07-07 20:09:22 UTC (rev 186474)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2015-07-07 Zalan Bujtas <zalan@apple.com>
+
+ REGRESSION(169105): CSS Regions: renderer returns wrong selection root when it is inside a column flow.
+ https://bugs.webkit.org/show_bug.cgi?id=146529
+ rdar://problem/21613670
+
+ Reviewed by Mihnea Ovidenie and David Kilzer.
+
+ This patch ensures that RenderObject::selectionRoot() handles column flows properly while searching for the associated
+ selection root.
+ When the renderer is inside a column flow and the column flow is part of a named flow, we stop
+ traversing the ancestor chain, searching for the selection root, when we reach the column flow.
+ Since the column flow is not a selection root, we mistakenly fall back to the RenderView as selection root.
+ Instead, we should check if the column is inside a named flow and return the selection root accordingly.
+ Returning the wrong selection root confuses RenderView::splitSelectionBetweenSubtrees() logic and this particular
+ RenderObject could end up in multiple selection trees.
+
+ * fast/regions/selection/crash-when-element-is-inside-column-and-the-containing-block-is-inside-flow-expected.txt: Added.
+ * fast/regions/selection/crash-when-element-is-inside-column-and-the-containing-block-is-inside-flow.html: Added.
+
</ins><span class="cx"> 2015-07-07 Wenson Hsieh <whsieh@berkeley.edu>
</span><span class="cx">
</span><span class="cx"> Snap point regions containing X and Y snap points should do a better job animating
</span></span></pre></div>
<a id="trunkLayoutTestsfastregionsselectioncrashwhenelementisinsidecolumnandthecontainingblockisinsideflowexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/regions/selection/crash-when-element-is-inside-column-and-the-containing-block-is-inside-flow-expected.txt (0 => 186474)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/regions/selection/crash-when-element-is-inside-column-and-the-containing-block-is-inside-flow-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/regions/selection/crash-when-element-is-inside-column-and-the-containing-block-is-inside-flow-expected.txt 2015-07-07 20:09:22 UTC (rev 186474)
</span><span class="lines">@@ -0,0 +1,3 @@
</span><ins>+Pass if no assert or crash in debug.
+foobar
+foobar
</ins></span></pre></div>
<a id="trunkLayoutTestsfastregionsselectioncrashwhenelementisinsidecolumnandthecontainingblockisinsideflowhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/regions/selection/crash-when-element-is-inside-column-and-the-containing-block-is-inside-flow.html (0 => 186474)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/regions/selection/crash-when-element-is-inside-column-and-the-containing-block-is-inside-flow.html (rev 0)
+++ trunk/LayoutTests/fast/regions/selection/crash-when-element-is-inside-column-and-the-containing-block-is-inside-flow.html 2015-07-07 20:09:22 UTC (rev 186474)
</span><span class="lines">@@ -0,0 +1,38 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<title>This tests that elements inside columns get their proper selection root.</title>
+<script>
+if (window.testRunner)
+ testRunner.dumpAsText();
+
+function test() {
+ document.designMode = "on";
+ document.execCommand("SelectAll");
+ document.getElementById('changeme').style.display = 'inline';
+}
+</script>
+<style>
+.flow {
+ -webkit-flow-into: thread;
+}
+
+.column {
+ -webkit-columns: 2;
+}
+
+.spanner {
+ -webkit-column-span: all;
+}
+</style>
+</head>
+<body onload="test()">
+<div class=flow>
+ <div>Pass if no assert or crash in debug.</div>
+ <div class=column>
+ <div id="changeme">foobar</div>
+ <div class=spanner>foobar</div>
+ </div>
+</div>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (186473 => 186474)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-07-07 20:07:08 UTC (rev 186473)
+++ trunk/Source/WebCore/ChangeLog 2015-07-07 20:09:22 UTC (rev 186474)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2015-07-07 Zalan Bujtas <zalan@apple.com>
+
+ REGRESSION(169105): CSS Regions: renderer returns wrong selection root when it is inside a column flow.
+ https://bugs.webkit.org/show_bug.cgi?id=146529
+ rdar://problem/21613670
+
+ Reviewed by Mihnea Ovidenie and David Kilzer.
+
+ This patch ensures that RenderObject::selectionRoot() handles column flows properly while searching for the associated
+ selection root.
+ When the renderer is inside a column flow and the column flow is part of a named flow, we stop
+ traversing the ancestor chain, searching for the selection root, when we reach the column flow.
+ Since the column flow is not a selection root, we mistakenly fall back to the RenderView as selection root.
+ Instead, we should check if the column is inside a named flow and return the selection root accordingly.
+ Returning the wrong selection root confuses RenderView::splitSelectionBetweenSubtrees() logic and this particular
+ RenderObject could end up in multiple selection trees.
+
+ Test: fast/regions/selection/crash-when-element-is-inside-column-and-the-containing-block-is-inside-flow.html
+
+ * rendering/RenderObject.cpp:
+ (WebCore::RenderObject::selectionRoot):
+
</ins><span class="cx"> 2015-07-07 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> [Mac] REGRESSION (r184794): Play/Pause control doesn't update state in full screen
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderObject.cpp (186473 => 186474)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderObject.cpp 2015-07-07 20:07:08 UTC (rev 186473)
+++ trunk/Source/WebCore/rendering/RenderObject.cpp 2015-07-07 20:09:22 UTC (rev 186474)
</span><span class="lines">@@ -54,6 +54,7 @@
</span><span class="cx"> #include "RenderIterator.h"
</span><span class="cx"> #include "RenderLayer.h"
</span><span class="cx"> #include "RenderLayerBacking.h"
</span><ins>+#include "RenderMultiColumnFlowThread.h"
</ins><span class="cx"> #include "RenderNamedFlowFragment.h"
</span><span class="cx"> #include "RenderNamedFlowThread.h"
</span><span class="cx"> #include "RenderSVGResourceContainer.h"
</span><span class="lines">@@ -1570,9 +1571,17 @@
</span><span class="cx"> SelectionSubtreeRoot& RenderObject::selectionRoot() const
</span><span class="cx"> {
</span><span class="cx"> RenderFlowThread* flowThread = flowThreadContainingBlock();
</span><del>- if (is<RenderNamedFlowThread>(flowThread))
</del><ins>+ if (!flowThread)
+ return view();
+
+ if (is<RenderNamedFlowThread>(*flowThread))
</ins><span class="cx"> return downcast<RenderNamedFlowThread>(*flowThread);
</span><del>-
</del><ins>+ if (is<RenderMultiColumnFlowThread>(*flowThread)) {
+ if (!flowThread->containingBlock())
+ return view();
+ return flowThread->containingBlock()->selectionRoot();
+ }
+ ASSERT_NOT_REACHED();
</ins><span class="cx"> return view();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>