Diff
Modified: trunk/Source/WebCore/ChangeLog (147861 => 147862)
--- trunk/Source/WebCore/ChangeLog 2013-04-06 23:48:05 UTC (rev 147861)
+++ trunk/Source/WebCore/ChangeLog 2013-04-07 01:30:21 UTC (rev 147862)
@@ -1,3 +1,20 @@
+2013-04-06 Benjamin Poulain <benja...@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 <timo...@apple.com>
Remove InjectedScriptHost.evaluateReturnsEvalFunction.
Modified: trunk/Source/WebCore/platform/graphics/cg/BitmapImageCG.cpp (147861 => 147862)
--- trunk/Source/WebCore/platform/graphics/cg/BitmapImageCG.cpp 2013-04-06 23:48:05 UTC (rev 147861)
+++ trunk/Source/WebCore/platform/graphics/cg/BitmapImageCG.cpp 2013-04-07 01:30:21 UTC (rev 147862)
@@ -35,7 +35,7 @@
#include <ApplicationServices/ApplicationServices.h>
#include <wtf/RetainPtr.h>
-#if PLATFORM(MAC) || PLATFORM(CHROMIUM)
+#if PLATFORM(MAC)
#include "WebCoreSystemInterface.h"
#endif
Modified: trunk/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp (147861 => 147862)
--- trunk/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp 2013-04-06 23:48:05 UTC (rev 147861)
+++ trunk/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp 2013-04-07 01:30:21 UTC (rev 147862)
@@ -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 @@
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 @@
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)
Modified: trunk/Source/WebCore/platform/graphics/cg/GraphicsContextPlatformPrivateCG.h (147861 => 147862)
--- trunk/Source/WebCore/platform/graphics/cg/GraphicsContextPlatformPrivateCG.h 2013-04-06 23:48:05 UTC (rev 147861)
+++ trunk/Source/WebCore/platform/graphics/cg/GraphicsContextPlatformPrivateCG.h 2013-04-07 01:30:21 UTC (rev 147862)
@@ -51,7 +51,7 @@
{
}
-#if PLATFORM(MAC) || PLATFORM(CHROMIUM)
+#if PLATFORM(MAC)
// These methods do nothing on Mac.
void save() {}
void restore() {}
Modified: trunk/Source/WebCore/platform/graphics/cg/ImageBufferCG.cpp (147861 => 147862)
--- trunk/Source/WebCore/platform/graphics/cg/ImageBufferCG.cpp 2013-04-06 23:48:05 UTC (rev 147861)
+++ trunk/Source/WebCore/platform/graphics/cg/ImageBufferCG.cpp 2013-04-07 01:30:21 UTC (rev 147862)
@@ -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
Modified: trunk/Source/WebCore/platform/graphics/cg/ImageCG.cpp (147861 => 147862)
--- trunk/Source/WebCore/platform/graphics/cg/ImageCG.cpp 2013-04-06 23:48:05 UTC (rev 147861)
+++ trunk/Source/WebCore/platform/graphics/cg/ImageCG.cpp 2013-04-07 01:30:21 UTC (rev 147862)
@@ -35,7 +35,7 @@
#include <ApplicationServices/ApplicationServices.h>
#include <wtf/RetainPtr.h>
-#if PLATFORM(MAC) || PLATFORM(CHROMIUM)
+#if PLATFORM(MAC)
#include "WebCoreSystemInterface.h"
#endif
Modified: trunk/Source/WebCore/platform/graphics/cg/PathCG.cpp (147861 => 147862)
--- trunk/Source/WebCore/platform/graphics/cg/PathCG.cpp 2013-04-06 23:48:05 UTC (rev 147861)
+++ trunk/Source/WebCore/platform/graphics/cg/PathCG.cpp 2013-04-07 01:30:21 UTC (rev 147862)
@@ -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
Modified: trunk/Source/WebCore/platform/graphics/cg/PatternCG.cpp (147861 => 147862)
--- trunk/Source/WebCore/platform/graphics/cg/PatternCG.cpp 2013-04-06 23:48:05 UTC (rev 147861)
+++ trunk/Source/WebCore/platform/graphics/cg/PatternCG.cpp 2013-04-07 01:30:21 UTC (rev 147862)
@@ -32,7 +32,7 @@
#include <ApplicationServices/ApplicationServices.h>
#include <wtf/MainThread.h>
-#if PLATFORM(MAC) || PLATFORM(CHROMIUM)
+#if PLATFORM(MAC)
#include "WebCoreSystemInterface.h"
#endif
