diff options
| -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, |