commit 911d63d1598b4e8105e9a14d8e1c120f54548cbc
author Adam Powell <adamp@google.com> Tue Sep 13 17:15:46 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Tue Sep 13 17:15:46 2011 -0700
tree 8ebe52dcac999fc1626993f8c0de49acc3ed5ceb
parent 98da88c366920507c33782b1c7d64a510762b107
parent cc2264fe470440febe979da468abecf287a013ee

Merge "Fix bug 5309557 - Monkeys and SIGSEGV do not mix!"

core/java/android/webkit/WebView.java

diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java
index 1f14b05..37a7182 100644
--- a/core/java/android/webkit/WebView.java
+++ b/core/java/android/webkit/WebView.java
@@ -5580,7 +5580,7 @@
         setActive(hasWindowFocus);
         if (hasWindowFocus) {
             JWebCoreJavaBridge.setActiveWebView(this);
-            if (mPictureUpdatePausedForFocusChange) {
+            if (mPictureUpdatePausedForFocusChange && mNativeClass != 0) {
                 WebViewCore.resumeUpdatePicture(mWebViewCore);
                 nativeSetIsScrolling(false);
                 mPictureUpdatePausedForFocusChange = false;
@@ -5588,7 +5588,7 @@
         } else {
             JWebCoreJavaBridge.removeActiveWebView(this);
             final WebSettings settings = getSettings();
-            if (settings != null && settings.enableSmoothTransition() &&
+            if (settings != null && settings.enableSmoothTransition() && mNativeClass != 0 &&
                     mWebViewCore != null && !WebViewCore.isUpdatePicturePaused(mWebViewCore)) {
                 WebViewCore.pauseUpdatePicture(mWebViewCore);
                 nativeSetIsScrolling(true);