Merge "As setNewZoomScale is called asynchronously, the WebView can be destroyed. If it is, skip scaling."

1 files changed, 3 insertions, 1 deletions

diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java
index b10d7860c923..3c6cd9caadd4 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);
+                }
             }
         });
     }