OSDN Git Service

(root) / android-x86 / external-webkit.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from parent 1: 57418a2)
Merge "Fix 3366514, browser emulator no longer crashes" into honeycomb
authorRussell Brenner <russellbrenner@google.com>
Tue, 1 Feb 2011 01:41:52 +0000 (17:41 -0800)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 1 Feb 2011 01:41:52 +0000 (17:41 -0800)
WebCore/platform/graphics/android/BaseLayerAndroid.cpp patch | blob | history

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
 
external/webkit
About OSDN
Find Software
Develop Software
Help