summaryrefslogtreecommitdiffstats
path: root/core/java
diff options
context:
space:
mode:
authorGrace Kloba <klobag@google.com>2010-03-24 18:05:37 -0700
committerGrace Kloba <klobag@google.com>2010-03-24 18:05:37 -0700
commit1cd1c8e8be92c12661d577770e90371a79f12825 (patch)
tree8c53b21a705dc7eb6d76c0cf187f8fb271aa5970 /core/java
parent478a745e8421497bad9ea0cbd75bc4d4d419ef60 (diff)
downloadframeworks_base-1cd1c8e8be92c12661d577770e90371a79f12825.zip
frameworks_base-1cd1c8e8be92c12661d577770e90371a79f12825.tar.gz
frameworks_base-1cd1c8e8be92c12661d577770e90371a79f12825.tar.bz2
There are two computeHorizontalScrollRange() got
missed in the last conversion. Fix http://b/issue?id=2542555
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/webkit/WebView.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java
index 6722bc6..d8ec19a 100644
--- a/core/java/android/webkit/WebView.java
+++ b/core/java/android/webkit/WebView.java
@@ -1898,7 +1898,7 @@ public class WebView extends AbsoluteLayout
// Expects x in view coordinates
private int pinLocX(int x) {
if (mInOverScrollMode) return x;
- return pinLoc(x, getViewWidth(), computeHorizontalScrollRange());
+ return pinLoc(x, getViewWidth(), computeRealHorizontalScrollRange());
}
// Expects y in view coordinates
@@ -4318,7 +4318,7 @@ public class WebView extends AbsoluteLayout
" up/down= " + mMinDY + " " + mMaxDY);
}
- int docRight = computeHorizontalScrollRange();
+ int docRight = computeRealHorizontalScrollRange();
int viewLeft = getScrollX();
int viewRight = viewLeft + getWidth();
mStartX = x;