From cc2264fe470440febe979da468abecf287a013ee Mon Sep 17 00:00:00 2001
From: Adam Powell <adamp@google.com>
Date: Tue, 13 Sep 2011 16:11:29 -0700
Subject: [PATCH] Fix bug 5309557 - Monkeys and SIGSEGV do not mix!

Make sure that the native component of WebView has been initialized
before any native-level optimization involving window focus occurs.

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

diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java
index 065beb1e58a1d..1a6157e834388 100644
--- a/core/java/android/webkit/WebView.java
+++ b/core/java/android/webkit/WebView.java
@@ -5573,7 +5573,7 @@ public class WebView extends AbsoluteLayout
         setActive(hasWindowFocus);
         if (hasWindowFocus) {
             JWebCoreJavaBridge.setActiveWebView(this);
-            if (mPictureUpdatePausedForFocusChange) {
+            if (mPictureUpdatePausedForFocusChange && mNativeClass != 0) {
                 WebViewCore.resumeUpdatePicture(mWebViewCore);
                 nativeSetIsScrolling(false);
                 mPictureUpdatePausedForFocusChange = false;
@@ -5581,7 +5581,7 @@ public class WebView extends AbsoluteLayout
         } 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);