commit 87105a3d48e4bdd60972fc327d774fa50f7ff130
author Adam Powell <adamp@google.com> Tue Sep 13 21:13:15 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Tue Sep 13 21:13:15 2011 -0700
tree 9ee5d34104fae24cfd7450e25895439a07ffb86f
parent d18addb4e3d0cd4da798dd35ad676d98465ebed3
parent f4f520ae9fcde928ba66d533012ca17fc0bfd66a

Merge "Fix bug 5314559 - Slow menu scrolling in browser on some devices"

core/java/android/webkit/WebView.java

diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java
index 37a7182..2f73474 100644
--- a/core/java/android/webkit/WebView.java
+++ b/core/java/android/webkit/WebView.java
@@ -5580,18 +5580,16 @@
         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;
             }
         }