summaryrefslogtreecommitdiffstats
path: root/WebKit/android
diff options
context:
space:
mode:
authorRussell Brenner <russellbrenner@google.com>2011-05-05 13:16:52 -0700
committerRussell Brenner <russellbrenner@google.com>2011-05-05 14:23:27 -0700
commit32f100f1f7947aa9b4d609b79f799b7c84c26251 (patch)
tree4d3ba779252b29ad746872e1e024bb54b9e74658 /WebKit/android
parent2d60bef786645e5b9e2da0e8374d3f06a40d0638 (diff)
downloadexternal_webkit-32f100f1f7947aa9b4d609b79f799b7c84c26251.zip
external_webkit-32f100f1f7947aa9b4d609b79f799b7c84c26251.tar.gz
external_webkit-32f100f1f7947aa9b4d609b79f799b7c84c26251.tar.bz2
Fix calculation in WebView::scrollRectOnScreen
Call to subtractLayers() was always returning an empty rect and, as a result, we would exit without calling viewInvalidate(). Bug: 4310520 Change-Id: Icad9e3efd157e5ae970a3200f5b0bbecbee66f79
Diffstat (limited to 'WebKit/android')
-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();