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

Unified Diff: Source/core/platform/graphics/GraphicsContext.cpp

Issue 14107015: Rename OS(DARWIN) to OS(MACOSX). (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase Created 7 years, 3 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
« no previous file with comments | « Source/core/platform/graphics/GraphicsContext.h ('k') | Source/core/platform/graphics/IntPoint.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/platform/graphics/GraphicsContext.cpp
diff --git a/Source/core/platform/graphics/GraphicsContext.cpp b/Source/core/platform/graphics/GraphicsContext.cpp
index e1690bdd861b45b758b9853149854df20ea8d403..4f744ce799a04bf183f80349f2dbae4808791e6d 100644
--- a/Source/core/platform/graphics/GraphicsContext.cpp
+++ b/Source/core/platform/graphics/GraphicsContext.cpp
@@ -48,7 +48,7 @@
#include "wtf/Assertions.h"
#include "wtf/MathExtras.h"
-#if OS(DARWIN)
+#if OS(MACOSX)
#include <ApplicationServices/ApplicationServices.h>
#endif
@@ -697,7 +697,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 OS(DARWIN)
+#if OS(MACOSX)
// Match the artwork used by the Mac.
const int rowPixels = 4 * deviceScaleFactor;
const int colPixels = 3 * deviceScaleFactor;
@@ -772,7 +772,7 @@ void GraphicsContext::drawLineForDocumentMarker(const FloatPoint& pt, float widt
#endif
}
-#if OS(DARWIN)
+#if OS(MACOSX)
SkScalar originX = WebCoreFloatToSkScalar(pt.x()) * deviceScaleFactor;
SkScalar originY = WebCoreFloatToSkScalar(pt.y()) * deviceScaleFactor;
@@ -1708,7 +1708,7 @@ void GraphicsContext::setupPaintCommon(SkPaint* paint) const
void GraphicsContext::drawOuterPath(const SkPath& path, SkPaint& paint, int width)
{
-#if OS(DARWIN)
+#if OS(MACOSX)
paint.setAlpha(64);
paint.setStrokeWidth(width);
paint.setPathEffect(new SkCornerPathEffect((width - 1) * 0.5f))->unref();
@@ -1721,7 +1721,7 @@ void GraphicsContext::drawOuterPath(const SkPath& path, SkPaint& paint, int widt
void GraphicsContext::drawInnerPath(const SkPath& path, SkPaint& paint, int width)
{
-#if OS(DARWIN)
+#if OS(MACOSX)
paint.setAlpha(128);
paint.setStrokeWidth(width * 0.5f);
drawPath(path, paint);
@@ -1740,7 +1740,7 @@ void GraphicsContext::setRadii(SkVector* radii, IntSize topLeft, IntSize topRigh
SkIntToScalar(bottomLeft.height()));
}
-#if OS(DARWIN)
+#if OS(MACOSX)
CGColorSpaceRef deviceRGBColorSpaceRef()
{
static CGColorSpaceRef deviceSpace = CGColorSpaceCreateDeviceRGB();
« no previous file with comments | « Source/core/platform/graphics/GraphicsContext.h ('k') | Source/core/platform/graphics/IntPoint.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698