Merge "Fix contentInvalidateAll NPE"

2011-08-29 17:14:11 -07:00
parent d56b3c9524 c87b7705a0
commit 30cca6020d
1 changed files with 3 additions and 1 deletions
--- a/core/java/android/webkit/WebView.java
+++ b/core/java/android/webkit/WebView.java
@@ -9124,7 +9124,9 @@ public class WebView extends AbsoluteLayout

    /** @hide send content invalidate */
    protected void contentInvalidateAll() {
-        mWebViewCore.sendMessage(EventHub.CONTENT_INVALIDATE_ALL);
+        if (mWebViewCore != null && !mBlockWebkitViewMessages) {
+            mWebViewCore.sendMessage(EventHub.CONTENT_INVALIDATE_ALL);
+        }
    }

    /** @hide call pageSwapCallback upon next page swap */