OSDN Git Service
(root)
/
android-x86
/
external-webkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge "Fix 3366514, browser emulator no longer crashes" into honeycomb
[android-x86/external-webkit.git]
/
WebCore
/
platform
/
graphics
/
android
/
BaseLayerAndroid.cpp
diff --git
a/WebCore/platform/graphics/android/BaseLayerAndroid.cpp
b/WebCore/platform/graphics/android/BaseLayerAndroid.cpp
index
d7ea5e6
..
2446cb1
100644
(file)
--- 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