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

Unified Diff: Source/core/platform/graphics/GlyphBuffer.h

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/FontPlatformData.cpp ('k') | Source/core/platform/graphics/GraphicsContext.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/platform/graphics/GlyphBuffer.h
diff --git a/Source/core/platform/graphics/GlyphBuffer.h b/Source/core/platform/graphics/GlyphBuffer.h
index 97399cb7be794f04d0bf47b275d2ccb477f90da4..b5806156a5e1033220d9450cf2a005cc47a5753b 100644
--- a/Source/core/platform/graphics/GlyphBuffer.h
+++ b/Source/core/platform/graphics/GlyphBuffer.h
@@ -35,7 +35,7 @@
#include "wtf/UnusedParam.h"
#include "wtf/Vector.h"
-#if OS(DARWIN)
+#if OS(MACOSX)
#include <ApplicationServices/ApplicationServices.h>
#endif
@@ -47,7 +47,7 @@ typedef Glyph GlyphBufferGlyph;
// CG uses CGSize instead of FloatSize so that the result of advances()
// can be passed directly to CGContextShowGlyphsWithAdvances in FontMac.mm
-#if OS(DARWIN)
+#if OS(MACOSX)
struct GlyphBufferAdvance : CGSize {
public:
GlyphBufferAdvance(CGSize size) : CGSize(size)
@@ -96,7 +96,7 @@ public:
m_fontData.append(font);
m_glyphs.append(glyph);
-#if OS(DARWIN)
+#if OS(MACOSX)
CGSize advance = { width, 0 };
m_advances.append(advance);
#else
« no previous file with comments | « Source/core/platform/graphics/FontPlatformData.cpp ('k') | Source/core/platform/graphics/GraphicsContext.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698