diff options
| author | Cary Clark <cary@android.com> | 2010-02-21 10:51:18 -0500 |
|---|---|---|
| committer | Cary Clark <cary@android.com> | 2010-02-21 10:51:18 -0500 |
| commit | 4c319d7f42caf55d18590789400692ea9d6109c1 (patch) | |
| tree | 51916b303d3fd04f66fbe8640aecbe1eced60878 | |
| parent | cdd7f6d80774ba3a374f09f22f7cb6bcfca24fa5 (diff) | |
| download | external_webkit-4c319d7f42caf55d18590789400692ea9d6109c1.zip external_webkit-4c319d7f42caf55d18590789400692ea9d6109c1.tar.gz external_webkit-4c319d7f42caf55d18590789400692ea9d6109c1.tar.bz2 | |
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.
| -rw-r--r-- | JavaScriptCore/wtf/Platform.h | 2 | ||||
| -rw-r--r-- | WebKit/android/nav/FindCanvas.cpp | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/JavaScriptCore/wtf/Platform.h b/JavaScriptCore/wtf/Platform.h index 486f60c..1774c08 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 ef7b96c..b917eb9 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, |