diff options
| author | Russell Brenner <russellbrenner@google.com> | 2011-05-10 09:33:46 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-05-10 09:33:46 -0700 |
| commit | 86ca6e2e4d40c69c268633e600ef5b045d102180 (patch) | |
| tree | ba70bdbc5ea5269aefc829b39da078f51b5166ba /WebKit | |
| parent | aecd2790ab5d8d358eb7a7ee0181a52ca18bc179 (diff) | |
| parent | c74d30ac1079750a0d7f87704a9962f8045cce94 (diff) | |
| download | external_webkit-86ca6e2e4d40c69c268633e600ef5b045d102180.zip external_webkit-86ca6e2e4d40c69c268633e600ef5b045d102180.tar.gz external_webkit-86ca6e2e4d40c69c268633e600ef5b045d102180.tar.bz2 | |
am c74d30ac: Merge "Fix calculation in WebView::scrollRectOnScreen" into honeycomb-mr2
* commit 'c74d30ac1079750a0d7f87704a9962f8045cce94':
Fix calculation in WebView::scrollRectOnScreen
Diffstat (limited to 'WebKit')
| -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(); |