summaryrefslogtreecommitdiffstats
path: root/WebKit
diff options
context:
space:
mode:
authorRussell Brenner <russellbrenner@google.com>2011-05-10 11:15:57 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-05-10 11:15:57 -0700
commit395be1d91445ddb4a06255a2de6b2f0d4151e507 (patch)
tree206e116bd225395148fccbfec962e5cc5dae9971 /WebKit
parent6ca0f232942f803ddcde4f8eeaee5680e1493b16 (diff)
parent5581ea8383a0348a04997c772f8a032c146459af (diff)
downloadexternal_webkit-395be1d91445ddb4a06255a2de6b2f0d4151e507.zip
external_webkit-395be1d91445ddb4a06255a2de6b2f0d4151e507.tar.gz
external_webkit-395be1d91445ddb4a06255a2de6b2f0d4151e507.tar.bz2
am 5581ea83: am 86ca6e2e: am c74d30ac: Merge "Fix calculation in WebView::scrollRectOnScreen" into honeycomb-mr2
* commit '5581ea8383a0348a04997c772f8a032c146459af': Fix calculation in WebView::scrollRectOnScreen
Diffstat (limited to 'WebKit')
-rw-r--r--WebKit/android/nav/WebView.cpp8
1 files changed, 0 insertions, 8 deletions
diff --git a/WebKit/android/nav/WebView.cpp b/WebKit/android/nav/WebView.cpp
index 610a29d..ff5d73d 100644
--- a/WebKit/android/nav/WebView.cpp
+++ b/WebKit/android/nav/WebView.cpp
@@ -333,14 +333,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();