<!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>[163272] trunk/Source/WebCore</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/163272">163272</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2014-02-02 13:59:01 -0800 (Sun, 02 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Subpixel rendering: Enable subpixel positioning/sizing/hairline border painting.
https://bugs.webkit.org/show_bug.cgi?id=128009
Reviewed by Simon Fraser.
Snap and clip to device pixels when painting boxes. Enable hairline painting
for solid border.
No existing context to test this functionality yet.
* rendering/RenderBoxModelObject.cpp:
(WebCore::RenderBoxModelObject::paintFillLayerExtended):
(WebCore::RenderBoxModelObject::drawBoxSideFromPath):
* rendering/RenderObject.cpp:
(WebCore::RenderObject::drawLineForBoxSide):
* rendering/style/RenderStyle.cpp:
(WebCore::RenderStyle::getRoundedBorderFor):
(WebCore::RenderStyle::getRoundedInnerBorderFor):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBoxModelObjectcpp">trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderObjectcpp">trunk/Source/WebCore/rendering/RenderObject.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleRenderStylecpp">trunk/Source/WebCore/rendering/style/RenderStyle.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (163271 => 163272)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-02-02 21:56:15 UTC (rev 163271)
+++ trunk/Source/WebCore/ChangeLog 2014-02-02 21:59:01 UTC (rev 163272)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2014-02-02 Zalan Bujtas <zalan@apple.com>
+
+ Subpixel rendering: Enable subpixel positioning/sizing/hairline border painting.
+ https://bugs.webkit.org/show_bug.cgi?id=128009
+
+ Reviewed by Simon Fraser.
+
+ Snap and clip to device pixels when painting boxes. Enable hairline painting
+ for solid border.
+
+ No existing context to test this functionality yet.
+
+ * rendering/RenderBoxModelObject.cpp:
+ (WebCore::RenderBoxModelObject::paintFillLayerExtended):
+ (WebCore::RenderBoxModelObject::drawBoxSideFromPath):
+ * rendering/RenderObject.cpp:
+ (WebCore::RenderObject::drawLineForBoxSide):
+ * rendering/style/RenderStyle.cpp:
+ (WebCore::RenderStyle::getRoundedBorderFor):
+ (WebCore::RenderStyle::getRoundedInnerBorderFor):
+
</ins><span class="cx"> 2014-02-02 Sam Weinig <sam@webkit.org>
</span><span class="cx">
</span><span class="cx"> Add some missing override keywords
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBoxModelObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp (163271 => 163272)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp 2014-02-02 21:56:15 UTC (rev 163271)
+++ trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp 2014-02-02 21:59:01 UTC (rev 163272)
</span><span class="lines">@@ -655,7 +655,7 @@
</span><span class="cx"> context->restore();
</span><span class="cx"> }
</span><span class="cx"> } else
</span><del>- context->fillRect(pixelSnappedIntRect(rect), bgColor, style().colorSpace());
</del><ins>+ context->fillRect(pixelSnappedForPainting(rect, context->pixelSnappingFactor()), bgColor, style().colorSpace());
</ins><span class="cx">
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -2116,7 +2116,7 @@
</span><span class="cx">
</span><span class="cx"> graphicsContext->setStrokeStyle(NoStroke);
</span><span class="cx"> graphicsContext->setFillColor(color, style->colorSpace());
</span><del>- graphicsContext->drawRect(pixelSnappedIntRect(borderRect));
</del><ins>+ graphicsContext->drawRect(pixelSnappedForPainting(borderRect, graphicsContext->pixelSnappingFactor()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void findInnerVertex(const FloatPoint& outerCorner, const FloatPoint& innerCorner, const FloatPoint& centerPoint, FloatPoint& result)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderObject.cpp (163271 => 163272)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderObject.cpp 2014-02-02 21:56:15 UTC (rev 163271)
+++ trunk/Source/WebCore/rendering/RenderObject.cpp 2014-02-02 21:59:01 UTC (rev 163272)
</span><span class="lines">@@ -749,15 +749,23 @@
</span><span class="cx"> length = y2 - y1;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if (borderStyle == DOUBLE && thickness < 3)
+ borderStyle = SOLID;
+
+ float pixelSnappingFactor = graphicsContext->pixelSnappingFactor();
</ins><span class="cx"> // FIXME: We really would like this check to be an ASSERT as we don't want to draw empty borders. However
</span><span class="cx"> // nothing guarantees that the following recursive calls to drawLineForBoxSide will have non-null dimensions.
</span><del>- // FIXME: flooring is a temporary solution until the device pixel snapping is added here.
- if (!floor(thickness) || !floor(length))
</del><ins>+ // FIXME: flooring is a temporary solution until the device pixel snapping is added here for all border types.
+ if (borderStyle == SOLID) {
+ thickness = roundToDevicePixel(thickness, pixelSnappingFactor);
+ length = roundToDevicePixel(length, pixelSnappingFactor);
+ } else {
+ thickness = floorf(thickness);
+ length = floorf(length);
+ }
+ if (!thickness || !length)
</ins><span class="cx"> return;
</span><span class="cx">
</span><del>- if (borderStyle == DOUBLE && thickness < 3)
- borderStyle = SOLID;
-
</del><span class="cx"> const RenderStyle& style = this->style();
</span><span class="cx"> switch (borderStyle) {
</span><span class="cx"> case BNONE:
</span><span class="lines">@@ -925,7 +933,7 @@
</span><span class="cx"> // this matters for rects in transformed contexts.
</span><span class="cx"> bool wasAntialiased = graphicsContext->shouldAntialias();
</span><span class="cx"> graphicsContext->setShouldAntialias(antialias);
</span><del>- graphicsContext->drawRect(IntRect(x1, y1, x2 - x1, y2 - y1));
</del><ins>+ graphicsContext->drawRect(pixelSnappedForPainting(x1, y1, x2 - x1, y2 - y1, pixelSnappingFactor));
</ins><span class="cx"> graphicsContext->setShouldAntialias(wasAntialiased);
</span><span class="cx"> graphicsContext->setStrokeStyle(oldStrokeStyle);
</span><span class="cx"> return;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleRenderStylecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/RenderStyle.cpp (163271 => 163272)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/RenderStyle.cpp 2014-02-02 21:56:15 UTC (rev 163271)
+++ trunk/Source/WebCore/rendering/style/RenderStyle.cpp 2014-02-02 21:59:01 UTC (rev 163272)
</span><span class="lines">@@ -1132,11 +1132,10 @@
</span><span class="cx">
</span><span class="cx"> RoundedRect RenderStyle::getRoundedBorderFor(const LayoutRect& borderRect, RenderView* renderView, bool includeLogicalLeftEdge, bool includeLogicalRightEdge) const
</span><span class="cx"> {
</span><del>- IntRect snappedBorderRect(pixelSnappedIntRect(borderRect));
- RoundedRect roundedRect(snappedBorderRect);
</del><ins>+ RoundedRect roundedRect(borderRect);
</ins><span class="cx"> if (hasBorderRadius()) {
</span><del>- RoundedRect::Radii radii = calcRadiiFor(surround->border, snappedBorderRect.size(), renderView);
- radii.scale(calcConstraintScaleFor(snappedBorderRect, radii));
</del><ins>+ RoundedRect::Radii radii = calcRadiiFor(surround->border, borderRect.size(), renderView);
+ radii.scale(calcConstraintScaleFor(borderRect, radii));
</ins><span class="cx"> roundedRect.includeLogicalEdges(radii, isHorizontalWritingMode(), includeLogicalLeftEdge, includeLogicalRightEdge);
</span><span class="cx"> }
</span><span class="cx"> return roundedRect;
</span><span class="lines">@@ -1162,7 +1161,7 @@
</span><span class="cx"> borderRect.width() - leftWidth - rightWidth,
</span><span class="cx"> borderRect.height() - topWidth - bottomWidth);
</span><span class="cx">
</span><del>- RoundedRect roundedRect(pixelSnappedIntRect(innerRect));
</del><ins>+ RoundedRect roundedRect(innerRect);
</ins><span class="cx">
</span><span class="cx"> if (hasBorderRadius()) {
</span><span class="cx"> RoundedRect::Radii radii = getRoundedBorderFor(borderRect).radii();
</span></span></pre>
</div>
</div>
</body>
</html>