diff options
| author | Steve Block <steveblock@google.com> | 2009-12-17 13:32:53 +0000 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-01-05 14:29:48 +0000 |
| commit | f912b6f62505f60109e7300787c93111dbd70560 (patch) | |
| tree | 2432507bd57c2620b2e167f8368e548506c041f1 /JavaScriptCore | |
| parent | 8c8c7b43f311d492d2c13ee68bc91875262ae072 (diff) | |
| download | external_webkit-f912b6f62505f60109e7300787c93111dbd70560.zip external_webkit-f912b6f62505f60109e7300787c93111dbd70560.tar.gz external_webkit-f912b6f62505f60109e7300787c93111dbd70560.tar.bz2 | |
Defines PLATFORM(SKIA), instead of PLATFROM(SGL) for Android.
Skia is used by Chromium, which defines PLATFORM(SKIA).
Android also uses Skia, but currently defines PLATFORM(SGL) to account for
platform-specific differences between Android and Chromum.
We now use PLATFORM(SKIA) on Android and remove PLATFORM(SGL).
Platform-specific differences are achieved with PLATFORM(ANDROID) guards.
This reduces our diff with webkit.org.
Change-Id: Ibf920b1929e7c3cdabb025ae61ceae3df67258bb
Diffstat (limited to 'JavaScriptCore')
| -rw-r--r-- | JavaScriptCore/wtf/Platform.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/JavaScriptCore/wtf/Platform.h b/JavaScriptCore/wtf/Platform.h index 18e2b5c..960b253 100644 --- a/JavaScriptCore/wtf/Platform.h +++ b/JavaScriptCore/wtf/Platform.h @@ -538,7 +538,7 @@ #if PLATFORM(ANDROID) #define WTF_USE_PTHREADS 1 -#define WTF_PLATFORM_SGL 1 +#define WTF_PLATFORM_SKIA 1 #define USE_SYSTEM_MALLOC 1 #define ENABLE_MAC_JAVA_BRIDGE 1 #define LOG_DISABLED 1 |