diff options
| -rw-r--r-- | WebCore/platform/graphics/android/LayerAndroid.cpp | 2 | ||||
| -rw-r--r-- | WebKit/android/nav/WebView.cpp | 6 |
2 files changed, 2 insertions, 6 deletions
diff --git a/WebCore/platform/graphics/android/LayerAndroid.cpp b/WebCore/platform/graphics/android/LayerAndroid.cpp index f88401c..e37b083 100644 --- a/WebCore/platform/graphics/android/LayerAndroid.cpp +++ b/WebCore/platform/graphics/android/LayerAndroid.cpp @@ -356,7 +356,7 @@ const LayerAndroid* LayerAndroid::find(int x, int y, SkPicture* root) const LayerAndroidFindState state(x, y); SkRect rootBounds; rootBounds.setEmpty(); - if (state.drew(root, rootBounds) && state.drewText()) + if (root && state.drew(root, rootBounds) && state.drewText()) return 0; // use the root picture only if it contains the text findInner(state); return state.best(); diff --git a/WebKit/android/nav/WebView.cpp b/WebKit/android/nav/WebView.cpp index ef68bf5..894ebd3 100644 --- a/WebKit/android/nav/WebView.cpp +++ b/WebKit/android/nav/WebView.cpp @@ -976,11 +976,7 @@ const LayerAndroid* scrollableLayer(int x, int y) const LayerAndroid* layerRoot = compositeRoot(); if (!layerRoot) return 0; - CachedRoot* cachedRoot = getFrameCache(DontAllowNewer); - if (!cachedRoot) - return 0; - SkPicture* picture = cachedRoot->pictureAt(&x, &y); - const LayerAndroid* result = layerRoot->find(x, y, picture); + const LayerAndroid* result = layerRoot->find(x, y, 0); if (result != 0 && result->contentIsScrollable()) return result; #endif |