From f912b6f62505f60109e7300787c93111dbd70560 Mon Sep 17 00:00:00 2001 From: Steve Block Date: Thu, 17 Dec 2009 13:32:53 +0000 Subject: 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 --- JavaScriptCore/wtf/Platform.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'JavaScriptCore') 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 -- cgit v1.1