<!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>[168121] trunk/Source/WebCore</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/168121">168121</a></dd>
<dt>Author</dt> <dd>hyatt@apple.com</dd>
<dt>Date</dt> <dd>2014-05-01 14:00:19 -0700 (Thu, 01 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>REGRESSION (<a href="http://trac.webkit.org/projects/webkit/changeset/168046">r168046</a>): [New Multicolumn] Selection into and out of column-span elements doesn't work
https://bugs.webkit.org/show_bug.cgi?id=132066
Reviewed by Oliver Hunt.
Make a new SelectionIterator struct that knows how to drill into and out of
column span placeholders. Also change spans to be selection roots (in the painting
sense).
* rendering/RenderBlock.cpp:
(WebCore::RenderBlock::isSelectionRoot):
(WebCore::RenderBlock::selectionGaps):
* rendering/RenderView.cpp:
(WebCore::SelectionIterator::SelectionIterator):
(WebCore::SelectionIterator::checkForSpanner):
(WebCore::SelectionIterator::current):
(WebCore::SelectionIterator::next):
(WebCore::RenderView::subtreeSelectionBounds):
(WebCore::RenderView::repaintSubtreeSelection):
(WebCore::RenderView::setSubtreeSelection):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBlockcpp">trunk/Source/WebCore/rendering/RenderBlock.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderViewcpp">trunk/Source/WebCore/rendering/RenderView.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (168120 => 168121)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-05-01 20:56:48 UTC (rev 168120)
+++ trunk/Source/WebCore/ChangeLog 2014-05-01 21:00:19 UTC (rev 168121)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2014-05-01 David Hyatt <hyatt@apple.com>
+
+ REGRESSION (r168046): [New Multicolumn] Selection into and out of column-span elements doesn't work
+ https://bugs.webkit.org/show_bug.cgi?id=132066
+
+ Reviewed by Oliver Hunt.
+
+ Make a new SelectionIterator struct that knows how to drill into and out of
+ column span placeholders. Also change spans to be selection roots (in the painting
+ sense).
+
+ * rendering/RenderBlock.cpp:
+ (WebCore::RenderBlock::isSelectionRoot):
+ (WebCore::RenderBlock::selectionGaps):
+ * rendering/RenderView.cpp:
+ (WebCore::SelectionIterator::SelectionIterator):
+ (WebCore::SelectionIterator::checkForSpanner):
+ (WebCore::SelectionIterator::current):
+ (WebCore::SelectionIterator::next):
+ (WebCore::RenderView::subtreeSelectionBounds):
+ (WebCore::RenderView::repaintSubtreeSelection):
+ (WebCore::RenderView::setSubtreeSelection):
+
</ins><span class="cx"> 2014-05-01 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Don't always make backing store for -webkit-backface-visibility:hidden
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBlockcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBlock.cpp (168120 => 168121)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBlock.cpp 2014-05-01 20:56:48 UTC (rev 168120)
+++ trunk/Source/WebCore/rendering/RenderBlock.cpp 2014-05-01 21:00:19 UTC (rev 168121)
</span><span class="lines">@@ -2294,7 +2294,7 @@
</span><span class="cx"> || isPositioned() || isFloating()
</span><span class="cx"> || isTableCell() || isInlineBlockOrInlineTable()
</span><span class="cx"> || hasTransform() || hasReflection() || hasMask() || isWritingModeRoot()
</span><del>- || isRenderFlowThread())
</del><ins>+ || isRenderFlowThread() || style().columnSpan() == ColumnSpanAll)
</ins><span class="cx"> return true;
</span><span class="cx">
</span><span class="cx"> if (view().selectionStart()) {
</span><span class="lines">@@ -2413,7 +2413,7 @@
</span><span class="cx"> if (!isRenderBlockFlow()) // FIXME: Make multi-column selection gap filling work someday.
</span><span class="cx"> return result;
</span><span class="cx">
</span><del>- if (hasColumns() || hasTransform() || style().columnSpan() || isInFlowRenderFlowThread()) {
</del><ins>+ if (hasColumns() || hasTransform() || style().columnSpan() == ColumnSpanAll || isInFlowRenderFlowThread()) {
</ins><span class="cx"> // FIXME: We should learn how to gap fill multiple columns and transforms eventually.
</span><span class="cx"> lastLogicalTop = blockDirectionOffset(rootBlock, offsetFromRootBlock) + logicalHeight();
</span><span class="cx"> lastLogicalLeft = logicalLeftSelectionOffset(rootBlock, logicalHeight(), cache);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderView.cpp (168120 => 168121)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderView.cpp 2014-05-01 20:56:48 UTC (rev 168120)
+++ trunk/Source/WebCore/rendering/RenderView.cpp 2014-05-01 21:00:19 UTC (rev 168121)
</span><span class="lines">@@ -44,6 +44,7 @@
</span><span class="cx"> #include "RenderLayerCompositor.h"
</span><span class="cx"> #include "RenderMultiColumnFlowThread.h"
</span><span class="cx"> #include "RenderMultiColumnSet.h"
</span><ins>+#include "RenderMultiColumnSpannerPlaceholder.h"
</ins><span class="cx"> #include "RenderNamedFlowThread.h"
</span><span class="cx"> #include "RenderSelectionInfo.h"
</span><span class="cx"> #include "RenderWidget.h"
</span><span class="lines">@@ -54,6 +55,45 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><ins>+struct SelectionIterator {
+ RenderObject* m_current;
+ Vector<RenderMultiColumnSpannerPlaceholder*> m_spannerStack;
+
+ SelectionIterator(RenderObject* o)
+ {
+ m_current = o;
+ checkForSpanner();
+ }
+
+ void checkForSpanner()
+ {
+ if (!m_current || !m_current->isRenderMultiColumnSpannerPlaceholder())
+ return;
+ RenderMultiColumnSpannerPlaceholder* placeholder = toRenderMultiColumnSpannerPlaceholder(m_current);
+ m_spannerStack.append(placeholder);
+ m_current = placeholder->spanner();
+ }
+
+ RenderObject* current()
+ {
+ return m_current;
+ }
+
+ RenderObject* next()
+ {
+ RenderObject* currentSpan = m_spannerStack.isEmpty() ? 0 : m_spannerStack.last()->spanner();
+ m_current = m_current->nextInPreOrder(currentSpan);
+ checkForSpanner();
+ if (!m_current && currentSpan) {
+ RenderObject* placeholder = m_spannerStack.last();
+ m_spannerStack.removeLast();
+ m_current = placeholder->nextInPreOrder();
+ checkForSpanner();
+ }
+ return m_current;
+ }
+};
+
</ins><span class="cx"> RenderView::RenderView(Document& document, PassRef<RenderStyle> style)
</span><span class="cx"> : RenderBlockFlow(document, std::move(style))
</span><span class="cx"> , m_frameView(*document.view())
</span><span class="lines">@@ -684,6 +724,7 @@
</span><span class="cx">
</span><span class="cx"> RenderObject* os = root.selectionStart();
</span><span class="cx"> RenderObject* stop = rendererAfterPosition(root.selectionEnd(), root.selectionEndPos());
</span><ins>+ SelectionIterator selectionIterator(os);
</ins><span class="cx"> while (os && os != stop) {
</span><span class="cx"> if ((os->canBeSelectionLeaf() || os == root.selectionStart() || os == root.selectionEnd()) && os->selectionState() != SelectionNone) {
</span><span class="cx"> // Blocks are responsible for painting line gaps and margin gaps. They must be examined as well.
</span><span class="lines">@@ -698,7 +739,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- os = os->nextInPreOrder();
</del><ins>+ os = selectionIterator.next();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Now create a single bounding box rect that encloses the whole selection.
</span><span class="lines">@@ -732,7 +773,8 @@
</span><span class="cx"> HashSet<RenderBlock*> processedBlocks;
</span><span class="cx">
</span><span class="cx"> RenderObject* end = rendererAfterPosition(root.selectionEnd(), root.selectionEndPos());
</span><del>- for (RenderObject* o = root.selectionStart(); o && o != end; o = o->nextInPreOrder()) {
</del><ins>+ SelectionIterator selectionIterator(root.selectionStart());
+ for (RenderObject* o = selectionIterator.current(); o && o != end; o = selectionIterator.next()) {
</ins><span class="cx"> if (!o->canBeSelectionLeaf() && o != root.selectionStart() && o != root.selectionEnd())
</span><span class="cx"> continue;
</span><span class="cx"> if (o->selectionState() == SelectionNone)
</span><span class="lines">@@ -885,6 +927,7 @@
</span><span class="cx">
</span><span class="cx"> RenderObject* os = root.selectionStart();
</span><span class="cx"> RenderObject* stop = rendererAfterPosition(root.selectionEnd(), root.selectionEndPos());
</span><ins>+ SelectionIterator selectionIterator(os);
</ins><span class="cx"> while (os && os != stop) {
</span><span class="cx"> if ((os->canBeSelectionLeaf() || os == root.selectionStart() || os == root.selectionEnd())
</span><span class="cx"> && os->selectionState() != SelectionNone) {
</span><span class="lines">@@ -902,7 +945,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- os = os->nextInPreOrder();
</del><ins>+ os = selectionIterator.next();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Now clear the selection.
</span><span class="lines">@@ -928,11 +971,12 @@
</span><span class="cx">
</span><span class="cx"> RenderObject* o = start;
</span><span class="cx"> stop = rendererAfterPosition(end, endPos);
</span><del>-
</del><ins>+ selectionIterator = SelectionIterator(o);
+
</ins><span class="cx"> while (o && o != stop) {
</span><span class="cx"> if (o != start && o != end && o->canBeSelectionLeaf())
</span><span class="cx"> o->setSelectionStateIfNeeded(SelectionInside);
</span><del>- o = o->nextInPreOrder();
</del><ins>+ o = selectionIterator.next();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (blockRepaintMode != RepaintNothing)
</span><span class="lines">@@ -941,6 +985,7 @@
</span><span class="cx"> // Now that the selection state has been updated for the new objects, walk them again and
</span><span class="cx"> // put them in the new objects list.
</span><span class="cx"> o = start;
</span><ins>+ selectionIterator = SelectionIterator(o);
</ins><span class="cx"> while (o && o != stop) {
</span><span class="cx"> if ((o->canBeSelectionLeaf() || o == start || o == end) && o->selectionState() != SelectionNone) {
</span><span class="cx"> std::unique_ptr<RenderSelectionInfo> selectionInfo = std::make_unique<RenderSelectionInfo>(o, true);
</span><span class="lines">@@ -965,7 +1010,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- o = o->nextInPreOrder();
</del><ins>+ o = selectionIterator.next();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (blockRepaintMode == RepaintNothing)
</span></span></pre>
</div>
</div>
</body>
</html>