<!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>[168364] 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/168364">168364</a></dd>
<dt>Author</dt> <dd>enrica@apple.com</dd>
<dt>Date</dt> <dd>2014-05-06 10:49:51 -0700 (Tue, 06 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>REGRESSION(<a href="http://trac.webkit.org/projects/webkit/changeset/155957">r155957</a>): Selection rects are incorrect when the selection contains BR elements.
https://bugs.webkit.org/show_bug.cgi?id=132596
<rdar://problem/16692206>
Reviewed by Antti Koivisto.
This patch adds an implementation of collectSelectionRects to RenderLineBreak.
It uses the same logic used by RenderText to compute and annotate the returned rect
which is computed, like the caret rect, using information from the rootline box.
* rendering/RenderLineBreak.cpp:
(WebCore::RenderLineBreak::collectSelectionRects):
* rendering/RenderLineBreak.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLineBreakcpp">trunk/Source/WebCore/rendering/RenderLineBreak.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLineBreakh">trunk/Source/WebCore/rendering/RenderLineBreak.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (168363 => 168364)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-05-06 17:30:40 UTC (rev 168363)
+++ trunk/Source/WebCore/ChangeLog 2014-05-06 17:49:51 UTC (rev 168364)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2014-05-05 Enrica Casucci <enrica@apple.com>
+
+ REGRESSION(r155957): Selection rects are incorrect when the selection contains BR elements.
+ https://bugs.webkit.org/show_bug.cgi?id=132596
+ <rdar://problem/16692206>
+
+ Reviewed by Antti Koivisto.
+
+ This patch adds an implementation of collectSelectionRects to RenderLineBreak.
+ It uses the same logic used by RenderText to compute and annotate the returned rect
+ which is computed, like the caret rect, using information from the rootline box.
+
+ * rendering/RenderLineBreak.cpp:
+ (WebCore::RenderLineBreak::collectSelectionRects):
+ * rendering/RenderLineBreak.h:
+
</ins><span class="cx"> 2014-05-06 Andrei Bucur <abucur@adobe.com>
</span><span class="cx">
</span><span class="cx"> [CSS Regions] Optimize the number of regions invalidations
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLineBreakcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLineBreak.cpp (168363 => 168364)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLineBreak.cpp 2014-05-06 17:30:40 UTC (rev 168363)
+++ trunk/Source/WebCore/rendering/RenderLineBreak.cpp 2014-05-06 17:49:51 UTC (rev 168364)
</span><span class="lines">@@ -25,8 +25,11 @@
</span><span class="cx"> #include "Document.h"
</span><span class="cx"> #include "HTMLElement.h"
</span><span class="cx"> #include "InlineElementBox.h"
</span><ins>+#include "LogicalSelectionOffsetCaches.h"
</ins><span class="cx"> #include "RenderBlock.h"
</span><ins>+#include "RenderView.h"
</ins><span class="cx"> #include "RootInlineBox.h"
</span><ins>+#include "SelectionRect.h"
</ins><span class="cx"> #include "VisiblePosition.h"
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -187,4 +190,57 @@
</span><span class="cx"> return IntRect(IntPoint(), linesBoundingBox().size());
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if PLATFORM(IOS)
+void RenderLineBreak::collectSelectionRects(Vector<SelectionRect>& rects, unsigned, unsigned)
+{
+ InlineElementBox* box = m_inlineBoxWrapper;
+ if (!box)
+ return;
+ const RootInlineBox& rootBox = box->root();
+ LayoutRect rect = rootBox.computeCaretRect(box->logicalLeft(), 0, nullptr);
+ if (rootBox.isFirstAfterPageBreak()) {
+ if (box->isHorizontal())
+ rect.shiftYEdgeTo(rootBox.lineTopWithLeading());
+ else
+ rect.shiftXEdgeTo(rootBox.lineTopWithLeading());
+ }
+
+ RenderBlock* containingBlock = this->containingBlock();
+ // Map rect, extended left to leftOffset, and right to rightOffset, through transforms to get minX and maxX.
+ LogicalSelectionOffsetCaches cache(*containingBlock);
+ LayoutUnit leftOffset = containingBlock->logicalLeftSelectionOffset(*containingBlock, box->logicalTop(), cache);
+ LayoutUnit rightOffset = containingBlock->logicalRightSelectionOffset(*containingBlock, box->logicalTop(), cache);
+ LayoutRect extentsRect = rect;
+ if (box->isHorizontal()) {
+ extentsRect.setX(leftOffset);
+ extentsRect.setWidth(rightOffset - leftOffset);
+ } else {
+ extentsRect.setY(leftOffset);
+ extentsRect.setHeight(rightOffset - leftOffset);
+ }
+ extentsRect = localToAbsoluteQuad(FloatRect(extentsRect)).enclosingBoundingBox();
+ if (!box->isHorizontal())
+ extentsRect = extentsRect.transposedRect();
+ bool isFirstOnLine = !box->previousOnLineExists();
+ bool isLastOnLine = !box->nextOnLineExists();
+ if (containingBlock->isRubyBase() || containingBlock->isRubyText())
+ isLastOnLine = !containingBlock->containingBlock()->inlineBoxWrapper()->nextOnLineExists();
+
+ bool isFixed = false;
+ IntRect absRect = localToAbsoluteQuad(FloatRect(rect), false, &isFixed).enclosingBoundingBox();
+ bool boxIsHorizontal = !box->isSVGInlineTextBox() ? box->isHorizontal() : !style().svgStyle().isVerticalWritingMode();
+ // If the containing block is an inline element, we want to check the inlineBoxWrapper orientation
+ // to determine the orientation of the block. In this case we also use the inlineBoxWrapper to
+ // determine if the element is the last on the line.
+ if (containingBlock->inlineBoxWrapper()) {
+ if (containingBlock->inlineBoxWrapper()->isHorizontal() != boxIsHorizontal) {
+ boxIsHorizontal = containingBlock->inlineBoxWrapper()->isHorizontal();
+ isLastOnLine = !containingBlock->inlineBoxWrapper()->nextOnLineExists();
+ }
+ }
+
+ rects.append(SelectionRect(absRect, box->direction(), extentsRect.x(), extentsRect.maxX(), extentsRect.maxY(), 0, box->isLineBreak(), isFirstOnLine, isLastOnLine, false, false, boxIsHorizontal, isFixed, containingBlock->isRubyText(), view().pageNumberForBlockProgressionOffset(absRect.x())));
+}
+#endif
+
</ins><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLineBreakh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLineBreak.h (168363 => 168364)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLineBreak.h 2014-05-06 17:30:40 UTC (rev 168363)
+++ trunk/Source/WebCore/rendering/RenderLineBreak.h 2014-05-06 17:49:51 UTC (rev 168364)
</span><span class="lines">@@ -51,6 +51,9 @@
</span><span class="cx">
</span><span class="cx"> virtual void absoluteRects(Vector<IntRect>&, const LayoutPoint& accumulatedOffset) const override;
</span><span class="cx"> virtual void absoluteQuads(Vector<FloatQuad>&, bool* wasFixed) const override;
</span><ins>+#if PLATFORM(IOS)
+virtual void collectSelectionRects(Vector<SelectionRect>&, unsigned startOffset = 0, unsigned endOffset = std::numeric_limits<unsigned>::max()) override;
+#endif
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> void node() const = delete;
</span></span></pre>
</div>
</div>
</body>
</html>