<!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>[199304] 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/199304">199304</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2016-04-11 12:31:12 -0700 (Mon, 11 Apr 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>REGRESSION (<a href="http://trac.webkit.org/projects/webkit/changeset/193857">r193857</a>): Text selection causes text to disappear.
https://bugs.webkit.org/show_bug.cgi?id=156448
rdar://problem/25578952
Reviewed by Simon Fraser.
Apparently when the end position of the selection range is smaller than the start position, we need
to repaint the entire text as it indicates selection clearing.
Source/WebCore:
Test: fast/text/text-disappear-on-deselect.html
* rendering/TextPainter.cpp:
(WebCore::TextPainter::paintText):
LayoutTests:
* fast/text/text-disappear-on-deselect-expected.html: Added.
* fast/text/text-disappear-on-deselect.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsplatformiossimulatorTestExpectations">trunk/LayoutTests/platform/ios-simulator/TestExpectations</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingTextPaintercpp">trunk/Source/WebCore/rendering/TextPainter.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfasttexttextdisappearondeselectexpectedhtml">trunk/LayoutTests/fast/text/text-disappear-on-deselect-expected.html</a></li>
<li><a href="#trunkLayoutTestsfasttexttextdisappearondeselecthtml">trunk/LayoutTests/fast/text/text-disappear-on-deselect.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (199303 => 199304)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-04-11 19:31:04 UTC (rev 199303)
+++ trunk/LayoutTests/ChangeLog 2016-04-11 19:31:12 UTC (rev 199304)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2016-04-11 Zalan Bujtas <zalan@apple.com>
+
+ REGRESSION (r193857): Text selection causes text to disappear.
+ https://bugs.webkit.org/show_bug.cgi?id=156448
+ rdar://problem/25578952
+
+ Reviewed by Simon Fraser.
+
+ Apparently when the end position of the selection range is smaller than the start position, we need
+ to repaint the entire text as it indicates selection clearing.
+
+ * fast/text/text-disappear-on-deselect-expected.html: Added.
+ * fast/text/text-disappear-on-deselect.html: Added.
+
</ins><span class="cx"> 2016-04-11 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> DOMTokenList.contains() should not throw
</span></span></pre></div>
<a id="trunkLayoutTestsfasttexttextdisappearondeselectexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/text/text-disappear-on-deselect-expected.html (0 => 199304)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/text-disappear-on-deselect-expected.html (rev 0)
+++ trunk/LayoutTests/fast/text/text-disappear-on-deselect-expected.html 2016-04-11 19:31:12 UTC (rev 199304)
</span><span class="lines">@@ -0,0 +1,20 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<title>This tests that deselecting text over multiple lines does not make the text disappear.</title>
+<style>
+div {
+ font-family: Ahem;
+ font-size: 10px;
+}
+
+.red {
+ color: red;
+}
+</style>
+</head>
+<body>
+<div><span class=red>foobar</span><br>
+<span class=red>f</span>oobar foobar</div>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfasttexttextdisappearondeselecthtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/text/text-disappear-on-deselect.html (0 => 199304)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/text-disappear-on-deselect.html (rev 0)
+++ trunk/LayoutTests/fast/text/text-disappear-on-deselect.html 2016-04-11 19:31:12 UTC (rev 199304)
</span><span class="lines">@@ -0,0 +1,30 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<title>This tests that deselecting text over multiple lines does not make the text disappear.</title>
+<style>
+div {
+ font-family: Ahem;
+ font-size: 10px;
+}
+
+::selection {
+ color: red;
+}
+</style>
+</head>
+<body>
+<div id=foobar>foobar<br>
+foobar foobar</div>
+<script>
+var target = document.getElementById("foobar");
+if (window.eventSender) {
+ window.eventSender.mouseMoveTo(target.offsetLeft, target.offsetTop);
+ window.eventSender.mouseDown();
+ window.eventSender.mouseMoveTo(target.offsetLeft + 10, target.offsetTop + target.offsetHeight + 15);
+ window.eventSender.mouseMoveTo(target.offsetLeft + 10, target.offsetTop + target.offsetHeight - 5);
+ window.eventSender.mouseUp();
+}
+</script>
+</body>
+</html>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkLayoutTestsplatformiossimulatorTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/ios-simulator/TestExpectations (199303 => 199304)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/ios-simulator/TestExpectations 2016-04-11 19:31:04 UTC (rev 199303)
+++ trunk/LayoutTests/platform/ios-simulator/TestExpectations 2016-04-11 19:31:12 UTC (rev 199304)
</span><span class="lines">@@ -245,7 +245,9 @@
</span><span class="cx"> fast/scrolling/scroll-animator-overlay-scrollbars-hovered.html [ Skip ]
</span><span class="cx"> fast/scrolling/scroll-animator-select-list-events.html [ Skip ]
</span><span class="cx"> fast/events/prevent-default-prevents-interaction-with-scrollbars.html [ Skip ]
</span><ins>+fast/text/text-disappear-on-deselect.html [ ImageOnlyFailure ]
</ins><span class="cx">
</span><ins>+
</ins><span class="cx"> webkit.org/b/148695 fast/shadow-dom [ Pass ]
</span><span class="cx"> webkit.org/b/149440 fast/shadow-dom/css-scoping-shadow-host-functional-rule.html [ ImageOnlyFailure ]
</span><span class="cx"> webkit.org/b/149441 fast/shadow-dom/css-scoping-shadow-slotted-rule.html [ ImageOnlyFailure ]
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (199303 => 199304)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-04-11 19:31:04 UTC (rev 199303)
+++ trunk/Source/WebCore/ChangeLog 2016-04-11 19:31:12 UTC (rev 199304)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2016-04-11 Zalan Bujtas <zalan@apple.com>
+
+ REGRESSION (r193857): Text selection causes text to disappear.
+ https://bugs.webkit.org/show_bug.cgi?id=156448
+ rdar://problem/25578952
+
+ Reviewed by Simon Fraser.
+
+ Apparently when the end position of the selection range is smaller than the start position, we need
+ to repaint the entire text as it indicates selection clearing.
+
+ Test: fast/text/text-disappear-on-deselect.html
+
+ * rendering/TextPainter.cpp:
+ (WebCore::TextPainter::paintText):
+
</ins><span class="cx"> 2016-04-05 Oliver Hunt <oliver@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove compile time define for SEPARATED_HEAP
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingTextPaintercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/TextPainter.cpp (199303 => 199304)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/TextPainter.cpp 2016-04-11 19:31:04 UTC (rev 199303)
+++ trunk/Source/WebCore/rendering/TextPainter.cpp 2016-04-11 19:31:12 UTC (rev 199304)
</span><span class="lines">@@ -154,16 +154,17 @@
</span><span class="cx"> // effect, so only when we know we're stroking, do a save/restore.
</span><span class="cx"> GraphicsContextStateSaver stateSaver(m_context, m_textPaintStyle.strokeWidth > 0);
</span><span class="cx"> updateGraphicsContext(m_context, m_textPaintStyle);
</span><del>- if (paintSelectedTextSeparately) {
</del><ins>+ bool fullPaint = !paintSelectedTextSeparately || selectionEnd <= selectionStart;
+ if (fullPaint)
+ paintTextAndEmphasisMarksIfNeeded(textRun, boxRect, textOrigin, 0, length, m_textPaintStyle, m_textShadow);
+ else {
</ins><span class="cx"> // Paint the before and after selection parts.
</span><span class="cx"> if (selectionStart > 0)
</span><span class="cx"> paintTextAndEmphasisMarksIfNeeded(textRun, boxRect, textOrigin, 0, selectionStart, m_textPaintStyle, m_textShadow);
</span><span class="cx"> if (selectionEnd < length)
</span><span class="cx"> paintTextAndEmphasisMarksIfNeeded(textRun, boxRect, textOrigin, selectionEnd, length, m_textPaintStyle, m_textShadow);
</span><del>- } else
- paintTextAndEmphasisMarksIfNeeded(textRun, boxRect, textOrigin, 0, length, m_textPaintStyle, m_textShadow);
</del><ins>+ }
</ins><span class="cx"> }
</span><del>-
</del><span class="cx"> // Paint only the text that is selected.
</span><span class="cx"> if ((paintSelectedTextOnly || paintSelectedTextSeparately) && selectionStart < selectionEnd) {
</span><span class="cx"> GraphicsContextStateSaver stateSaver(m_context, m_selectionPaintStyle.strokeWidth > 0);
</span></span></pre>
</div>
</div>
</body>
</html>