<!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>[163265] 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/163265">163265</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2014-02-02 10:38:45 -0800 (Sun, 02 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Subpixel rendering: Introduce device pixel snapping helper functions.
https://bugs.webkit.org/show_bug.cgi?id=128049
Reviewed by Simon Fraser.
These functions help device pixel snapping during painting. They follow the logic of
the corresponding pixelSnappedInt* functions.
No change in functionality.
* platform/LayoutUnit.h:
(WebCore::roundToDevicePixel):
(WebCore::floorToDevicePixel):
(WebCore::snapSizeToPixel):
(WebCore::snapSizeToDevicePixel):
* platform/graphics/GraphicsContext.cpp:
(WebCore::GraphicsContext::GraphicsContext):
* platform/graphics/GraphicsContext.h:
(WebCore::GraphicsContext::pixelSnappingFactor):
* platform/graphics/LayoutRect.h:
(WebCore::pixelSnappedForPainting):
* platform/graphics/cg/GraphicsContextCG.cpp:
(WebCore::GraphicsContext::platformInit):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformLayoutUnith">trunk/Source/WebCore/platform/LayoutUnit.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsGraphicsContextcpp">trunk/Source/WebCore/platform/graphics/GraphicsContext.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsGraphicsContexth">trunk/Source/WebCore/platform/graphics/GraphicsContext.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsLayoutRecth">trunk/Source/WebCore/platform/graphics/LayoutRect.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscgGraphicsContextCGcpp">trunk/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (163264 => 163265)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-02-02 17:44:48 UTC (rev 163264)
+++ trunk/Source/WebCore/ChangeLog 2014-02-02 18:38:45 UTC (rev 163265)
</span><span class="lines">@@ -1,5 +1,31 @@
</span><span class="cx"> 2014-02-02 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><ins>+ Subpixel rendering: Introduce device pixel snapping helper functions.
+ https://bugs.webkit.org/show_bug.cgi?id=128049
+
+ Reviewed by Simon Fraser.
+
+ These functions help device pixel snapping during painting. They follow the logic of
+ the corresponding pixelSnappedInt* functions.
+
+ No change in functionality.
+
+ * platform/LayoutUnit.h:
+ (WebCore::roundToDevicePixel):
+ (WebCore::floorToDevicePixel):
+ (WebCore::snapSizeToPixel):
+ (WebCore::snapSizeToDevicePixel):
+ * platform/graphics/GraphicsContext.cpp:
+ (WebCore::GraphicsContext::GraphicsContext):
+ * platform/graphics/GraphicsContext.h:
+ (WebCore::GraphicsContext::pixelSnappingFactor):
+ * platform/graphics/LayoutRect.h:
+ (WebCore::pixelSnappedForPainting):
+ * platform/graphics/cg/GraphicsContextCG.cpp:
+ (WebCore::GraphicsContext::platformInit):
+
+2014-02-02 Zalan Bujtas <zalan@apple.com>
+
</ins><span class="cx"> Floor thickness and length after switching from int to float.
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=128071
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformLayoutUnith"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/LayoutUnit.h (163264 => 163265)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/LayoutUnit.h 2014-02-02 17:44:48 UTC (rev 163264)
+++ trunk/Source/WebCore/platform/LayoutUnit.h 2014-02-02 18:38:45 UTC (rev 163265)
</span><span class="lines">@@ -935,6 +935,22 @@
</span><span class="cx"> return value.floor();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+inline float roundToDevicePixel(LayoutUnit value, float pixelSnappingFactor)
+{
+ return round((value.rawValue() * pixelSnappingFactor) / kEffectiveFixedPointDenominator) / pixelSnappingFactor;
+}
+
+inline float floorToDevicePixel(LayoutUnit value, float pixelSnappingFactor)
+{
+ return floor((value.rawValue() * pixelSnappingFactor) / kEffectiveFixedPointDenominator) / pixelSnappingFactor;
+}
+
+inline float snapSizeToDevicePixel(LayoutUnit size, LayoutUnit location, float pixelSnappingFactor)
+{
+ LayoutUnit fraction = location.fraction();
+ return roundToDevicePixel(fraction + size, pixelSnappingFactor) - roundToDevicePixel(fraction, pixelSnappingFactor);
+}
+
</ins><span class="cx"> inline LayoutUnit roundedLayoutUnit(float value)
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(SUBPIXEL_LAYOUT)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsGraphicsContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/GraphicsContext.cpp (163264 => 163265)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/GraphicsContext.cpp 2014-02-02 17:44:48 UTC (rev 163264)
+++ trunk/Source/WebCore/platform/graphics/GraphicsContext.cpp 2014-02-02 18:38:45 UTC (rev 163265)
</span><span class="lines">@@ -80,6 +80,7 @@
</span><span class="cx"> GraphicsContext::GraphicsContext(PlatformGraphicsContext* platformGraphicsContext)
</span><span class="cx"> : m_updatingControlTints(false)
</span><span class="cx"> , m_transparencyCount(0)
</span><ins>+ , m_pixelSnappingFactor(1)
</ins><span class="cx"> {
</span><span class="cx"> platformInit(platformGraphicsContext);
</span><span class="cx"> }
</span><span class="lines">@@ -87,6 +88,7 @@
</span><span class="cx"> GraphicsContext::GraphicsContext(PlatformGraphicsContext* platformGraphicsContext, bool shouldUseContextColors)
</span><span class="cx"> : m_updatingControlTints(false)
</span><span class="cx"> , m_transparencyCount(0)
</span><ins>+ , m_pixelSnappingFactor(1)
</ins><span class="cx"> {
</span><span class="cx"> platformInit(platformGraphicsContext, shouldUseContextColors);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsGraphicsContexth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/GraphicsContext.h (163264 => 163265)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/GraphicsContext.h 2014-02-02 17:44:48 UTC (rev 163264)
+++ trunk/Source/WebCore/platform/graphics/GraphicsContext.h 2014-02-02 18:38:45 UTC (rev 163265)
</span><span class="lines">@@ -444,6 +444,8 @@
</span><span class="cx"> enum IncludeDeviceScale { DefinitelyIncludeDeviceScale, PossiblyIncludeDeviceScale };
</span><span class="cx"> AffineTransform getCTM(IncludeDeviceScale includeScale = PossiblyIncludeDeviceScale) const;
</span><span class="cx">
</span><ins>+ float pixelSnappingFactor() const { return m_pixelSnappingFactor; }
+
</ins><span class="cx"> #if ENABLE(3D_RENDERING) && USE(TEXTURE_MAPPER)
</span><span class="cx"> // This is needed when using accelerated-compositing in software mode, like in TextureMapper.
</span><span class="cx"> void concat3DTransform(const TransformationMatrix&);
</span><span class="lines">@@ -580,6 +582,7 @@
</span><span class="cx"> Vector<GraphicsContextState> m_stack;
</span><span class="cx"> bool m_updatingControlTints;
</span><span class="cx"> unsigned m_transparencyCount;
</span><ins>+ float m_pixelSnappingFactor;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> class GraphicsContextStateSaver {
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsLayoutRecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/LayoutRect.h (163264 => 163265)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/LayoutRect.h 2014-02-02 17:44:48 UTC (rev 163264)
+++ trunk/Source/WebCore/platform/graphics/LayoutRect.h 2014-02-02 18:38:45 UTC (rev 163265)
</span><span class="lines">@@ -231,6 +231,22 @@
</span><span class="cx"> return IntRect(roundedIntPoint(location), pixelSnappedIntSize(size, location));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+inline FloatRect pixelSnappedForPainting(const LayoutRect& rect, float pixelSnappingFactor)
+{
+#if ENABLE(SUBPIXEL_LAYOUT)
+ return FloatRect(roundToDevicePixel(rect.x(), pixelSnappingFactor), roundToDevicePixel(rect.y(), pixelSnappingFactor),
+ snapSizeToDevicePixel(rect.width(), rect.x(), pixelSnappingFactor), snapSizeToDevicePixel(rect.height(), rect.y(), pixelSnappingFactor));
+#else
+ UNUSED_PARAM(pixelSnappingFactor);
+ return FloatRect(rect);
+#endif
+}
+
+inline FloatRect pixelSnappedForPainting(LayoutUnit x, LayoutUnit y, LayoutUnit width, LayoutUnit height, float pixelSnappingFactor)
+{
+ return pixelSnappedForPainting(LayoutRect(x, y, width, height), pixelSnappingFactor);
+}
+
</ins><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif // LayoutRect_h
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscgGraphicsContextCGcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp (163264 => 163265)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp 2014-02-02 17:44:48 UTC (rev 163264)
+++ trunk/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp 2014-02-02 18:38:45 UTC (rev 163265)
</span><span class="lines">@@ -138,6 +138,10 @@
</span><span class="cx"> setPlatformFillColor(fillColor(), fillColorSpace());
</span><span class="cx"> setPlatformStrokeColor(strokeColor(), strokeColorSpace());
</span><span class="cx"> }
</span><ins>+
+ CGAffineTransform baseDeviceMatrix = CGContextGetUserSpaceToDeviceSpaceTransform(cgContext);
+ ASSERT(abs(baseDeviceMatrix.a) == abs(baseDeviceMatrix.d));
+ m_pixelSnappingFactor = baseDeviceMatrix.a;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void GraphicsContext::platformDestroy()
</span></span></pre>
</div>
</div>
</body>
</html>