diff options
Diffstat (limited to 'webkit/pending/wtf')
| -rw-r--r-- | webkit/pending/wtf/Platform.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/webkit/pending/wtf/Platform.h b/webkit/pending/wtf/Platform.h index 7256d81..4bc384e 100644 --- a/webkit/pending/wtf/Platform.h +++ b/webkit/pending/wtf/Platform.h @@ -79,9 +79,10 @@ /* Operating environments */ -/* define a platform for chrome, requires |BUILDING_CHROME__| to be defined */ -#if defined(BUILDING_CHROME__) -#define WTF_PLATFORM_CHROME 1 +/* Define a platform for Chromium, requires |BUILDING_CHROMIUM__| to be */ +/* defined. This is temporary until the merge lands. */ +#if defined(BUILDING_CHROMIUM__) +#define WTF_PLATFORM_CHROMIUM 1 #endif /* PLATFORM(QT) */ @@ -113,9 +114,11 @@ #if PLATFORM(MAC) #define WTF_PLATFORM_CG 1 #define WTF_PLATFORM_CI 1 -#if PLATFORM(CHROME) +#if PLATFORM(CHROMIUM) #define WTF_PLATFORM_SKIA 1 #endif +#elif PLATFORM(CHROMIUM) +#define WTF_PLATFORM_SKIA 1 #elif !PLATFORM(QT) && !PLATFORM(WX) #define WTF_PLATFORM_CAIRO 1 #endif |