diff options
| author | Leon Scroggins <scroggo@google.com> | 2010-11-16 16:02:25 -0500 |
|---|---|---|
| committer | Leon Scroggins <scroggo@google.com> | 2010-11-17 09:22:57 -0500 |
| commit | 1bf397ffbdaae9a5354c9bb0b5121c4a9f1c8c76 (patch) | |
| tree | e728d161d04c73f48591b8b9950ba7b4cb2a2c14 /core | |
| parent | d89a30af1f37317a51088a207dda865a2f60c83a (diff) | |
| download | frameworks_base-1bf397ffbdaae9a5354c9bb0b5121c4a9f1c8c76.zip frameworks_base-1bf397ffbdaae9a5354c9bb0b5121c4a9f1c8c76.tar.gz frameworks_base-1bf397ffbdaae9a5354c9bb0b5121c4a9f1c8c76.tar.bz2 | |
Do not retry failed attempts to retry scrolls.
Bug:3174399
If the page requests to scroll beyond the edge of the
screen, we send a message to try again on a draw, in case
our picture is out of date and the page should be larger.
However, sometimes we get stuck in a loop of retrying the
same scroll position over and over again. End this loop.
Change-Id: I53fcd4c2fa70c7ef63d4537d8b24eabb6b924b0b
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/webkit/WebView.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java index 8fbdfe8..092934b 100644 --- a/core/java/android/webkit/WebView.java +++ b/core/java/android/webkit/WebView.java @@ -6443,7 +6443,8 @@ public class WebView extends AbsoluteLayout mUserScroll = false; break; } - // fall through + setContentScrollTo(msg.arg1, msg.arg2); + break; case SCROLL_TO_MSG_ID: if (setContentScrollTo(msg.arg1, msg.arg2)) { // if we can't scroll to the exact position due to pin, |