From f4f520ae9fcde928ba66d533012ca17fc0bfd66a Mon Sep 17 00:00:00 2001
From: Adam Powell <adamp@google.com>
Date: Tue, 13 Sep 2011 20:16:32 -0700
Subject: [PATCH] Fix bug 5314559 - Slow menu scrolling in browser on some
 devices

nativeSetIsScrolling has other side effects. Just pause picture
updating when WebView loses focus.

Change-Id: I917851c806f35a91a12a25c7457712123669384f
---
 core/java/android/webkit/WebView.java | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java
index 37a7182dd0be3..2f7347458d8f5 100644
--- a/core/java/android/webkit/WebView.java
+++ b/core/java/android/webkit/WebView.java
@@ -5580,18 +5580,16 @@ public class WebView extends AbsoluteLayout
         setActive(hasWindowFocus);
         if (hasWindowFocus) {
             JWebCoreJavaBridge.setActiveWebView(this);
-            if (mPictureUpdatePausedForFocusChange && mNativeClass != 0) {
+            if (mPictureUpdatePausedForFocusChange) {
                 WebViewCore.resumeUpdatePicture(mWebViewCore);
-                nativeSetIsScrolling(false);
                 mPictureUpdatePausedForFocusChange = false;
             }
         } else {
             JWebCoreJavaBridge.removeActiveWebView(this);
             final WebSettings settings = getSettings();
-            if (settings != null && settings.enableSmoothTransition() && mNativeClass != 0 &&
+            if (settings != null && settings.enableSmoothTransition() &&
                     mWebViewCore != null && !WebViewCore.isUpdatePicturePaused(mWebViewCore)) {
                 WebViewCore.pauseUpdatePicture(mWebViewCore);
-                nativeSetIsScrolling(true);
                 mPictureUpdatePausedForFocusChange = true;
             }
         }