diff options
| author | Russell Brenner <russellbrenner@google.com> | 2011-01-31 16:54:02 -0800 |
|---|---|---|
| committer | Russell Brenner <russellbrenner@google.com> | 2011-01-31 16:54:02 -0800 |
| commit | 1a235ceee0ed0ffa7274aa66f9aabc0dfedb6e3a (patch) | |
| tree | c9f44c009afa96d3096a3288827f3a1e7daf66d1 /WebCore/platform/graphics/android/BaseLayerAndroid.cpp | |
| parent | 59234abe5e834df8e4b8289e3ff72bc602be0535 (diff) | |
| download | external_webkit-1a235ceee0ed0ffa7274aa66f9aabc0dfedb6e3a.zip external_webkit-1a235ceee0ed0ffa7274aa66f9aabc0dfedb6e3a.tar.gz external_webkit-1a235ceee0ed0ffa7274aa66f9aabc0dfedb6e3a.tar.bz2 | |
Fix 3366514, browser emulator no longer crashes
Following recent update that added HARDWARE_ACCELERATION flag, it now
is disabled for emulator builds, removing incompatible calls to
TilesManager.
Change-Id: Iffbb57aebc3c2f22262ebf14ff7013d602c05c12
Diffstat (limited to 'WebCore/platform/graphics/android/BaseLayerAndroid.cpp')
| -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 49a7057..c602d63 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 |