From d14ead3da91cffe84ab520406be62b9d988a3212 Mon Sep 17 00:00:00 2001 From: Patrick Scott Date: Fri, 12 Nov 2010 15:53:20 -0500 Subject: Use LayerAndroid::find with the original x and y. If the picture is not provided, use the findInner case to find the layer at the given position. Change-Id: I811c1c4d631086832a3a32038834117a1c4e9601 --- WebKit/android/nav/WebView.cpp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'WebKit/android/nav') 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 -- cgit v1.1