<!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>[168095] 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/168095">168095</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2014-05-01 06:31:46 -0700 (Thu, 01 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Subpixel rendering: Inline text selection painting should not snap to integral CSS pixel position.
https://bugs.webkit.org/show_bug.cgi?id=132164
Reviewed by Darin Adler.
Inline text selection painting now snaps to device pixels. It uses the same rounding logic as
other painting functions.
Source/WebCore:
Test: fast/inline/hidpi-select-inline-on-subpixel-position.html
* rendering/EllipsisBox.cpp:
(WebCore::EllipsisBox::paintSelection):
* rendering/InlineTextBox.cpp:
(WebCore::InlineTextBox::paintSelection):
(WebCore::alignSelectionRectToDevicePixels): Deleted.
* rendering/InlineTextBox.h:
LayoutTests:
* fast/inline/hidpi-select-inline-on-subpixel-position-expected.html: Added.
* fast/inline/hidpi-select-inline-on-subpixel-position.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="#trunkSourceWebCorerenderingEllipsisBoxcpp">trunk/Source/WebCore/rendering/EllipsisBox.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingInlineTextBoxcpp">trunk/Source/WebCore/rendering/InlineTextBox.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingInlineTextBoxh">trunk/Source/WebCore/rendering/InlineTextBox.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastinlinehidpiselectinlineonsubpixelpositionexpectedhtml">trunk/LayoutTests/fast/inline/hidpi-select-inline-on-subpixel-position-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastinlinehidpiselectinlineonsubpixelpositionhtml">trunk/LayoutTests/fast/inline/hidpi-select-inline-on-subpixel-position.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (168094 => 168095)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-05-01 12:42:32 UTC (rev 168094)
+++ trunk/LayoutTests/ChangeLog 2014-05-01 13:31:46 UTC (rev 168095)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2014-05-01 Zalan Bujtas <zalan@apple.com>
+
+ Subpixel rendering: Inline text selection painting should not snap to integral CSS pixel position.
+ https://bugs.webkit.org/show_bug.cgi?id=132164
+
+ Reviewed by Darin Adler.
+
+ Inline text selection painting now snaps to device pixels. It uses the same rounding logic as
+ other painting functions.
+
+ * fast/inline/hidpi-select-inline-on-subpixel-position-expected.html: Added.
+ * fast/inline/hidpi-select-inline-on-subpixel-position.html: Added.
+
</ins><span class="cx"> 2014-05-01 Rik Cabanier <cabanier@adobe.com>
</span><span class="cx">
</span><span class="cx"> Calling createPattern with a broken image must throw an invalidstate error
</span></span></pre></div>
<a id="trunkLayoutTestsfastinlinehidpiselectinlineonsubpixelpositionexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/inline/hidpi-select-inline-on-subpixel-position-expected.html (0 => 168095)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/inline/hidpi-select-inline-on-subpixel-position-expected.html (rev 0)
+++ trunk/LayoutTests/fast/inline/hidpi-select-inline-on-subpixel-position-expected.html 2014-05-01 13:31:46 UTC (rev 168095)
</span><span class="lines">@@ -0,0 +1,32 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<title>This tests that inline text selection can paint to subpixel position.</title>
+<style>
+ div {
+ font-size: 16px;
+ width: 21px;
+ height: 18px;
+ position: fixed;
+ background: rgba(255, 0, 0, 0.9);
+ }
+</style>
+</head>
+<body>
+<p id="container"></p>
+<script>
+ var container = document.getElementById("container");
+ adjustment = 0.1;
+ for (i = 0; i < 10; ++i) {
+ adjustment+=0.1;
+ for (j = 0; j < 10; ++j) {
+ var e = document.createElement("div");
+ e.style.top = (30 * i + j * adjustment) + "px";
+ e.style.left = (30 * j + i * adjustment) + "px";
+ e.innerHTML = "foo";
+ container.appendChild(e);
+ }
+ }
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastinlinehidpiselectinlineonsubpixelpositionhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/inline/hidpi-select-inline-on-subpixel-position.html (0 => 168095)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/inline/hidpi-select-inline-on-subpixel-position.html (rev 0)
+++ trunk/LayoutTests/fast/inline/hidpi-select-inline-on-subpixel-position.html 2014-05-01 13:31:46 UTC (rev 168095)
</span><span class="lines">@@ -0,0 +1,41 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<title>This tests that inline text selection can paint to subpixel position.</title>
+<style>
+ ::selection {
+ background: rgba(255, 0, 0, 0.9);
+ }
+
+ div {
+ font-size: 16px;
+ height: 10px;
+ width: 1px;
+ height: 1px;
+ position: fixed;
+ }
+
+</style>
+</head>
+<body>
+<p id="container"></p>
+<script>
+ var container = document.getElementById("container");
+ adjustment = 0.1;
+ for (i = 0; i < 10; ++i) {
+ adjustment+=0.1;
+ for (j = 0; j < 10; ++j) {
+ var e = document.createElement("div");
+ e.style.top = (30 * i + j * adjustment) + "px";
+ e.style.left = (30 * j + i * adjustment) + "px";
+ e.innerHTML = "foo";
+ container.appendChild(e);
+ }
+ }
+
+ var range = document.createRange();
+ range.selectNode(document.getElementById("container"));
+ window.getSelection().addRange(range);
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (168094 => 168095)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-05-01 12:42:32 UTC (rev 168094)
+++ trunk/Source/WebCore/ChangeLog 2014-05-01 13:31:46 UTC (rev 168095)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2014-05-01 Zalan Bujtas <zalan@apple.com>
+
+ Subpixel rendering: Inline text selection painting should not snap to integral CSS pixel position.
+ https://bugs.webkit.org/show_bug.cgi?id=132164
+
+ Reviewed by Darin Adler.
+
+ Inline text selection painting now snaps to device pixels. It uses the same rounding logic as
+ other painting functions.
+
+ Test: fast/inline/hidpi-select-inline-on-subpixel-position.html
+
+ * rendering/EllipsisBox.cpp:
+ (WebCore::EllipsisBox::paintSelection):
+ * rendering/InlineTextBox.cpp:
+ (WebCore::InlineTextBox::paintSelection):
+ (WebCore::alignSelectionRectToDevicePixels): Deleted.
+ * rendering/InlineTextBox.h:
+
</ins><span class="cx"> 2014-05-01 Ryuan Choi <ryuan.choi@samsung.com>
</span><span class="cx">
</span><span class="cx"> [EFL] There are many warnings with software backend
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingEllipsisBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/EllipsisBox.cpp (168094 => 168095)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/EllipsisBox.cpp 2014-05-01 12:42:32 UTC (rev 168094)
+++ trunk/Source/WebCore/rendering/EllipsisBox.cpp 2014-05-01 13:31:46 UTC (rev 168095)
</span><span class="lines">@@ -131,13 +131,13 @@
</span><span class="cx"> const RootInlineBox& rootBox = root();
</span><span class="cx"> LayoutUnit top = rootBox.selectionTop();
</span><span class="cx"> LayoutUnit h = rootBox.selectionHeight();
</span><del>- FloatRect clipRect(x() + paintOffset.x(), top + paintOffset.y(), m_logicalWidth, h);
- alignSelectionRectToDevicePixels(clipRect);
</del><span class="cx">
</span><span class="cx"> GraphicsContextStateSaver stateSaver(*context);
</span><del>- context->clip(clipRect);
</del><ins>+ float deviceScaleFactor = renderer().document().deviceScaleFactor();
+ context->clip(pixelSnappedForPainting(x() + paintOffset.x(), top + paintOffset.y(), m_logicalWidth, h, renderer().document().deviceScaleFactor()));
</ins><span class="cx"> // FIXME: Why is this always LTR? Fix by passing correct text run flags below.
</span><del>- context->drawHighlightForText(font, RenderBlock::constructTextRun(&blockFlow(), font, m_str, style, TextRun::AllowTrailingExpansion), roundedIntPoint(LayoutPoint(x() + paintOffset.x(), y() + paintOffset.y() + top)), h, c, style.colorSpace());
</del><ins>+ FloatPoint localOrigin = roundedForPainting(LayoutPoint(x() + paintOffset.x(), y() + paintOffset.y() + top), deviceScaleFactor);
+ context->drawHighlightForText(font, RenderBlock::constructTextRun(&blockFlow(), font, m_str, style, TextRun::AllowTrailingExpansion), localOrigin, h, c, style.colorSpace());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool EllipsisBox::nodeAtPoint(const HitTestRequest& request, HitTestResult& result, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, LayoutUnit lineTop, LayoutUnit lineBottom)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingInlineTextBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/InlineTextBox.cpp (168094 => 168095)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/InlineTextBox.cpp 2014-05-01 12:42:32 UTC (rev 168094)
+++ trunk/Source/WebCore/rendering/InlineTextBox.cpp 2014-05-01 13:31:46 UTC (rev 168095)
</span><span class="lines">@@ -712,13 +712,6 @@
</span><span class="cx"> ePos = std::min(endPos - m_start, (int)m_len);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void alignSelectionRectToDevicePixels(FloatRect& rect)
-{
- float maxX = floorf(rect.maxX());
- rect.setX(floorf(rect.x()));
- rect.setWidth(roundf(maxX - rect.x()));
-}
-
</del><span class="cx"> void InlineTextBox::paintSelection(GraphicsContext* context, const FloatPoint& boxOrigin, const RenderStyle& style, const Font& font, Color textColor)
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(TEXT_SELECTION)
</span><span class="lines">@@ -763,16 +756,13 @@
</span><span class="cx"> LayoutUnit selectionBottom = rootBox.selectionBottom();
</span><span class="cx"> LayoutUnit selectionTop = rootBox.selectionTopAdjustedForPrecedingBlock();
</span><span class="cx">
</span><del>- int deltaY = roundToInt(renderer().style().isFlippedLinesWritingMode() ? selectionBottom - logicalBottom() : logicalTop() - selectionTop);
- int selHeight = std::max(0, roundToInt(selectionBottom - selectionTop));
</del><ins>+ LayoutUnit deltaY = renderer().style().isFlippedLinesWritingMode() ? selectionBottom - logicalBottom() : logicalTop() - selectionTop;
+ LayoutUnit selectionHeight = std::max<LayoutUnit>(0, selectionBottom - selectionTop);
</ins><span class="cx">
</span><del>- FloatPoint localOrigin(boxOrigin.x(), boxOrigin.y() - deltaY);
- FloatRect clipRect(localOrigin, FloatSize(m_logicalWidth, selHeight));
- alignSelectionRectToDevicePixels(clipRect);
-
- context->clip(clipRect);
-
- context->drawHighlightForText(font, textRun, localOrigin, selHeight, c, style.colorSpace(), sPos, ePos);
</del><ins>+ float deviceScaleFactor = renderer().document().deviceScaleFactor();
+ FloatPoint localOrigin = roundedForPainting(LayoutPoint(boxOrigin.x(), boxOrigin.y() - deltaY), deviceScaleFactor);
+ context->clip(pixelSnappedForPainting(LayoutRect(LayoutPoint(localOrigin), LayoutSize(m_logicalWidth, selectionHeight)), deviceScaleFactor));
+ context->drawHighlightForText(font, textRun, localOrigin, selectionHeight, c, style.colorSpace(), sPos, ePos);
</ins><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(context);
</span><span class="cx"> UNUSED_PARAM(boxOrigin);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingInlineTextBoxh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/InlineTextBox.h (168094 => 168095)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/InlineTextBox.h 2014-05-01 12:42:32 UTC (rev 168094)
+++ trunk/Source/WebCore/rendering/InlineTextBox.h 2014-05-01 13:31:46 UTC (rev 168095)
</span><span class="lines">@@ -197,8 +197,6 @@
</span><span class="cx">
</span><span class="cx"> INLINE_BOX_OBJECT_TYPE_CASTS(InlineTextBox, isInlineTextBox())
</span><span class="cx">
</span><del>-void alignSelectionRectToDevicePixels(FloatRect&);
-
</del><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif // InlineTextBox_h
</span></span></pre>
</div>
</div>
</body>
</html>