diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java
index 5f002491865bc..8be9a68938731 100644
--- a/core/java/android/webkit/WebView.java
+++ b/core/java/android/webkit/WebView.java
@@ -4677,13 +4677,14 @@ public class WebView extends AbsoluteLayout
                         break;
                     }
                     nativeSetFollowedLink(true);
-                    mWebViewCore.sendMessage(EventHub.SET_MOVE_MOUSE,
-                            cursorData());
+                    WebViewCore.CursorData data = cursorData();
+                    mWebViewCore.sendMessage(EventHub.SET_MOVE_MOUSE, data);
                     playSoundEffect(SoundEffectConstants.CLICK);
                     boolean isTextInput = nativeCursorIsTextInput();
                     if (isTextInput || !mCallbackProxy.uiOverrideUrlLoading(
                                 nativeCursorText())) {
-                        mWebViewCore.sendMessage(EventHub.CLICK);
+                        mWebViewCore.sendMessage(EventHub.CLICK, data.mFrame,
+                                nativeCursorNodePointer());
                     }
                     if (isTextInput) {
                         rebuildWebTextView();
diff --git a/core/java/android/webkit/WebViewCore.java b/core/java/android/webkit/WebViewCore.java
index 926bd18e82bd4..89c8bc2d512b7 100644
--- a/core/java/android/webkit/WebViewCore.java
+++ b/core/java/android/webkit/WebViewCore.java
@@ -348,7 +348,7 @@ final class WebViewCore {
     private native boolean nativeKey(int keyCode, int unichar,
             int repeatCount, boolean isShift, boolean isAlt, boolean isDown);
 
-    private native boolean nativeClick();
+    private native void nativeClick(int framePtr, int nodePtr);
 
     private native void nativeSendListBoxChoices(boolean[] choices, int size);
 
@@ -803,7 +803,7 @@ final class WebViewCore {
                             break;
 
                         case CLICK:
-                            nativeClick();
+                            nativeClick(msg.arg1, msg.arg2);
                             break;
 
                         case VIEW_SIZE_CHANGED: