<!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>[203045] 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/203045">203045</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2016-07-10 20:58:49 -0700 (Sun, 10 Jul 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix LogicalSelectionOffsetCaches to work with detached render tree.
https://bugs.webkit.org/show_bug.cgi?id=159605
<rdar://problem/27248845>
Reviewed by Brent Fulgham.
Source/WebCore:
When the renderer that is being destroyed is on a selection boundary,
we need to ensure that all its cached pointers across the selection code (e.g. SelectionSubtreeData)
are getting reset. In order to do that, we call clearSelection() on the RenderView.
One of the last steps of clearing selection is to collect the selection gaps. Selection gaps uses this
LogicalSelectionOffsetCaches helper class to collect selection information across blocks.
LogicalSelectionOffsetCaches normally operates on rooted renderers. However we need to ensure sure that
it can also handle renderers that are no longer part of the render tree.
Test: fast/text/selection-on-a-detached-tree.html
* rendering/LogicalSelectionOffsetCaches.h:
(WebCore::LogicalSelectionOffsetCaches::ContainingBlockInfo::setBlock):
(WebCore::LogicalSelectionOffsetCaches::ContainingBlockInfo::logicalLeftSelectionOffset):
(WebCore::LogicalSelectionOffsetCaches::ContainingBlockInfo::logicalRightSelectionOffset):
* rendering/RenderBlock.cpp:
(WebCore::RenderBlock::logicalLeftSelectionOffset):
(WebCore::RenderBlock::logicalRightSelectionOffset):
LayoutTests:
* fast/text/selection-on-a-detached-tree-expected.txt: Added.
* fast/text/selection-on-a-detached-tree.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="#trunkSourceWebCorerenderingLogicalSelectionOffsetCachesh">trunk/Source/WebCore/rendering/LogicalSelectionOffsetCaches.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBlockcpp">trunk/Source/WebCore/rendering/RenderBlock.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfasttextselectiononadetachedtreeexpectedtxt">trunk/LayoutTests/fast/text/selection-on-a-detached-tree-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfasttextselectiononadetachedtreehtml">trunk/LayoutTests/fast/text/selection-on-a-detached-tree.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (203044 => 203045)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-07-11 02:52:07 UTC (rev 203044)
+++ trunk/LayoutTests/ChangeLog 2016-07-11 03:58:49 UTC (rev 203045)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-07-10 Zalan Bujtas <zalan@apple.com>
+
+ Fix LogicalSelectionOffsetCaches to work with detached render tree.
+ https://bugs.webkit.org/show_bug.cgi?id=159605
+ <rdar://problem/27248845>
+
+ Reviewed by Brent Fulgham.
+
+ * fast/text/selection-on-a-detached-tree-expected.txt: Added.
+ * fast/text/selection-on-a-detached-tree.html: Added.
+
</ins><span class="cx"> 2016-07-10 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> adoptNode() changes css class to lowercase for document loaded with XHR responseType = "document"
</span></span></pre></div>
<a id="trunkLayoutTestsfasttextselectiononadetachedtreeexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/text/selection-on-a-detached-tree-expected.txt (0 => 203045)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/selection-on-a-detached-tree-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/text/selection-on-a-detached-tree-expected.txt 2016-07-11 03:58:49 UTC (rev 203045)
</span><span class="lines">@@ -0,0 +1,6 @@
</span><ins>+
+
+PASS if no
+crash
+or assert.
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfasttextselectiononadetachedtreehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/text/selection-on-a-detached-tree.html (0 => 203045)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/selection-on-a-detached-tree.html (rev 0)
+++ trunk/LayoutTests/fast/text/selection-on-a-detached-tree.html 2016-07-11 03:58:49 UTC (rev 203045)
</span><span class="lines">@@ -0,0 +1,15 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<title>This tests that we can preform selection operations on detached trees.</title>
+</head>
+<body contentEditable='true'>
+<div><canvas style="position:fixed;"></canvas>PASS if no<table style="position:fixed;"><ul style="position:absolute;">crash</ul><button>or assert.</button></table></div>
+<script>
+if (window.testRunner)
+ testRunner.dumpAsText();
+document.execCommand('selectall', false, null);
+window.document.execCommand('insertunorderedlist', true, null);
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (203044 => 203045)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-07-11 02:52:07 UTC (rev 203044)
+++ trunk/Source/WebCore/ChangeLog 2016-07-11 03:58:49 UTC (rev 203045)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2016-07-10 Zalan Bujtas <zalan@apple.com>
+
+ Fix LogicalSelectionOffsetCaches to work with detached render tree.
+ https://bugs.webkit.org/show_bug.cgi?id=159605
+ <rdar://problem/27248845>
+
+ Reviewed by Brent Fulgham.
+
+ When the renderer that is being destroyed is on a selection boundary,
+ we need to ensure that all its cached pointers across the selection code (e.g. SelectionSubtreeData)
+ are getting reset. In order to do that, we call clearSelection() on the RenderView.
+ One of the last steps of clearing selection is to collect the selection gaps. Selection gaps uses this
+ LogicalSelectionOffsetCaches helper class to collect selection information across blocks.
+ LogicalSelectionOffsetCaches normally operates on rooted renderers. However we need to ensure sure that
+ it can also handle renderers that are no longer part of the render tree.
+
+ Test: fast/text/selection-on-a-detached-tree.html
+
+ * rendering/LogicalSelectionOffsetCaches.h:
+ (WebCore::LogicalSelectionOffsetCaches::ContainingBlockInfo::setBlock):
+ (WebCore::LogicalSelectionOffsetCaches::ContainingBlockInfo::logicalLeftSelectionOffset):
+ (WebCore::LogicalSelectionOffsetCaches::ContainingBlockInfo::logicalRightSelectionOffset):
+ * rendering/RenderBlock.cpp:
+ (WebCore::RenderBlock::logicalLeftSelectionOffset):
+ (WebCore::RenderBlock::logicalRightSelectionOffset):
+
</ins><span class="cx"> 2016-07-10 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> adoptNode() changes css class to lowercase for document loaded with XHR responseType = "document"
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingLogicalSelectionOffsetCachesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/LogicalSelectionOffsetCaches.h (203044 => 203045)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/LogicalSelectionOffsetCaches.h 2016-07-11 02:52:07 UTC (rev 203044)
+++ trunk/Source/WebCore/rendering/LogicalSelectionOffsetCaches.h 2016-07-11 03:58:49 UTC (rev 203045)
</span><span class="lines">@@ -38,7 +38,8 @@
</span><span class="cx"> void setBlock(RenderBlock* block, const LogicalSelectionOffsetCaches* cache, bool parentCacheHasFloatsOrFlowThreads = false)
</span><span class="cx"> {
</span><span class="cx"> m_block = block;
</span><del>- m_hasFloatsOrFlowThreads = parentCacheHasFloatsOrFlowThreads || m_hasFloatsOrFlowThreads || m_block->containsFloats() || m_block->flowThreadContainingBlock();
</del><ins>+ bool blockHasFloatsOrFlowThreads = m_block ? (m_block->containsFloats() || m_block->flowThreadContainingBlock()) : false;
+ m_hasFloatsOrFlowThreads = parentCacheHasFloatsOrFlowThreads || m_hasFloatsOrFlowThreads || blockHasFloatsOrFlowThreads;
</ins><span class="cx"> m_cache = cache;
</span><span class="cx"> m_cachedLogicalLeftSelectionOffset = false;
</span><span class="cx"> m_cachedLogicalRightSelectionOffset = false;
</span><span class="lines">@@ -49,9 +50,9 @@
</span><span class="cx"> ASSERT(m_cache);
</span><span class="cx"> if (m_hasFloatsOrFlowThreads || !m_cachedLogicalLeftSelectionOffset) {
</span><span class="cx"> m_cachedLogicalLeftSelectionOffset = true;
</span><del>- m_logicalLeftSelectionOffset = m_block->logicalLeftSelectionOffset(rootBlock, position, *m_cache);
</del><ins>+ m_logicalLeftSelectionOffset = m_block ? m_block->logicalLeftSelectionOffset(rootBlock, position, *m_cache) : LayoutUnit::fromPixel(0);
</ins><span class="cx"> } else
</span><del>- ASSERT(m_logicalLeftSelectionOffset == m_block->logicalLeftSelectionOffset(rootBlock, position, *m_cache));
</del><ins>+ ASSERT(m_logicalLeftSelectionOffset == (m_block ? m_block->logicalLeftSelectionOffset(rootBlock, position, *m_cache) : LayoutUnit::fromPixel(0)));
</ins><span class="cx"> return m_logicalLeftSelectionOffset;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -60,9 +61,9 @@
</span><span class="cx"> ASSERT(m_cache);
</span><span class="cx"> if (m_hasFloatsOrFlowThreads || !m_cachedLogicalRightSelectionOffset) {
</span><span class="cx"> m_cachedLogicalRightSelectionOffset = true;
</span><del>- m_logicalRightSelectionOffset = m_block->logicalRightSelectionOffset(rootBlock, position, *m_cache);
</del><ins>+ m_logicalRightSelectionOffset = m_block ? m_block->logicalRightSelectionOffset(rootBlock, position, *m_cache) : LayoutUnit::fromPixel(0);
</ins><span class="cx"> } else
</span><del>- ASSERT(m_logicalRightSelectionOffset == m_block->logicalRightSelectionOffset(rootBlock, position, *m_cache));
</del><ins>+ ASSERT(m_logicalRightSelectionOffset == (m_block ? m_block->logicalRightSelectionOffset(rootBlock, position, *m_cache) : LayoutUnit::fromPixel(0)));
</ins><span class="cx"> return m_logicalRightSelectionOffset;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBlockcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBlock.cpp (203044 => 203045)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBlock.cpp 2016-07-11 02:52:07 UTC (rev 203044)
+++ trunk/Source/WebCore/rendering/RenderBlock.cpp 2016-07-11 03:58:49 UTC (rev 203045)
</span><span class="lines">@@ -2179,6 +2179,8 @@
</span><span class="cx"> ASSERT(currentCache);
</span><span class="cx"> auto info = currentCache->containingBlockInfo(*cb);
</span><span class="cx"> cb = info.block();
</span><ins>+ if (!cb)
+ break;
</ins><span class="cx"> currentCache = info.cache();
</span><span class="cx"> }
</span><span class="cx"> return logicalLeft;
</span><span class="lines">@@ -2201,6 +2203,8 @@
</span><span class="cx"> ASSERT(currentCache);
</span><span class="cx"> auto info = currentCache->containingBlockInfo(*cb);
</span><span class="cx"> cb = info.block();
</span><ins>+ if (!cb)
+ break;
</ins><span class="cx"> currentCache = info.cache();
</span><span class="cx"> }
</span><span class="cx"> return logicalRight;
</span></span></pre>
</div>
</div>
</body>
</html>