Fix merge error

George Mount · George Mount · commit 8dc8a435a123 · 2012-03-21T10:52:56.000-07:00
Change-Id: Ia48e1f064b697fa328e5d582862dbe723f7ffd5d
diff --git a/core/java/android/webkit/WebViewCore.java b/core/java/android/webkit/WebViewCore.java
@@ -1779,7 +1779,7 @@ public void handleMessage(Message msg) {
                             int x = msg.arg1;
                             int y = msg.arg2;
                             if (!nativeSelectWordAt(mNativeClass, x, y)) {
-                                mWebView.mPrivateHandler.obtainMessage(WebViewClassic.SHOW_CARET_HANDLE)
+                                mWebViewClassic.mPrivateHandler.obtainMessage(WebViewClassic.SHOW_CARET_HANDLE)
                                     .sendToTarget();
                             }
                             break;

Original file line number	Diff line number	Diff line change
`@@ -1779,7 +1779,7 @@ public void handleMessage(Message msg) {`
`1779`	`1779`	`int x = msg.arg1;`
`1780`	`1780`	`int y = msg.arg2;`
`1781`	`1781`	`if (!nativeSelectWordAt(mNativeClass, x, y)) {`
`1782`		`- mWebView.mPrivateHandler.obtainMessage(WebViewClassic.SHOW_CARET_HANDLE)`
	`1782`	`+ mWebViewClassic.mPrivateHandler.obtainMessage(WebViewClassic.SHOW_CARET_HANDLE)`
`1783`	`1783`	`.sendToTarget();`
`1784`	`1784`	`}`
`1785`	`1785`	`break;`