diff options
| author | Patrick Scott <phanna@android.com> | 2010-11-12 15:53:20 -0500 |
|---|---|---|
| committer | Patrick Scott <phanna@android.com> | 2010-11-12 16:34:27 -0500 |
| commit | d14ead3da91cffe84ab520406be62b9d988a3212 (patch) | |
| tree | 8b1d74a4a12ad7b4082f66d27bf1da9e5e2e559a /WebKit/android | |
| parent | 3a3b28707d2d6a06afe9f3137e9bedc07246d600 (diff) | |
| download | external_webkit-d14ead3da91cffe84ab520406be62b9d988a3212.zip external_webkit-d14ead3da91cffe84ab520406be62b9d988a3212.tar.gz external_webkit-d14ead3da91cffe84ab520406be62b9d988a3212.tar.bz2 | |
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
Diffstat (limited to 'WebKit/android')
| -rw-r--r-- | WebKit/android/nav/WebView.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
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 |