summaryrefslogtreecommitdiffstats
path: root/Source/JavaScriptCore/wtf/Platform.h
diff options
context:
space:
mode:
authorBen Murdoch <benm@google.com>2011-05-24 14:37:08 +0100
committerBen Murdoch <benm@google.com>2011-06-02 10:36:18 +0100
commit7fb1198349cf58688611c0b98189560871faa49f (patch)
tree0bc688968b9183e14ff57116f5ba2b7f98cd1d1b /Source/JavaScriptCore/wtf/Platform.h
parenta551df194f6950988c7accff3018f55c9c674bc3 (diff)
downloadexternal_webkit-7fb1198349cf58688611c0b98189560871faa49f.zip
external_webkit-7fb1198349cf58688611c0b98189560871faa49f.tar.gz
external_webkit-7fb1198349cf58688611c0b98189560871faa49f.tar.bz2
Merge WebKit at r80534: Update uses of PLATFORM(SKIA).
PLATFORM(SKIA) is replaced with USE(SKIA), see http://trac.webkit.org/changeset/79578 Fix conflicts and update our code to reflect this. Change-Id: Ia23956874418552eb8f107d389557a4cdcb225b6
Diffstat (limited to 'Source/JavaScriptCore/wtf/Platform.h')
-rw-r--r--Source/JavaScriptCore/wtf/Platform.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/JavaScriptCore/wtf/Platform.h b/Source/JavaScriptCore/wtf/Platform.h
index 593bb42..f4fdbcb 100644
--- a/Source/JavaScriptCore/wtf/Platform.h
+++ b/Source/JavaScriptCore/wtf/Platform.h
@@ -675,7 +675,7 @@
#if PLATFORM(ANDROID)
#define WTF_USE_PTHREADS 1
-#define WTF_PLATFORM_SKIA 1
+#define WTF_USE_SKIA 1
#define USE_SYSTEM_MALLOC 1
#define ENABLE_JAVA_BRIDGE 1
#define LOG_DISABLED 1