diff options
| author | Russell Brenner <russellbrenner@google.com> | 2011-01-31 17:41:52 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-01-31 17:41:52 -0800 |
| commit | 7f7e8eefa286fae90bc8f99ceb3521feea710a07 (patch) | |
| tree | dace0110da0233098b14af3df2b11701b0772146 /WebCore/platform | |
| parent | 57418a2ccb53c8c182bf67f3a56146ff37b20911 (diff) | |
| parent | 1a235ceee0ed0ffa7274aa66f9aabc0dfedb6e3a (diff) | |
| download | external_webkit-7f7e8eefa286fae90bc8f99ceb3521feea710a07.zip external_webkit-7f7e8eefa286fae90bc8f99ceb3521feea710a07.tar.gz external_webkit-7f7e8eefa286fae90bc8f99ceb3521feea710a07.tar.bz2 | |
Merge "Fix 3366514, browser emulator no longer crashes" into honeycomb
Diffstat (limited to 'WebCore/platform')
| -rw-r--r-- | WebCore/platform/graphics/android/BaseLayerAndroid.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/WebCore/platform/graphics/android/BaseLayerAndroid.cpp b/WebCore/platform/graphics/android/BaseLayerAndroid.cpp index d7ea5e6..2446cb1 100644 --- a/WebCore/platform/graphics/android/BaseLayerAndroid.cpp +++ b/WebCore/platform/graphics/android/BaseLayerAndroid.cpp @@ -36,7 +36,9 @@ #include <wtf/CurrentTime.h> #endif // USE(ACCELERATED_COMPOSITING) +#if TARGET_DEVICE != generic /* Not supported in emulator */ #define HARDWARE_ACCELERATION +#endif #ifdef DEBUG |