Title: [163895] trunk/Source/WebCore
- Revision
- 163895
- Author
- [email protected]
- Date
- 2014-02-11 12:26:43 -0800 (Tue, 11 Feb 2014)
Log Message
[Windows] Unreviewed. Speculative test fix.
* platform/graphics/GraphicsContext.h:
(WebCore::GraphicsContext::pixelSnappingFactor):
* platform/graphics/cg/GraphicsContextCG.cpp:
(WebCore::GraphicsContext::platformInit):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (163894 => 163895)
--- trunk/Source/WebCore/ChangeLog 2014-02-11 20:12:30 UTC (rev 163894)
+++ trunk/Source/WebCore/ChangeLog 2014-02-11 20:26:43 UTC (rev 163895)
@@ -1,3 +1,12 @@
+2014-02-11 Roger Fong <[email protected]>
+
+ [Windows] Unreviewed. Speculative test fix.
+
+ * platform/graphics/GraphicsContext.h:
+ (WebCore::GraphicsContext::pixelSnappingFactor):
+ * platform/graphics/cg/GraphicsContextCG.cpp:
+ (WebCore::GraphicsContext::platformInit):
+
2014-02-11 Dan Bernstein <[email protected]>
iOS build fix.
Modified: trunk/Source/WebCore/platform/graphics/GraphicsContext.h (163894 => 163895)
--- trunk/Source/WebCore/platform/graphics/GraphicsContext.h 2014-02-11 20:12:30 UTC (rev 163894)
+++ trunk/Source/WebCore/platform/graphics/GraphicsContext.h 2014-02-11 20:26:43 UTC (rev 163895)
@@ -444,7 +444,11 @@
enum IncludeDeviceScale { DefinitelyIncludeDeviceScale, PossiblyIncludeDeviceScale };
AffineTransform getCTM(IncludeDeviceScale includeScale = PossiblyIncludeDeviceScale) const;
+#if PLATFORM(WIN)
+ float pixelSnappingFactor() const { return 1.0; }
+#else
float pixelSnappingFactor() const { return m_pixelSnappingFactor; }
+#endif
#if ENABLE(3D_RENDERING) && USE(TEXTURE_MAPPER)
// This is needed when using accelerated-compositing in software mode, like in TextureMapper.
Modified: trunk/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp (163894 => 163895)
--- trunk/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp 2014-02-11 20:12:30 UTC (rev 163894)
+++ trunk/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp 2014-02-11 20:26:43 UTC (rev 163895)
@@ -127,11 +127,7 @@
if (cgContext) {
CGAffineTransform baseDeviceMatrix = CGContextGetUserSpaceToDeviceSpaceTransform(cgContext);
ASSERT(fabs(baseDeviceMatrix.a) == fabs(baseDeviceMatrix.d));
-#if PLATFORM(WIN)
- m_pixelSnappingFactor = 1;
-#else
m_pixelSnappingFactor = baseDeviceMatrix.a;
-#endif
#if PLATFORM(IOS)
m_state.shouldUseContextColors = shouldUseContextColors;
if (shouldUseContextColors) {
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
