diff options
author | Russell Brenner <russellbrenner@google.com> | 2011-05-10 09:41:18 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2011-05-10 09:41:18 -0700 |
commit | 5581ea8383a0348a04997c772f8a032c146459af (patch) | |
tree | ba70bdbc5ea5269aefc829b39da078f51b5166ba /WebKit/android | |
parent | 53cd6a873bfb9f6d301aa5e1f62a2be622d5ddfb (diff) | |
parent | 86ca6e2e4d40c69c268633e600ef5b045d102180 (diff) | |
download | external_webkit-5581ea8383a0348a04997c772f8a032c146459af.zip external_webkit-5581ea8383a0348a04997c772f8a032c146459af.tar.gz external_webkit-5581ea8383a0348a04997c772f8a032c146459af.tar.bz2 |
am 86ca6e2e: am c74d30ac: Merge "Fix calculation in WebView::scrollRectOnScreen" into honeycomb-mr2
* commit '86ca6e2e4d40c69c268633e600ef5b045d102180':
Fix calculation in WebView::scrollRectOnScreen
Diffstat (limited to 'WebKit/android')
-rw-r--r-- | WebKit/android/nav/WebView.cpp | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/WebKit/android/nav/WebView.cpp b/WebKit/android/nav/WebView.cpp index 09fcd67..b294112 100644 --- a/WebKit/android/nav/WebView.cpp +++ b/WebKit/android/nav/WebView.cpp @@ -326,14 +326,6 @@ void scrollRectOnScreen(const IntRect& rect) return; SkRect visible; calcOurContentVisibleRect(&visible); -#if USE(ACCELERATED_COMPOSITING) - LayerAndroid* root = compositeRoot(); - if (root) { - root->updateFixedLayersPositions(visible); - root->updatePositions(); - visible = root->subtractLayers(visible); - } -#endif int dx = 0; int left = rect.x(); int right = rect.right(); |