diff options
| author | Nicolas Roard <nicolas@android.com> | 2010-01-04 20:25:48 +0000 |
|---|---|---|
| committer | Nicolas Roard <nicolas@android.com> | 2010-01-04 20:25:48 +0000 |
| commit | 797e4f1087e408060f2812c79bddcd2b73a3830d (patch) | |
| tree | 988271e6c693cf3127a7ce0b5a16a2dcc7e61211 /JavaScriptCore | |
| parent | e035b64a686cf87a82d880d4863856231625b2f8 (diff) | |
| download | external_webkit-797e4f1087e408060f2812c79bddcd2b73a3830d.zip external_webkit-797e4f1087e408060f2812c79bddcd2b73a3830d.tar.gz external_webkit-797e4f1087e408060f2812c79bddcd2b73a3830d.tar.bz2 | |
resolved conflicts for merge of 870689c8
Diffstat (limited to 'JavaScriptCore')
| -rw-r--r-- | JavaScriptCore/wtf/Platform.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/JavaScriptCore/wtf/Platform.h b/JavaScriptCore/wtf/Platform.h index dbe2f8e..18e2b5c 100644 --- a/JavaScriptCore/wtf/Platform.h +++ b/JavaScriptCore/wtf/Platform.h @@ -919,6 +919,10 @@ on MinGW. See https://bugs.webkit.org/show_bug.cgi?id=29268 */ #endif #endif +#if PLATFORM(ANDROID) +#define WTF_USE_ACCELERATED_COMPOSITING 0 +#endif + #if PLATFORM(IPHONE) #define WTF_USE_ACCELERATED_COMPOSITING 1 #endif |