Merge "Monkeys are touching my destroyed stuff" into jb-dev

jreck · Android (Google) Code Review · commit 90673b9d0e33 · 2012-05-04T10:29:10.000-07:00
diff --git a/core/java/android/webkit/WebViewClassic.java b/core/java/android/webkit/WebViewClassic.java
@@ -5827,7 +5827,7 @@ private void handleTouchEventCommon(MotionEvent event, int action, int x, int y)
                     }
                     data.mSlop = viewToContentDimension(mNavSlop);
                     removeTouchHighlight();
-                    if (!mBlockWebkitViewMessages) {
+                    if (!mBlockWebkitViewMessages && mWebViewCore != null) {
                         mWebViewCore.sendMessageAtFrontOfQueue(
                                 EventHub.HIT_TEST, data);
                     }

Original file line number	Diff line number	Diff line change
`@@ -5827,7 +5827,7 @@ private void handleTouchEventCommon(MotionEvent event, int action, int x, int y)`
`5827`	`5827`	`}`
`5828`	`5828`	`data.mSlop = viewToContentDimension(mNavSlop);`
`5829`	`5829`	`removeTouchHighlight();`
`5830`		`- if (!mBlockWebkitViewMessages) {`
	`5830`	`+ if (!mBlockWebkitViewMessages && mWebViewCore != null) {`
`5831`	`5831`	`mWebViewCore.sendMessageAtFrontOfQueue(`
`5832`	`5832`	`EventHub.HIT_TEST, data);`
`5833`	`5833`	`}`