2 files changed, 8 insertions, 6 deletions
diff --git a/WebCore/platform/graphics/android/BaseLayerAndroid.cpp b/WebCore/platform/graphics/android/BaseLayerAndroid.cpp
index b632664..2f0e999 100644
--- a/WebCore/platform/graphics/android/BaseLayerAndroid.cpp
+++ b/WebCore/platform/graphics/android/BaseLayerAndroid.cpp
@@ -36,10 +36,6 @@
 #include <wtf/CurrentTime.h>
 #endif // USE(ACCELERATED_COMPOSITING)
 
-// #if TARGET_DEVICE != generic   /* Not supported in emulator */
-#define HARDWARE_ACCELERATION
-// #endif
-
 #ifdef DEBUG
 
 #include <cutils/log.h>
@@ -72,8 +68,9 @@ BaseLayerAndroid::BaseLayerAndroid()
 
 BaseLayerAndroid::~BaseLayerAndroid()
 {
-#ifdef HARDWARE_ACCELERATION
-    TilesManager::instance()->removeOperationsForBaseLayer(this);
+#if USE(ACCELERATED_COMPOSITING)
+    if (TilesManager::hardwareAccelerationEnabled())
+        TilesManager::instance()->removeOperationsForBaseLayer(this);
 #endif
     m_content.clear();
 #ifdef DEBUG_COUNT
diff --git a/WebCore/platform/graphics/android/TilesManager.h b/WebCore/platform/graphics/android/TilesManager.h
index 04147b0..eeb38fe 100644
--- a/WebCore/platform/graphics/android/TilesManager.h
+++ b/WebCore/platform/graphics/android/TilesManager.h
@@ -46,6 +46,11 @@ public:
     static TilesManager* instance();
     static GLint getMaxTextureSize();
 
+    static bool hardwareAccelerationEnabled()
+    {
+        return gInstance != 0;
+    }
+
     void removeOperationsForPage(TiledPage* page)
     {
         m_pixmapsGenerationThread->removeOperationsForPage(page);