diff options
| author | Grace Kloba <klobag@google.com> | 2010-03-24 18:27:18 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-03-24 18:27:18 -0700 |
| commit | 2c9607137cd496cd0373f17a8bd4454715057f67 (patch) | |
| tree | 1407447100cc6012cba61964dbc2c6d89a2c526c /core/java | |
| parent | 12331739e05b0c73fb8dbecefe2d9b2a2335e1d7 (diff) | |
| parent | 1cd1c8e8be92c12661d577770e90371a79f12825 (diff) | |
| download | frameworks_base-2c9607137cd496cd0373f17a8bd4454715057f67.zip frameworks_base-2c9607137cd496cd0373f17a8bd4454715057f67.tar.gz frameworks_base-2c9607137cd496cd0373f17a8bd4454715057f67.tar.bz2 | |
Merge "There are two computeHorizontalScrollRange() got missed in the last conversion."
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/webkit/WebView.java | 4 |
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; |