From: Cary Clark <cary@android.com>
Date: Sun, 21 Feb 2010 15:51:18 +0000 (-0500)
Subject: disable webkit layers
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=4c319d7f42caf55d18590789400692ea9d6109c1;p=android-x86%2Fexternal-webkit.git

disable webkit layers

With layers enabled, servicing timers saturate the CPU at times.
This also fixes a compile-time switch in FindCanvas to disable layers.
---

diff --git a/JavaScriptCore/wtf/Platform.h b/JavaScriptCore/wtf/Platform.h
index 486f60cdf..1774c087e 100644
--- a/JavaScriptCore/wtf/Platform.h
+++ b/JavaScriptCore/wtf/Platform.h
@@ -1004,7 +1004,7 @@ on MinGW. See https://bugs.webkit.org/show_bug.cgi?id=29268 */
 #endif
 
 #if PLATFORM(ANDROID) && !defined WTF_USE_ACCELERATED_COMPOSITING
-#define WTF_USE_ACCELERATED_COMPOSITING 1
+#define WTF_USE_ACCELERATED_COMPOSITING 0
 #endif
 
 #if PLATFORM(IPHONE)
diff --git a/WebKit/android/nav/FindCanvas.cpp b/WebKit/android/nav/FindCanvas.cpp
index ef7b96ce6..b917eb913 100644
--- a/WebKit/android/nav/FindCanvas.cpp
+++ b/WebKit/android/nav/FindCanvas.cpp
@@ -228,6 +228,7 @@ SkRect FindCanvas::addMatchPosH(int index,
 }
 
 void FindCanvas::drawLayers(WebCore::LayerAndroid* layer) {
+#if USE(ACCELERATED_COMPOSITING)
     SkPicture* picture = layer->picture();
     if (picture) {
         setLayerId(layer->uniqueId());
@@ -235,6 +236,7 @@ void FindCanvas::drawLayers(WebCore::LayerAndroid* layer) {
     }
     for (int i = 0; i < layer->countChildren(); i++)
         drawLayers(layer->getChild(i));
+#endif
 }
 
 void FindCanvas::drawText(const void* text, size_t byteLength, SkScalar x,