summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRussell Brenner <russellbrenner@google.com>2011-05-10 09:30:16 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-05-10 09:30:16 -0700
commitc74d30ac1079750a0d7f87704a9962f8045cce94 (patch)
treeba70bdbc5ea5269aefc829b39da078f51b5166ba
parentc3da3ea3d67930a5593b455cdc697171a9115cae (diff)
parent32f100f1f7947aa9b4d609b79f799b7c84c26251 (diff)
downloadexternal_webkit-c74d30ac1079750a0d7f87704a9962f8045cce94.zip
external_webkit-c74d30ac1079750a0d7f87704a9962f8045cce94.tar.gz
external_webkit-c74d30ac1079750a0d7f87704a9962f8045cce94.tar.bz2
Merge "Fix calculation in WebView::scrollRectOnScreen" into honeycomb-mr2
-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 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();