Changeset 147862 in webkit

Timestamp:

Apr 6, 2013 6:30:21 PM (11 years ago)

Author:

benjamin@webkit.org

Message:

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:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/cg/BitmapImageCG.cpp (modified) (1 diff)
• platform/graphics/cg/GraphicsContextCG.cpp (modified) (4 diffs)
• platform/graphics/cg/GraphicsContextPlatformPrivateCG.h (modified) (1 diff)
• platform/graphics/cg/ImageBufferCG.cpp (modified) (1 diff)
• platform/graphics/cg/ImageCG.cpp (modified) (1 diff)
• platform/graphics/cg/PathCG.cpp (modified) (1 diff)
• platform/graphics/cg/PatternCG.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+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>
 

trunk/Source/WebCore/platform/graphics/cg/BitmapImageCG.cpp

@@ -36 +36 @@
 #include <wtf/RetainPtr.h>
 
-#if PLATFORM(MAC) || PLATFORM(CHROMIUM)
+#if PLATFORM(MAC)
 #include "WebCoreSystemInterface.h"
 #endif

trunk/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp

@@ -46 +46 @@
 #include <wtf/UnusedParam.h>
 
-#if PLATFORM(MAC) || PLATFORM(CHROMIUM)
+#if PLATFORM(MAC)
 #include "WebCoreSystemInterface.h"
 #endif
@@ -54 +54 @@
 #endif
 
-#if PLATFORM(MAC) || (PLATFORM(CHROMIUM) && OS(DARWIN))
+#if PLATFORM(MAC)
 
 #if PLATFORM(IOS) || __MAC_OS_X_VERSION_MAX_ALLOWED >= 1060
@@ -1298 +1298 @@
 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
@@ -1341 +1338 @@
     FloatPoint roundedLowerRight = FloatPoint(deviceLowerRight.x / deviceScaleX, deviceLowerRight.y / deviceScaleY);
     return FloatRect(roundedOrigin, roundedLowerRight - roundedOrigin);
-#endif
 }
 

trunk/Source/WebCore/platform/graphics/cg/GraphicsContextPlatformPrivateCG.h

@@ -52 +52 @@
     }
 
-#if PLATFORM(MAC) || PLATFORM(CHROMIUM)
+#if PLATFORM(MAC)
     // These methods do nothing on Mac.
     void save() {}

trunk/Source/WebCore/platform/graphics/cg/ImageBufferCG.cpp

@@ -45 +45 @@
 #include <wtf/text/WTFString.h>
 
-#if PLATFORM(MAC) || PLATFORM(CHROMIUM)
+#if PLATFORM(MAC)
 #include "WebCoreSystemInterface.h"
 #endif

trunk/Source/WebCore/platform/graphics/cg/ImageCG.cpp

@@ -36 +36 @@
 #include <wtf/RetainPtr.h>
 
-#if PLATFORM(MAC) || PLATFORM(CHROMIUM)
+#if PLATFORM(MAC)
 #include "WebCoreSystemInterface.h"
 #endif

trunk/Source/WebCore/platform/graphics/cg/PathCG.cpp

@@ -40 +40 @@
 #include <wtf/text/WTFString.h>
 
-#if PLATFORM(MAC) || PLATFORM(CHROMIUM)
+#if PLATFORM(MAC)
 #include "WebCoreSystemInterface.h"
 #endif

trunk/Source/WebCore/platform/graphics/cg/PatternCG.cpp

@@ -33 +33 @@
 #include <wtf/MainThread.h>
 
-#if PLATFORM(MAC) || PLATFORM(CHROMIUM)
+#if PLATFORM(MAC)
 #include "WebCoreSystemInterface.h"
 #endif