From 1a235ceee0ed0ffa7274aa66f9aabc0dfedb6e3a Mon Sep 17 00:00:00 2001
From: Russell Brenner <russellbrenner@google.com>
Date: Mon, 31 Jan 2011 16:54:02 -0800
Subject: 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
---
 WebCore/platform/graphics/android/BaseLayerAndroid.cpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'WebCore/platform')

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
 
-- 
cgit v1.1