Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(123)

Unified Diff: Source/WebCore/platform/graphics/skia/GraphicsContextSkia.cpp

Issue 13905007: Remove the last remaining PLATFORM() bits from WebCore. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: fffffffffff Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/WebCore/platform/graphics/skia/GraphicsContextSkia.cpp
diff --git a/Source/WebCore/platform/graphics/skia/GraphicsContextSkia.cpp b/Source/WebCore/platform/graphics/skia/GraphicsContextSkia.cpp
index 4f264eae5a61aa3abde87e81ce7a505c1623052e..75ed3cc988816c1b65182e0c211f3036fb87f988 100644
--- a/Source/WebCore/platform/graphics/skia/GraphicsContextSkia.cpp
+++ b/Source/WebCore/platform/graphics/skia/GraphicsContextSkia.cpp
@@ -59,7 +59,7 @@
#include <wtf/MathExtras.h>
#include <wtf/UnusedParam.h>
-#if PLATFORM(CHROMIUM) && OS(DARWIN)
+#if OS(DARWIN)
#include <ApplicationServices/ApplicationServices.h>
#endif
@@ -495,7 +495,7 @@ void GraphicsContext::drawFocusRing(const Path& path, int width, int offset, con
static inline void drawOuterPath(PlatformContextSkia* context, const SkPath& path, SkPaint& paint, int width)
{
-#if PLATFORM(CHROMIUM) && OS(DARWIN)
+#if OS(DARWIN)
paint.setAlpha(64);
paint.setStrokeWidth(width);
paint.setPathEffect(new SkCornerPathEffect((width - 1) * 0.5f))->unref();
@@ -508,7 +508,7 @@ static inline void drawOuterPath(PlatformContextSkia* context, const SkPath& pat
static inline void drawInnerPath(PlatformContextSkia* context, const SkPath& path, SkPaint& paint, int width)
{
-#if PLATFORM(CHROMIUM) && OS(DARWIN)
+#if OS(DARWIN)
paint.setAlpha(128);
paint.setStrokeWidth(width * 0.5f);
context->drawPath(path, paint);
@@ -517,7 +517,7 @@ static inline void drawInnerPath(PlatformContextSkia* context, const SkPath& pat
static inline int getFocusRingOutset(int offset)
{
-#if PLATFORM(CHROMIUM) && OS(DARWIN)
+#if OS(DARWIN)
return offset + 2;
#else
return 0;
@@ -616,7 +616,7 @@ void GraphicsContext::drawLineForDocumentMarker(const FloatPoint& pt, float widt
static SkBitmap* misspellBitmap2x[2] = { 0, 0 };
SkBitmap** misspellBitmap = deviceScaleFactor == 2 ? misspellBitmap2x : misspellBitmap1x;
if (!misspellBitmap[index]) {
-#if PLATFORM(CHROMIUM) && OS(DARWIN)
+#if OS(DARWIN)
// Match the artwork used by the Mac.
const int rowPixels = 4 * deviceScaleFactor;
const int colPixels = 3 * deviceScaleFactor;
@@ -691,7 +691,7 @@ void GraphicsContext::drawLineForDocumentMarker(const FloatPoint& pt, float widt
#endif
}
-#if PLATFORM(CHROMIUM) && OS(DARWIN)
+#if OS(DARWIN)
SkScalar originX = WebCoreFloatToSkScalar(pt.x()) * deviceScaleFactor;
SkScalar originY = WebCoreFloatToSkScalar(pt.y()) * deviceScaleFactor;
@@ -1200,7 +1200,7 @@ bool GraphicsContext::isAcceleratedContext() const
return platformContext()->isAccelerated();
}
-#if PLATFORM(CHROMIUM) && OS(DARWIN)
+#if OS(DARWIN)
CGColorSpaceRef deviceRGBColorSpaceRef()
{
static CGColorSpaceRef deviceSpace = CGColorSpaceCreateDeviceRGB();
« no previous file with comments | « Source/WebCore/platform/graphics/mac/SimpleFontDataMac.mm ('k') | Source/WebCore/platform/mac/WebCoreNSCellExtras.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698