<!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>[209427] 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/209427">209427</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2016-12-06 15:06:42 -0800 (Tue, 06 Dec 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Can not select whole line when using flexbox
https://bugs.webkit.org/show_bug.cgi?id=165299
Reviewed by David Hyatt.
Source/WebCore:
RootInlineBox::selectionTopAdjustedForPrecedingBlock assumes that the preceding block is
always above the current line. However in certain layout contexts (flex as an example) the block before
could just be on the same line as the current one.
This patch checks if we actually need to adjust the selection top to avoid vertical selection overlap.
Test: fast/flexbox/flexbox-fail-to-select-same-line.html
* rendering/RenderBlock.cpp:
(WebCore::RenderBlock::blockBeforeWithinSelectionRoot): Deleted.
* rendering/RenderBlock.h:
* rendering/RootInlineBox.cpp:
(WebCore::blockBeforeWithinSelectionRoot):
(WebCore::RootInlineBox::selectionTopAdjustedForPrecedingBlock):
LayoutTests:
* fast/flexbox/flexbox-fail-to-select-same-line-expected.html: Added.
* fast/flexbox/flexbox-fail-to-select-same-line.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="#trunkSourceWebCorerenderingRenderBlockcpp">trunk/Source/WebCore/rendering/RenderBlock.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBlockh">trunk/Source/WebCore/rendering/RenderBlock.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRootInlineBoxcpp">trunk/Source/WebCore/rendering/RootInlineBox.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastflexboxflexboxfailtoselectsamelineexpectedhtml">trunk/LayoutTests/fast/flexbox/flexbox-fail-to-select-same-line-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastflexboxflexboxfailtoselectsamelinehtml">trunk/LayoutTests/fast/flexbox/flexbox-fail-to-select-same-line.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (209426 => 209427)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-12-06 23:01:56 UTC (rev 209426)
+++ trunk/LayoutTests/ChangeLog 2016-12-06 23:06:42 UTC (rev 209427)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2016-12-06 Zalan Bujtas <zalan@apple.com>
+
+ Can not select whole line when using flexbox
+ https://bugs.webkit.org/show_bug.cgi?id=165299
+
+ Reviewed by David Hyatt.
+
+ * fast/flexbox/flexbox-fail-to-select-same-line-expected.html: Added.
+ * fast/flexbox/flexbox-fail-to-select-same-line.html: Added.
+
</ins><span class="cx"> 2016-12-06 Jer Noble <jer.noble@apple.com>
</span><span class="cx">
</span><span class="cx"> YouTube sometimes pauses when switching tabs
</span></span></pre></div>
<a id="trunkLayoutTestsfastflexboxflexboxfailtoselectsamelineexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/flexbox/flexbox-fail-to-select-same-line-expected.html (0 => 209427)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/flexbox/flexbox-fail-to-select-same-line-expected.html (rev 0)
+++ trunk/LayoutTests/fast/flexbox/flexbox-fail-to-select-same-line-expected.html 2016-12-06 23:06:42 UTC (rev 209427)
</span><span class="lines">@@ -0,0 +1,22 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<title>This tests that we can select flex content when they share the same line.</title>
+<style>
+div {
+ color: transparent;
+ font-size: 10px;
+}
+
+div::selection {
+ background-color: green;
+}
+</style>
+</head>
+<body>
+<div>&nbsp&nbsp</div>
+<script>
+ document.execCommand('selectAll', false, null);
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastflexboxflexboxfailtoselectsamelinehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/flexbox/flexbox-fail-to-select-same-line.html (0 => 209427)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/flexbox/flexbox-fail-to-select-same-line.html (rev 0)
+++ trunk/LayoutTests/fast/flexbox/flexbox-fail-to-select-same-line.html 2016-12-06 23:06:42 UTC (rev 209427)
</span><span class="lines">@@ -0,0 +1,23 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<title>This tests that we can select flex content when they share the same line.</title>
+<style>
+.line {
+ display: flex;
+ color: transparent;
+ font-size: 10px;
+}
+
+div::selection {
+ background-color: green;
+}
+</style>
+</head>
+<body>
+<div class="line"><div>&nbsp</div><div>&nbsp</div></div>
+<script>
+ document.execCommand('selectAll', false, null);
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (209426 => 209427)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-12-06 23:01:56 UTC (rev 209426)
+++ trunk/Source/WebCore/ChangeLog 2016-12-06 23:06:42 UTC (rev 209427)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2016-12-06 Zalan Bujtas <zalan@apple.com>
+
+ Can not select whole line when using flexbox
+ https://bugs.webkit.org/show_bug.cgi?id=165299
+
+ Reviewed by David Hyatt.
+
+ RootInlineBox::selectionTopAdjustedForPrecedingBlock assumes that the preceding block is
+ always above the current line. However in certain layout contexts (flex as an example) the block before
+ could just be on the same line as the current one.
+
+ This patch checks if we actually need to adjust the selection top to avoid vertical selection overlap.
+
+ Test: fast/flexbox/flexbox-fail-to-select-same-line.html
+
+ * rendering/RenderBlock.cpp:
+ (WebCore::RenderBlock::blockBeforeWithinSelectionRoot): Deleted.
+ * rendering/RenderBlock.h:
+ * rendering/RootInlineBox.cpp:
+ (WebCore::blockBeforeWithinSelectionRoot):
+ (WebCore::RootInlineBox::selectionTopAdjustedForPrecedingBlock):
+
</ins><span class="cx"> 2016-12-06 Ryosuke Niwa <rniwa@webkit.org>
</span><span class="cx">
</span><span class="cx"> Add more assertions to ElementQueue diagnose a bug
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBlockcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBlock.cpp (209426 => 209427)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBlock.cpp 2016-12-06 23:01:56 UTC (rev 209426)
+++ trunk/Source/WebCore/rendering/RenderBlock.cpp 2016-12-06 23:06:42 UTC (rev 209427)
</span><span class="lines">@@ -2201,38 +2201,6 @@
</span><span class="cx"> return logicalRight;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RenderBlock* RenderBlock::blockBeforeWithinSelectionRoot(LayoutSize& offset) const
-{
- if (isSelectionRoot())
- return nullptr;
-
- const RenderElement* object = this;
- RenderObject* sibling;
- do {
- sibling = object->previousSibling();
- while (sibling && (!is<RenderBlock>(*sibling) || downcast<RenderBlock>(*sibling).isSelectionRoot()))
- sibling = sibling->previousSibling();
-
- offset -= LayoutSize(downcast<RenderBlock>(*object).logicalLeft(), downcast<RenderBlock>(*object).logicalTop());
- object = object->parent();
- } while (!sibling && is<RenderBlock>(object) && !downcast<RenderBlock>(*object).isSelectionRoot());
-
- if (!sibling)
- return nullptr;
-
- RenderBlock* beforeBlock = downcast<RenderBlock>(sibling);
-
- offset += LayoutSize(beforeBlock->logicalLeft(), beforeBlock->logicalTop());
-
- RenderObject* child = beforeBlock->lastChild();
- while (is<RenderBlock>(child)) {
- beforeBlock = downcast<RenderBlock>(child);
- offset += LayoutSize(beforeBlock->logicalLeft(), beforeBlock->logicalTop());
- child = beforeBlock->lastChild();
- }
- return beforeBlock;
-}
-
</del><span class="cx"> TrackedRendererListHashSet* RenderBlock::positionedObjects() const
</span><span class="cx"> {
</span><span class="cx"> return positionedDescendantsMap().positionedRenderers(*this);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBlockh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBlock.h (209426 => 209427)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBlock.h 2016-12-06 23:01:56 UTC (rev 209426)
+++ trunk/Source/WebCore/rendering/RenderBlock.h 2016-12-06 23:06:42 UTC (rev 209427)
</span><span class="lines">@@ -176,7 +176,7 @@
</span><span class="cx"> LayoutRect logicalRightSelectionGap(RenderBlock& rootBlock, const LayoutPoint& rootBlockPhysicalPosition, const LayoutSize& offsetFromRootBlock,
</span><span class="cx"> RenderBoxModelObject* selObj, LayoutUnit logicalRight, LayoutUnit logicalTop, LayoutUnit logicalHeight, const LogicalSelectionOffsetCaches&, const PaintInfo*);
</span><span class="cx"> void getSelectionGapInfo(SelectionState, bool& leftGap, bool& rightGap);
</span><del>- RenderBlock* blockBeforeWithinSelectionRoot(LayoutSize& offset) const;
</del><ins>+ bool isSelectionRoot() const;
</ins><span class="cx">
</span><span class="cx"> LayoutRect logicalRectToPhysicalRect(const LayoutPoint& physicalPosition, const LayoutRect& logicalRect);
</span><span class="cx">
</span><span class="lines">@@ -457,7 +457,6 @@
</span><span class="cx"> return selectionGapRectsForRepaint(repaintContainer);
</span><span class="cx"> }
</span><span class="cx"> bool shouldPaintSelectionGaps() const final;
</span><del>- bool isSelectionRoot() const;
</del><span class="cx"> GapRects selectionGaps(RenderBlock& rootBlock, const LayoutPoint& rootBlockPhysicalPosition, const LayoutSize& offsetFromRootBlock,
</span><span class="cx"> LayoutUnit& lastLogicalTop, LayoutUnit& lastLogicalLeft, LayoutUnit& lastLogicalRight, const LogicalSelectionOffsetCaches&, const PaintInfo* = 0);
</span><span class="cx"> // FIXME-BLOCKFLOW: Remove virtualizaion when all callers have moved to RenderBlockFlow
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRootInlineBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RootInlineBox.cpp (209426 => 209427)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RootInlineBox.cpp 2016-12-06 23:01:56 UTC (rev 209426)
+++ trunk/Source/WebCore/rendering/RootInlineBox.cpp 2016-12-06 23:06:42 UTC (rev 209427)
</span><span class="lines">@@ -641,29 +641,64 @@
</span><span class="cx"> return prevBottom;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static RenderBlock* blockBeforeWithinSelectionRoot(const RenderBlockFlow& blockFlow, LayoutSize& offset)
+{
+ if (blockFlow.isSelectionRoot())
+ return nullptr;
+
+ const RenderElement* object = &blockFlow;
+ RenderObject* sibling;
+ do {
+ sibling = object->previousSibling();
+ while (sibling && (!is<RenderBlock>(*sibling) || downcast<RenderBlock>(*sibling).isSelectionRoot()))
+ sibling = sibling->previousSibling();
+
+ offset -= LayoutSize(downcast<RenderBlock>(*object).logicalLeft(), downcast<RenderBlock>(*object).logicalTop());
+ object = object->parent();
+ } while (!sibling && is<RenderBlock>(object) && !downcast<RenderBlock>(*object).isSelectionRoot());
+
+ if (!sibling)
+ return nullptr;
+
+ RenderBlock* beforeBlock = downcast<RenderBlock>(sibling);
+
+ offset += LayoutSize(beforeBlock->logicalLeft(), beforeBlock->logicalTop());
+
+ RenderObject* child = beforeBlock->lastChild();
+ while (is<RenderBlock>(child)) {
+ beforeBlock = downcast<RenderBlock>(child);
+ offset += LayoutSize(beforeBlock->logicalLeft(), beforeBlock->logicalTop());
+ child = beforeBlock->lastChild();
+ }
+ return beforeBlock;
+}
+
</ins><span class="cx"> LayoutUnit RootInlineBox::selectionTopAdjustedForPrecedingBlock() const
</span><span class="cx"> {
</span><span class="cx"> const RootInlineBox& rootBox = root();
</span><span class="cx"> LayoutUnit top = selectionTop();
</span><span class="cx">
</span><del>- RenderObject::SelectionState blockSelectionState = rootBox.blockFlow().selectionState();
</del><ins>+ auto blockSelectionState = rootBox.blockFlow().selectionState();
</ins><span class="cx"> if (blockSelectionState != RenderObject::SelectionInside && blockSelectionState != RenderObject::SelectionEnd)
</span><span class="cx"> return top;
</span><span class="cx">
</span><span class="cx"> LayoutSize offsetToBlockBefore;
</span><del>- if (RenderBlock* block = rootBox.blockFlow().blockBeforeWithinSelectionRoot(offsetToBlockBefore)) {
- if (is<RenderBlockFlow>(*block)) {
- if (RootInlineBox* lastLine = downcast<RenderBlockFlow>(*block).lastRootBox()) {
- RenderObject::SelectionState lastLineSelectionState = lastLine->selectionState();
- if (lastLineSelectionState != RenderObject::SelectionInside && lastLineSelectionState != RenderObject::SelectionStart)
- return top;
</del><ins>+ auto* blockBefore = blockBeforeWithinSelectionRoot(rootBox.blockFlow(), offsetToBlockBefore);
+ if (!is<RenderBlockFlow>(blockBefore))
+ return top;
</ins><span class="cx">
</span><del>- LayoutUnit lastLineSelectionBottom = lastLine->selectionBottom() + offsetToBlockBefore.height();
- top = std::max(top, lastLineSelectionBottom);
- }
- }
</del><ins>+ // Do not adjust blocks sharing the same line.
+ if (!offsetToBlockBefore.height())
+ return top;
+
+ if (auto* lastLine = downcast<RenderBlockFlow>(*blockBefore).lastRootBox()) {
+ RenderObject::SelectionState lastLineSelectionState = lastLine->selectionState();
+ if (lastLineSelectionState != RenderObject::SelectionInside && lastLineSelectionState != RenderObject::SelectionStart)
+ return top;
+
+ LayoutUnit lastLineSelectionBottom = lastLine->selectionBottom() + offsetToBlockBefore.height();
+ top = std::max(top, lastLineSelectionBottom);
</ins><span class="cx"> }
</span><del>-
</del><span class="cx"> return top;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>