<!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>[169257] 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/169257">169257</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2014-05-23 07:27:19 -0700 (Fri, 23 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Subpixel rendering: Make webkit-box-shadow painting subpixel aware.
https://bugs.webkit.org/show_bug.cgi?id=133201
<rdar://problem/16072830>
Reviewed by Simon Fraser.
This patch enables webkit-box-shadow to be painted on a subpixel position. However, we
still truncate -webkit-box-shadow property values. Tracked here: http://webkit.org/b/133202
Source/WebCore:
Test: fast/box-shadow/hidpi-webkit-box-shadow-subpixel-position.html
* platform/graphics/FloatRoundedRect.cpp:
(WebCore::FloatRoundedRect::inflateWithRadii): same as in from RoundedRect.
(WebCore::FloatRoundedRect::adjustRadii): same as in from RoundedRect.
* platform/graphics/FloatRoundedRect.h:
* rendering/RenderBoxModelObject.cpp:
(WebCore::RenderBoxModelObject::paintBoxShadow):
LayoutTests:
Currently not ref-testable.
* fast/box-shadow/hidpi-webkit-box-shadow-subpixel-position.html: Added.
* platform/mac/fast/box-shadow/hidpi-webkit-box-shadow-subpixel-position-expected.png: Added.
* platform/mac/fast/box-shadow/hidpi-webkit-box-shadow-subpixel-position-expected.txt: 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="#trunkSourceWebCoreplatformgraphicsFloatRoundedRectcpp">trunk/Source/WebCore/platform/graphics/FloatRoundedRect.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsFloatRoundedRecth">trunk/Source/WebCore/platform/graphics/FloatRoundedRect.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBoxModelObjectcpp">trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastboxshadowhidpiwebkitboxshadowsubpixelpositionhtml">trunk/LayoutTests/fast/box-shadow/hidpi-webkit-box-shadow-subpixel-position.html</a></li>
<li><a href="#trunkLayoutTestsplatformmacfastboxshadowhidpiwebkitboxshadowsubpixelpositionexpectedpng">trunk/LayoutTests/platform/mac/fast/box-shadow/hidpi-webkit-box-shadow-subpixel-position-expected.png</a></li>
<li><a href="#trunkLayoutTestsplatformmacfastboxshadowhidpiwebkitboxshadowsubpixelpositionexpectedtxt">trunk/LayoutTests/platform/mac/fast/box-shadow/hidpi-webkit-box-shadow-subpixel-position-expected.txt</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (169256 => 169257)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-05-23 10:29:21 UTC (rev 169256)
+++ trunk/LayoutTests/ChangeLog 2014-05-23 14:27:19 UTC (rev 169257)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2014-05-23 Zalan Bujtas <zalan@apple.com>
+
+ Subpixel rendering: Make webkit-box-shadow painting subpixel aware.
+ https://bugs.webkit.org/show_bug.cgi?id=133201
+ <rdar://problem/16072830>
+
+ Reviewed by Simon Fraser.
+
+ This patch enables webkit-box-shadow to be painted on a subpixel position. However, we
+ still truncate -webkit-box-shadow property values. Tracked here: http://webkit.org/b/133202
+
+ Currently not ref-testable.
+
+ * fast/box-shadow/hidpi-webkit-box-shadow-subpixel-position.html: Added.
+ * platform/mac/fast/box-shadow/hidpi-webkit-box-shadow-subpixel-position-expected.png: Added.
+ * platform/mac/fast/box-shadow/hidpi-webkit-box-shadow-subpixel-position-expected.txt: Added.
+
</ins><span class="cx"> 2014-05-22 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Make viewport units work in CSS gradients
</span></span></pre></div>
<a id="trunkLayoutTestsfastboxshadowhidpiwebkitboxshadowsubpixelpositionhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/box-shadow/hidpi-webkit-box-shadow-subpixel-position.html (0 => 169257)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/box-shadow/hidpi-webkit-box-shadow-subpixel-position.html (rev 0)
+++ trunk/LayoutTests/fast/box-shadow/hidpi-webkit-box-shadow-subpixel-position.html 2014-05-23 14:27:19 UTC (rev 169257)
</span><span class="lines">@@ -0,0 +1,17 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<title>This tests whether -webkit-box-shadow on subpixel position is rendered correctly.</title>
+<style>
+ div {
+ display: inline-block;
+ width: 340px;
+ height: 40px;
+ }
+</style>
+</head>
+<body>
+spacingspacing<div style="-webkit-box-shadow: inset 0 0 1px rgba(0, 0, 0, 1.0);">inset webkit-box-shadow</div></br>
+spacingspacing<div style="-webkit-box-shadow: 0 0 1px rgba(0, 0, 0, 1.0);">normal webkit-box-shadow</div>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformmacfastboxshadowhidpiwebkitboxshadowsubpixelpositionexpectedpng"></a>
<div class="binary"><h4>Added: trunk/LayoutTests/platform/mac/fast/box-shadow/hidpi-webkit-box-shadow-subpixel-position-expected.png</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<span class="cx">Property changes on: trunk/LayoutTests/platform/mac/fast/box-shadow/hidpi-webkit-box-shadow-subpixel-position-expected.png
</span><span class="cx">___________________________________________________________________
</span><a id="svnmimetype"></a>
<div class="addfile"><h4>Added: svn:mime-type</h4></div>
<a id="trunkLayoutTestsplatformmacfastboxshadowhidpiwebkitboxshadowsubpixelpositionexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/platform/mac/fast/box-shadow/hidpi-webkit-box-shadow-subpixel-position-expected.txt (0 => 169257)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/fast/box-shadow/hidpi-webkit-box-shadow-subpixel-position-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/mac/fast/box-shadow/hidpi-webkit-box-shadow-subpixel-position-expected.txt 2014-05-23 14:27:19 UTC (rev 169257)
</span><span class="lines">@@ -0,0 +1,17 @@
</span><ins>+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x96
+ RenderBlock {HTML} at (0,0) size 800x96
+ RenderBody {BODY} at (8,8) size 784x80
+ RenderText {#text} at (0,0) size 96x18
+ text run at (0,0) width 96: "spacingspacing"
+ RenderBlock {DIV} at (96,0) size 340x40
+ RenderText {#text} at (0,0) size 159x18
+ text run at (0,0) width 159: "inset webkit-box-shadow"
+ RenderBR {BR} at (436,0) size 0x18
+ RenderText {#text} at (0,40) size 96x18
+ text run at (0,40) width 96: "spacingspacing"
+ RenderBlock {DIV} at (96,40) size 340x40
+ RenderText {#text} at (0,0) size 174x18
+ text run at (0,0) width 174: "normal webkit-box-shadow"
+ RenderText {#text} at (0,0) size 0x0
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (169256 => 169257)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-05-23 10:29:21 UTC (rev 169256)
+++ trunk/Source/WebCore/ChangeLog 2014-05-23 14:27:19 UTC (rev 169257)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2014-05-23 Zalan Bujtas <zalan@apple.com>
+
+ Subpixel rendering: Make webkit-box-shadow painting subpixel aware.
+ https://bugs.webkit.org/show_bug.cgi?id=133201
+ <rdar://problem/16072830>
+
+ Reviewed by Simon Fraser.
+
+ This patch enables webkit-box-shadow to be painted on a subpixel position. However, we
+ still truncate -webkit-box-shadow property values. Tracked here: http://webkit.org/b/133202
+
+ Test: fast/box-shadow/hidpi-webkit-box-shadow-subpixel-position.html
+
+ * platform/graphics/FloatRoundedRect.cpp:
+ (WebCore::FloatRoundedRect::inflateWithRadii): same as in from RoundedRect.
+ (WebCore::FloatRoundedRect::adjustRadii): same as in from RoundedRect.
+ * platform/graphics/FloatRoundedRect.h:
+ * rendering/RenderBoxModelObject.cpp:
+ (WebCore::RenderBoxModelObject::paintBoxShadow):
+
</ins><span class="cx"> 2014-05-22 peavo@outlook.com <peavo@outlook.com>
</span><span class="cx">
</span><span class="cx"> [Curl] Crash when exceeding maximum cache limit.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsFloatRoundedRectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/FloatRoundedRect.cpp (169256 => 169257)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/FloatRoundedRect.cpp 2014-05-23 10:29:21 UTC (rev 169256)
+++ trunk/Source/WebCore/platform/graphics/FloatRoundedRect.cpp 2014-05-23 14:27:19 UTC (rev 169257)
</span><span class="lines">@@ -151,4 +151,34 @@
</span><span class="cx"> && m_radii.topRight().height() + m_radii.bottomRight().height() <= m_rect.height();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void FloatRoundedRect::inflateWithRadii(float size)
+{
+ FloatRect old = m_rect;
+
+ m_rect.inflate(size);
+ // Considering the inflation factor of shorter size to scale the radii seems appropriate here
+ float factor;
+ if (m_rect.width() < m_rect.height())
+ factor = old.width() ? m_rect.width() / old.width() : 0;
+ else
+ factor = old.height() ? m_rect.height() / old.height() : 0;
+
+ m_radii.scale(factor);
+}
+
+void FloatRoundedRect::adjustRadii()
+{
+ float maxRadiusWidth = std::max(m_radii.topLeft().width() + m_radii.topRight().width(), m_radii.bottomLeft().width() + m_radii.bottomRight().width());
+ float maxRadiusHeight = std::max(m_radii.topLeft().height() + m_radii.bottomLeft().height(), m_radii.topRight().height() + m_radii.bottomRight().height());
+
+ if (maxRadiusWidth <= 0 || maxRadiusHeight <= 0) {
+ m_radii.scale(0.0f);
+ return;
+ }
+ float widthRatio = m_rect.width() / maxRadiusWidth;
+ float heightRatio = m_rect.height() / maxRadiusHeight;
+ m_radii.scale(widthRatio < heightRatio ? widthRatio : heightRatio);
+}
+
+
</ins><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsFloatRoundedRecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/FloatRoundedRect.h (169256 => 169257)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/FloatRoundedRect.h 2014-05-23 10:29:21 UTC (rev 169256)
+++ trunk/Source/WebCore/platform/graphics/FloatRoundedRect.h 2014-05-23 14:27:19 UTC (rev 169257)
</span><span class="lines">@@ -98,6 +98,8 @@
</span><span class="cx"> void inflate(float size) { m_rect.inflate(size); }
</span><span class="cx"> void expandRadii(float size) { m_radii.expand(size); }
</span><span class="cx"> void shrinkRadii(float size) { m_radii.shrink(size); }
</span><ins>+ void inflateWithRadii(float size);
+ void adjustRadii();
</ins><span class="cx">
</span><span class="cx"> FloatRect topLeftCorner() const
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBoxModelObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp (169256 => 169257)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp 2014-05-23 10:29:21 UTC (rev 169256)
+++ trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp 2014-05-23 14:27:19 UTC (rev 169257)
</span><span class="lines">@@ -2369,18 +2369,20 @@
</span><span class="cx"> if (context->paintingDisabled() || !style.boxShadow())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- RoundedRect border = (shadowStyle == Inset)
- ? style.getRoundedInnerBorderFor(paintRect, includeLogicalLeftEdge, includeLogicalRightEdge)
</del><ins>+ RoundedRect border = (shadowStyle == Inset) ? style.getRoundedInnerBorderFor(paintRect, includeLogicalLeftEdge, includeLogicalRightEdge)
</ins><span class="cx"> : style.getRoundedBorderFor(paintRect, &view(), includeLogicalLeftEdge, includeLogicalRightEdge);
</span><span class="cx">
</span><span class="cx"> bool hasBorderRadius = style.hasBorderRadius();
</span><span class="cx"> bool isHorizontal = style.isHorizontalWritingMode();
</span><ins>+ float deviceScaleFactor = document().deviceScaleFactor();
</ins><span class="cx">
</span><span class="cx"> bool hasOpaqueBackground = style.visitedDependentColor(CSSPropertyBackgroundColor).isValid() && style.visitedDependentColor(CSSPropertyBackgroundColor).alpha() == 255;
</span><span class="cx"> for (const ShadowData* shadow = style.boxShadow(); shadow; shadow = shadow->next()) {
</span><span class="cx"> if (shadow->style() != shadowStyle)
</span><span class="cx"> continue;
</span><span class="cx">
</span><ins>+ // FIXME: Add subpixel support for the shadow values. Soon after the shadow offset becomes fractional,
+ // all the early snappings here need to be pushed to the actual painting operations.
</ins><span class="cx"> IntSize shadowOffset(shadow->x(), shadow->y());
</span><span class="cx"> int shadowRadius = shadow->radius();
</span><span class="cx"> int shadowPaintingExtent = shadow->paintingExtent();
</span><span class="lines">@@ -2397,16 +2399,16 @@
</span><span class="cx"> if (fillRect.isEmpty())
</span><span class="cx"> continue;
</span><span class="cx">
</span><del>- IntRect shadowRect(border.rect());
- shadowRect.inflate(shadowPaintingExtent + shadowSpread);
- shadowRect.move(shadowOffset);
</del><ins>+ FloatRect pixelSnappedShadowRect = pixelSnappedForPainting(border.rect(), deviceScaleFactor);
+ pixelSnappedShadowRect.inflate(shadowPaintingExtent + shadowSpread);
+ pixelSnappedShadowRect.move(shadowOffset);
</ins><span class="cx">
</span><span class="cx"> GraphicsContextStateSaver stateSaver(*context);
</span><del>- context->clip(shadowRect);
</del><ins>+ context->clip(pixelSnappedShadowRect);
</ins><span class="cx">
</span><span class="cx"> // Move the fill just outside the clip, adding 1 pixel separation so that the fill does not
</span><span class="cx"> // bleed in (due to antialiasing) if the context is transformed.
</span><del>- IntSize extraOffset(paintRect.pixelSnappedWidth() + std::max(0, shadowOffset.width()) + shadowPaintingExtent + 2 * shadowSpread + 1, 0);
</del><ins>+ IntSize extraOffset(roundToInt(paintRect.width()) + std::max(0, shadowOffset.width()) + shadowPaintingExtent + 2 * shadowSpread + 1, 0);
</ins><span class="cx"> shadowOffset -= extraOffset;
</span><span class="cx"> fillRect.move(extraOffset);
</span><span class="cx">
</span><span class="lines">@@ -2415,32 +2417,30 @@
</span><span class="cx"> else
</span><span class="cx"> context->setShadow(shadowOffset, shadowRadius, shadowColor, style.colorSpace());
</span><span class="cx">
</span><ins>+ FloatRoundedRect rectToClipOut = border.pixelSnappedRoundedRectForPainting(deviceScaleFactor);
+ FloatRoundedRect pixelSnappedFillRect = fillRect.pixelSnappedRoundedRectForPainting(deviceScaleFactor);
</ins><span class="cx"> if (hasBorderRadius) {
</span><del>- RoundedRect rectToClipOut = border;
-
</del><span class="cx"> // If the box is opaque, it is unnecessary to clip it out. However, doing so saves time
</span><span class="cx"> // when painting the shadow. On the other hand, it introduces subpixel gaps along the
</span><span class="cx"> // corners. Those are avoided by insetting the clipping path by one pixel.
</span><del>- if (hasOpaqueBackground) {
- rectToClipOut.inflateWithRadii(-1);
- }
</del><ins>+ if (hasOpaqueBackground)
+ rectToClipOut.inflateWithRadii(LayoutUnit::fromPixel(-1));
</ins><span class="cx">
</span><span class="cx"> if (!rectToClipOut.isEmpty())
</span><del>- context->clipOutRoundedRect(FloatRoundedRect(rectToClipOut));
</del><ins>+ context->clipOutRoundedRect(rectToClipOut);
</ins><span class="cx">
</span><del>- RoundedRect influenceRect(shadowRect, border.radii());
</del><ins>+ RoundedRect influenceRect(LayoutRect(pixelSnappedShadowRect), border.radii());
</ins><span class="cx"> influenceRect.expandRadii(2 * shadowPaintingExtent + shadowSpread);
</span><ins>+
</ins><span class="cx"> if (allCornersClippedOut(influenceRect, info.rect))
</span><del>- context->fillRect(fillRect.rect(), Color::black, style.colorSpace());
</del><ins>+ context->fillRect(pixelSnappedFillRect.rect(), Color::black, style.colorSpace());
</ins><span class="cx"> else {
</span><del>- fillRect.expandRadii(shadowSpread);
- if (!fillRect.isRenderable())
- fillRect.adjustRadii();
- context->fillRoundedRect(FloatRoundedRect(fillRect), Color::black, style.colorSpace());
</del><ins>+ pixelSnappedFillRect.expandRadii(shadowSpread);
+ if (!pixelSnappedFillRect.isRenderable())
+ pixelSnappedFillRect.adjustRadii();
+ context->fillRoundedRect(pixelSnappedFillRect, Color::black, style.colorSpace());
</ins><span class="cx"> }
</span><span class="cx"> } else {
</span><del>- LayoutRect rectToClipOut = border.rect();
-
</del><span class="cx"> // If the box is opaque, it is unnecessary to clip it out. However, doing so saves time
</span><span class="cx"> // when painting the shadow. On the other hand, it introduces subpixel gaps along the
</span><span class="cx"> // edges if they are not pixel-aligned. Those are avoided by insetting the clipping path
</span><span class="lines">@@ -2450,57 +2450,58 @@
</span><span class="cx"> // FIXME: It's not clear if this check is right. What about integral scale factors?
</span><span class="cx"> AffineTransform transform = context->getCTM();
</span><span class="cx"> if (transform.a() != 1 || (transform.d() != 1 && transform.d() != -1) || transform.b() || transform.c())
</span><del>- rectToClipOut.inflate(-1);
</del><ins>+ rectToClipOut.inflate(LayoutUnit::fromPixel(-1).toFloat());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!rectToClipOut.isEmpty())
</span><del>- context->clipOut(rectToClipOut);
- context->fillRect(fillRect.rect(), Color::black, style.colorSpace());
</del><ins>+ context->clipOut(rectToClipOut.rect());
+ context->fillRect(pixelSnappedFillRect.rect(), Color::black, style.colorSpace());
</ins><span class="cx"> }
</span><span class="cx"> } else {
</span><span class="cx"> // Inset shadow.
</span><del>- IntRect holeRect(border.rect());
- holeRect.inflate(-shadowSpread);
</del><ins>+ FloatRoundedRect pixelSnappedBorderRect = border.pixelSnappedRoundedRectForPainting(deviceScaleFactor);
+ FloatRect pixelSnappedHoleRect = pixelSnappedBorderRect.rect();
+ pixelSnappedHoleRect.inflate(-shadowSpread);
</ins><span class="cx">
</span><del>- if (holeRect.isEmpty()) {
</del><ins>+ if (pixelSnappedHoleRect.isEmpty()) {
</ins><span class="cx"> if (hasBorderRadius)
</span><del>- context->fillRoundedRect(FloatRoundedRect(border), shadowColor, style.colorSpace());
</del><ins>+ context->fillRoundedRect(pixelSnappedBorderRect, shadowColor, style.colorSpace());
</ins><span class="cx"> else
</span><del>- context->fillRect(border.rect(), shadowColor, style.colorSpace());
</del><ins>+ context->fillRect(pixelSnappedBorderRect.rect(), shadowColor, style.colorSpace());
</ins><span class="cx"> continue;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!includeLogicalLeftEdge) {
</span><span class="cx"> if (isHorizontal) {
</span><del>- holeRect.move(-std::max(shadowOffset.width(), 0) - shadowPaintingExtent, 0);
- holeRect.setWidth(holeRect.width() + std::max(shadowOffset.width(), 0) + shadowPaintingExtent);
</del><ins>+ pixelSnappedHoleRect.move(-std::max(shadowOffset.width(), 0) - shadowPaintingExtent, 0);
+ pixelSnappedHoleRect.setWidth(pixelSnappedHoleRect.width() + std::max(shadowOffset.width(), 0) + shadowPaintingExtent);
</ins><span class="cx"> } else {
</span><del>- holeRect.move(0, -std::max(shadowOffset.height(), 0) - shadowPaintingExtent);
- holeRect.setHeight(holeRect.height() + std::max(shadowOffset.height(), 0) + shadowPaintingExtent);
</del><ins>+ pixelSnappedHoleRect.move(0, -std::max(shadowOffset.height(), 0) - shadowPaintingExtent);
+ pixelSnappedHoleRect.setHeight(pixelSnappedHoleRect.height() + std::max(shadowOffset.height(), 0) + shadowPaintingExtent);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> if (!includeLogicalRightEdge) {
</span><span class="cx"> if (isHorizontal)
</span><del>- holeRect.setWidth(holeRect.width() - std::min(shadowOffset.width(), 0) + shadowPaintingExtent);
</del><ins>+ pixelSnappedHoleRect.setWidth(pixelSnappedHoleRect.width() - std::min(shadowOffset.width(), 0) + shadowPaintingExtent);
</ins><span class="cx"> else
</span><del>- holeRect.setHeight(holeRect.height() - std::min(shadowOffset.height(), 0) + shadowPaintingExtent);
</del><ins>+ pixelSnappedHoleRect.setHeight(pixelSnappedHoleRect.height() - std::min(shadowOffset.height(), 0) + shadowPaintingExtent);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Color fillColor(shadowColor.red(), shadowColor.green(), shadowColor.blue(), 255);
</span><span class="cx">
</span><del>- LayoutRect outerRect = areaCastingShadowInHole(border.rect(), shadowPaintingExtent, shadowSpread, shadowOffset);
- RoundedRect roundedHole(holeRect, border.radii());
</del><ins>+ FloatRect pixelSnappedOuterRect = pixelSnappedForPainting(areaCastingShadowInHole(LayoutRect(pixelSnappedBorderRect.rect()), shadowPaintingExtent, shadowSpread, shadowOffset), deviceScaleFactor);
+ FloatRoundedRect pixelSnappedRoundedHole = FloatRoundedRect(pixelSnappedHoleRect, pixelSnappedBorderRect.radii());
</ins><span class="cx">
</span><span class="cx"> GraphicsContextStateSaver stateSaver(*context);
</span><span class="cx"> if (hasBorderRadius) {
</span><span class="cx"> Path path;
</span><del>- path.addRoundedRect(border);
</del><ins>+ path.addRoundedRect(pixelSnappedBorderRect);
</ins><span class="cx"> context->clip(path);
</span><del>- roundedHole.shrinkRadii(shadowSpread);
</del><ins>+ pixelSnappedRoundedHole.shrinkRadii(shadowSpread);
</ins><span class="cx"> } else
</span><del>- context->clip(border.rect());
</del><ins>+ context->clip(pixelSnappedBorderRect.rect());
</ins><span class="cx">
</span><del>- IntSize extraOffset(2 * paintRect.pixelSnappedWidth() + std::max(0, shadowOffset.width()) + shadowPaintingExtent - 2 * shadowSpread + 1, 0);
</del><ins>+ IntSize extraOffset(2 * roundToInt(paintRect.width()) + std::max(0, shadowOffset.width()) + shadowPaintingExtent - 2 * shadowSpread + 1, 0);
</ins><span class="cx"> context->translate(extraOffset.width(), extraOffset.height());
</span><span class="cx"> shadowOffset -= extraOffset;
</span><span class="cx">
</span><span class="lines">@@ -2509,7 +2510,7 @@
</span><span class="cx"> else
</span><span class="cx"> context->setShadow(shadowOffset, shadowRadius, shadowColor, style.colorSpace());
</span><span class="cx">
</span><del>- context->fillRectWithRoundedHole(outerRect, FloatRoundedRect(roundedHole), fillColor, style.colorSpace());
</del><ins>+ context->fillRectWithRoundedHole(pixelSnappedOuterRect, pixelSnappedRoundedHole, fillColor, style.colorSpace());
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>