<!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>[165670] 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/165670">165670</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2014-03-14 19:42:07 -0700 (Fri, 14 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Subpixel rendering: border-radius painting falls back to rectangle at subpixel positions.
https://bugs.webkit.org/show_bug.cgi?id=130272
Reviewed by Simon Fraser.
Rounded rectangle's radius needs adjustment after its containing rect gets pixel snapped.
Keeping the old radius value could make rounded rectangle non-renderable, because the
originally calculated radius length does not fit the snapped rectangle anymore.
Source/WebCore:
Test: fast/borders/hidpi-border-radius-outer-border-goes-rectangle.html
* platform/graphics/RoundedRect.cpp:
(WebCore::RoundedRect::pixelSnappedRoundedRectForPainting):
* rendering/RenderBoxModelObject.cpp:
(WebCore::RenderBoxModelObject::paintBorder):
LayoutTests:
* fast/borders/hidpi-border-radius-outer-border-goes-rectangle-expected-mismatch.html: Added.
* fast/borders/hidpi-border-radius-outer-border-goes-rectangle.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="#trunkSourceWebCoreplatformgraphicsRoundedRectcpp">trunk/Source/WebCore/platform/graphics/RoundedRect.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBoxModelObjectcpp">trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastbordershidpiborderradiusouterbordergoesrectangleexpectedmismatchhtml">trunk/LayoutTests/fast/borders/hidpi-border-radius-outer-border-goes-rectangle-expected-mismatch.html</a></li>
<li><a href="#trunkLayoutTestsfastbordershidpiborderradiusouterbordergoesrectanglehtml">trunk/LayoutTests/fast/borders/hidpi-border-radius-outer-border-goes-rectangle.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (165669 => 165670)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-03-15 01:15:56 UTC (rev 165669)
+++ trunk/LayoutTests/ChangeLog 2014-03-15 02:42:07 UTC (rev 165670)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2014-03-14 Zalan Bujtas <zalan@apple.com>
+
+ Subpixel rendering: border-radius painting falls back to rectangle at subpixel positions.
+ https://bugs.webkit.org/show_bug.cgi?id=130272
+
+ Reviewed by Simon Fraser.
+
+ Rounded rectangle's radius needs adjustment after its containing rect gets pixel snapped.
+ Keeping the old radius value could make rounded rectangle non-renderable, because the
+ originally calculated radius length does not fit the snapped rectangle anymore.
+
+ * fast/borders/hidpi-border-radius-outer-border-goes-rectangle-expected-mismatch.html: Added.
+ * fast/borders/hidpi-border-radius-outer-border-goes-rectangle.html: Added.
+
</ins><span class="cx"> 2014-03-14 Byungseon Shin <sun.shin@lge.com>
</span><span class="cx">
</span><span class="cx"> Incorrect Date returned between March 1, 2034 and February 28, 2100.
</span></span></pre></div>
<a id="trunkLayoutTestsfastbordershidpiborderradiusouterbordergoesrectangleexpectedmismatchhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/borders/hidpi-border-radius-outer-border-goes-rectangle-expected-mismatch.html (0 => 165670)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/borders/hidpi-border-radius-outer-border-goes-rectangle-expected-mismatch.html (rev 0)
+++ trunk/LayoutTests/fast/borders/hidpi-border-radius-outer-border-goes-rectangle-expected-mismatch.html 2014-03-15 02:42:07 UTC (rev 165670)
</span><span class="lines">@@ -0,0 +1,34 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<style>
+ .radius {
+ width: 20px;
+ height: 20px;
+ position: absolute;
+ border: 1px solid red;
+ background: red;
+ }
+</style>
+</head>
+<body>
+<p id="container"></p>
+<script>
+ offset = 45;
+ radius = 20;
+ borderWidth = 0.6;
+ var container = document.getElementById("container");
+ for (i = 0; i < 10; ++i) {
+ borderWidth+=0.5;
+ for (j = 0; j < 10; ++j, radius+=0.1) {
+ var e = document.createElement("div");
+ e.style.top = i * offset + "px";
+ e.style.left = j * offset + "px";
+ e.style.borderWidth = borderWidth + "px";
+ e.className = "radius";
+ container.appendChild(e);
+ }
+ }
+</script>
+</body>
+</html>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkLayoutTestsfastbordershidpiborderradiusouterbordergoesrectanglehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/borders/hidpi-border-radius-outer-border-goes-rectangle.html (0 => 165670)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/borders/hidpi-border-radius-outer-border-goes-rectangle.html (rev 0)
+++ trunk/LayoutTests/fast/borders/hidpi-border-radius-outer-border-goes-rectangle.html 2014-03-15 02:42:07 UTC (rev 165670)
</span><span class="lines">@@ -0,0 +1,35 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<style>
+ .radius {
+ width: 20px;
+ height: 20px;
+ position: absolute;
+ border: 1px solid red;
+ background: red;
+ }
+</style>
+</head>
+<body>
+<p id="container"></p>
+<script>
+ offset = 45;
+ radius = 20;
+ borderWidth = 0.6;
+ var container = document.getElementById("container");
+ for (i = 0; i < 10; ++i) {
+ borderWidth+=0.5;
+ for (j = 0; j < 10; ++j, radius+=0.1) {
+ var e = document.createElement("div");
+ e.style.top = i * offset + "px";
+ e.style.left = j * offset + "px";
+ e.style.borderRadius = radius + "px";
+ e.style.borderWidth = borderWidth + "px";
+ e.className = "radius";
+ container.appendChild(e);
+ }
+ }
+</script>
+</body>
+</html>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (165669 => 165670)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-03-15 01:15:56 UTC (rev 165669)
+++ trunk/Source/WebCore/ChangeLog 2014-03-15 02:42:07 UTC (rev 165670)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2014-03-14 Zalan Bujtas <zalan@apple.com>
+
+ Subpixel rendering: border-radius painting falls back to rectangle at subpixel positions.
+ https://bugs.webkit.org/show_bug.cgi?id=130272
+
+ Reviewed by Simon Fraser.
+
+ Rounded rectangle's radius needs adjustment after its containing rect gets pixel snapped.
+ Keeping the old radius value could make rounded rectangle non-renderable, because the
+ originally calculated radius length does not fit the snapped rectangle anymore.
+
+ Test: fast/borders/hidpi-border-radius-outer-border-goes-rectangle.html
+
+ * platform/graphics/RoundedRect.cpp:
+ (WebCore::RoundedRect::pixelSnappedRoundedRectForPainting):
+ * rendering/RenderBoxModelObject.cpp:
+ (WebCore::RenderBoxModelObject::paintBorder):
+
</ins><span class="cx"> 2014-03-14 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS WK2] background-attachment: fixed renders oddly, moves around
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsRoundedRectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/RoundedRect.cpp (165669 => 165670)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/RoundedRect.cpp 2014-03-15 01:15:56 UTC (rev 165669)
+++ trunk/Source/WebCore/platform/graphics/RoundedRect.cpp 2014-03-15 02:42:07 UTC (rev 165670)
</span><span class="lines">@@ -239,7 +239,11 @@
</span><span class="cx">
</span><span class="cx"> FloatRoundedRect RoundedRect::pixelSnappedRoundedRectForPainting(float deviceScaleFactor) const
</span><span class="cx"> {
</span><del>- return FloatRoundedRect(pixelSnappedForPainting(rect(), deviceScaleFactor), radii());
</del><ins>+ const LayoutRect& originalRect = rect();
+ FloatRect paintingRect = pixelSnappedForPainting(rect(), deviceScaleFactor);
+ FloatRoundedRect::Radii paintingRadii = radii();
+ paintingRadii.shrink(paintingRect.y() - originalRect.y(), originalRect.maxY() - paintingRect.maxY(), paintingRect.x() - originalRect.x(), originalRect.maxX() - paintingRect.maxX());
+ return FloatRoundedRect(paintingRect, paintingRadii);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBoxModelObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp (165669 => 165670)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp 2014-03-15 01:15:56 UTC (rev 165669)
+++ trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp 2014-03-15 02:42:07 UTC (rev 165670)
</span><span class="lines">@@ -1883,11 +1883,11 @@
</span><span class="cx"> && (haveAllSolidEdges || (!outerBorder.isRounded() && !innerBorder.isRounded()))) {
</span><span class="cx"> Path path;
</span><span class="cx">
</span><del>- FloatRoundedRect pixelSnappedRoundedRect = outerBorder.pixelSnappedRoundedRectForPainting(deviceScaleFactor);
- if (pixelSnappedRoundedRect.isRounded() && bleedAvoidance != BackgroundBleedUseTransparencyLayer)
- path.addRoundedRect(pixelSnappedRoundedRect);
</del><ins>+ FloatRoundedRect pixelSnappedOuterBorder = outerBorder.pixelSnappedRoundedRectForPainting(deviceScaleFactor);
+ if (pixelSnappedOuterBorder.isRounded() && bleedAvoidance != BackgroundBleedUseTransparencyLayer)
+ path.addRoundedRect(pixelSnappedOuterBorder);
</ins><span class="cx"> else
</span><del>- path.addRect(pixelSnappedRoundedRect.rect());
</del><ins>+ path.addRect(pixelSnappedOuterBorder.rect());
</ins><span class="cx">
</span><span class="cx"> if (haveAllDoubleEdges) {
</span><span class="cx"> LayoutRect innerThirdRect = outerBorder.rect();
</span><span class="lines">@@ -1928,11 +1928,11 @@
</span><span class="cx"> path.addRect(pixelSnappedInnerThird.rect());
</span><span class="cx"> }
</span><span class="cx">
</span><del>- FloatRoundedRect snappedInnerBorder = innerBorder.pixelSnappedRoundedRectForPainting(deviceScaleFactor);
- if (snappedInnerBorder.isRounded())
- path.addRoundedRect(snappedInnerBorder);
</del><ins>+ FloatRoundedRect pixelSnappedInnerBorder = innerBorder.pixelSnappedRoundedRectForPainting(deviceScaleFactor);
+ if (pixelSnappedInnerBorder.isRounded())
+ path.addRoundedRect(pixelSnappedInnerBorder);
</ins><span class="cx"> else
</span><del>- path.addRect(snappedInnerBorder.rect());
</del><ins>+ path.addRect(pixelSnappedInnerBorder.rect());
</ins><span class="cx">
</span><span class="cx"> graphicsContext->setFillRule(RULE_EVENODD);
</span><span class="cx"> graphicsContext->setFillColor(edges[firstVisibleEdge].color, style.colorSpace());
</span></span></pre>
</div>
</div>
</body>
</html>