Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 83d4ba83: Do not attempt to retry a scrollTo with a negative position.

Browse Source 
Merge commit '83d4ba83ddf8309d2c0c38d69154217d6a9c0a6c' into eclair-plus-aosp

* commit '83d4ba83ddf8309d2c0c38d69154217d6a9c0a6c':
  Do not attempt to retry a scrollTo with a negative position.
This commit is contained in:
Leon Scroggins
2009-09-18 10:02:13 -07:00
committed by Android Git Automerger
parent 06ddfd187b 83d4ba83dd
commit 38a2ab36ce
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/java/android/webkit/WebView.java
View File

@@ -2484,8 +2484,11 @@ public class WebView extends AbsoluteLayout
}
// scale from content to view coordinates, and pin
// return true if pin caused the final x/y different than the request cx/cy;
// return false if the view scroll to the exact position as it is requested.
// return true if pin caused the final x/y different than the request cx/cy,
// and a future scroll may reach the request cx/cy after our size has
// changed
// return false if the view scroll to the exact position as it is requested,
// where negative numbers are taken to mean 0
private boolean setContentScrollTo(int cx, int cy) {
if (mDrawHistory) {
// disallow WebView to change the scroll position as History Picture
@@ -2500,7 +2503,9 @@ public class WebView extends AbsoluteLayout
// Log.d(LOGTAG, "content scrollTo [" + cx + " " + cy + "] view=[" +
// vx + " " + vy + "]");
pinScrollTo(vx, vy, false, 0);
if (mScrollX != vx || mScrollY != vy) {
// If the request was to scroll to a negative coordinate, treat it as if
// it was a request to scroll to 0
if ((mScrollX != vx && cx >= 0) || (mScrollY != vy && cy >= 0)) {
return true;
} else {
return false;