Clean platform/graphics/cg of the chromium bits
authorbenjamin@webkit.org <benjamin@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sun, 7 Apr 2013 01:30:21 +0000 (01:30 +0000)
committerbenjamin@webkit.org <benjamin@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sun, 7 Apr 2013 01:30:21 +0000 (01:30 +0000)
https://bugs.webkit.org/show_bug.cgi?id=114106

Reviewed by Anders Carlsson.

* platform/graphics/cg/BitmapImageCG.cpp:
* platform/graphics/cg/GraphicsContextCG.cpp:
(WebCore::GraphicsContext::roundToDevicePixels):
* platform/graphics/cg/GraphicsContextPlatformPrivateCG.h:
(GraphicsContextPlatformPrivate):
* platform/graphics/cg/ImageBufferCG.cpp:
* platform/graphics/cg/ImageCG.cpp:
* platform/graphics/cg/PathCG.cpp:
* platform/graphics/cg/PatternCG.cpp:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@147862 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog
Source/WebCore/platform/graphics/cg/BitmapImageCG.cpp
Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp
Source/WebCore/platform/graphics/cg/GraphicsContextPlatformPrivateCG.h
Source/WebCore/platform/graphics/cg/ImageBufferCG.cpp
Source/WebCore/platform/graphics/cg/ImageCG.cpp
Source/WebCore/platform/graphics/cg/PathCG.cpp
Source/WebCore/platform/graphics/cg/PatternCG.cpp

index c33cd12..7b18208 100644 (file)
@@ -1,3 +1,20 @@
+2013-04-06  Benjamin Poulain  <benjamin@webkit.org>
+
+        Clean platform/graphics/cg of the chromium bits
+        https://bugs.webkit.org/show_bug.cgi?id=114106
+
+        Reviewed by Anders Carlsson.
+
+        * platform/graphics/cg/BitmapImageCG.cpp:
+        * platform/graphics/cg/GraphicsContextCG.cpp:
+        (WebCore::GraphicsContext::roundToDevicePixels):
+        * platform/graphics/cg/GraphicsContextPlatformPrivateCG.h:
+        (GraphicsContextPlatformPrivate):
+        * platform/graphics/cg/ImageBufferCG.cpp:
+        * platform/graphics/cg/ImageCG.cpp:
+        * platform/graphics/cg/PathCG.cpp:
+        * platform/graphics/cg/PatternCG.cpp:
+
 2013-04-06  Timothy Hatcher  <timothy@apple.com>
 
         Remove InjectedScriptHost.evaluateReturnsEvalFunction.
index 84e4a15..51c0cf8 100644 (file)
@@ -35,7 +35,7 @@
 #include <ApplicationServices/ApplicationServices.h>
 #include <wtf/RetainPtr.h>
 
-#if PLATFORM(MAC) || PLATFORM(CHROMIUM)
+#if PLATFORM(MAC)
 #include "WebCoreSystemInterface.h"
 #endif
 
index f713074..a75a573 100644 (file)
@@ -45,7 +45,7 @@
 #include <wtf/RetainPtr.h>
 #include <wtf/UnusedParam.h>
 
-#if PLATFORM(MAC) || PLATFORM(CHROMIUM)
+#if PLATFORM(MAC)
 #include "WebCoreSystemInterface.h"
 #endif
 
@@ -53,7 +53,7 @@
 #include <WebKitSystemInterface/WebKitSystemInterface.h>
 #endif
 
-#if PLATFORM(MAC) || (PLATFORM(CHROMIUM) && OS(DARWIN))
+#if PLATFORM(MAC)
 
 #if PLATFORM(IOS) || __MAC_OS_X_VERSION_MAX_ALLOWED >= 1060
 // Building on 10.6 or later: kCGInterpolationMedium is defined in the CGInterpolationQuality enum.
@@ -1297,9 +1297,6 @@ AffineTransform GraphicsContext::getCTM(IncludeDeviceScale includeScale) const
 
 FloatRect GraphicsContext::roundToDevicePixels(const FloatRect& rect, RoundingMode roundingMode)
 {
-#if PLATFORM(CHROMIUM)
-    return rect;
-#else
     // It is not enough just to round to pixels in device space. The rotation part of the
     // affine transform matrix to device space can mess with this conversion if we have a
     // rotating image like the hands of the world clock widget. We just need the scale, so
@@ -1340,7 +1337,6 @@ FloatRect GraphicsContext::roundToDevicePixels(const FloatRect& rect, RoundingMo
     FloatPoint roundedOrigin = FloatPoint(deviceOrigin.x / deviceScaleX, deviceOrigin.y / deviceScaleY);
     FloatPoint roundedLowerRight = FloatPoint(deviceLowerRight.x / deviceScaleX, deviceLowerRight.y / deviceScaleY);
     return FloatRect(roundedOrigin, roundedLowerRight - roundedOrigin);
-#endif
 }
 
 void GraphicsContext::drawLineForText(const FloatPoint& point, float width, bool printing)
index 5c00308..fcc9d01 100644 (file)
@@ -51,7 +51,7 @@ public:
     {
     }
 
-#if PLATFORM(MAC) || PLATFORM(CHROMIUM)
+#if PLATFORM(MAC)
     // These methods do nothing on Mac.
     void save() {}
     void restore() {}
index 0681578..30d44f6 100644 (file)
@@ -44,7 +44,7 @@
 #include <wtf/text/Base64.h>
 #include <wtf/text/WTFString.h>
 
-#if PLATFORM(MAC) || PLATFORM(CHROMIUM)
+#if PLATFORM(MAC)
 #include "WebCoreSystemInterface.h"
 #endif
 
index b4d60c7..8a12368 100644 (file)
@@ -35,7 +35,7 @@
 #include <ApplicationServices/ApplicationServices.h>
 #include <wtf/RetainPtr.h>
 
-#if PLATFORM(MAC) || PLATFORM(CHROMIUM)
+#if PLATFORM(MAC)
 #include "WebCoreSystemInterface.h"
 #endif
 
index 5162d58..1751a0a 100644 (file)
@@ -39,7 +39,7 @@
 #include <wtf/RetainPtr.h>
 #include <wtf/text/WTFString.h>
 
-#if PLATFORM(MAC) || PLATFORM(CHROMIUM)
+#if PLATFORM(MAC)
 #include "WebCoreSystemInterface.h"
 #endif
 
index ae9a01b..0cd529e 100644 (file)
@@ -32,7 +32,7 @@
 #include <ApplicationServices/ApplicationServices.h>
 #include <wtf/MainThread.h>
 
-#if PLATFORM(MAC) || PLATFORM(CHROMIUM)
+#if PLATFORM(MAC)
 #include "WebCoreSystemInterface.h"
 #endif