From 4c7ec8d6ab11408b6a9767b50c9fa73a834fe9a4 Mon Sep 17 00:00:00 2001
From: Grace Kloba <klobag@google.com>
Date: Mon, 11 Jan 2010 15:36:37 -0800
Subject: [PATCH] As setNewZoomScale is called asynchronously, the WebView can
 be destroyed. If it is, skip scaling.

Fix http://b/issue?id=2366538
---
 core/java/android/webkit/WebView.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java
index b10d7860c9237..3c6cd9caadd47 100644
--- a/core/java/android/webkit/WebView.java
+++ b/core/java/android/webkit/WebView.java
@@ -3892,7 +3892,9 @@ public class WebView extends AbsoluteLayout
             public void run() {
                 // we always force, in case our height changed, in which case we
                 // still want to send the notification over to webkit
-                setNewZoomScale(mActualScale, true);
+                if (mWebViewCore != null) {
+                    setNewZoomScale(mActualScale, true);
+                }
             }
         });
     }