From 1bf397ffbdaae9a5354c9bb0b5121c4a9f1c8c76 Mon Sep 17 00:00:00 2001 From: Leon Scroggins Date: Tue, 16 Nov 2010 16:02:25 -0500 Subject: [PATCH] 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 --- core/java/android/webkit/WebView.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java index 8fbdfe8bb34ed..092934bdc3a06 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,