diff options
| author | Leon Scroggins <scroggo@google.com> | 2009-06-26 14:00:40 -0400 |
|---|---|---|
| committer | Leon Scroggins <scroggo@google.com> | 2009-06-26 15:33:47 -0400 |
| commit | ef6da8fe3d5bc153eb934d440d0b3bfabd0e3279 (patch) | |
| tree | 9968e9f7254e72008b428bf441ca4d30be96f2c4 /core/java/android/webkit | |
| parent | 53d3c1e4513135c5d8f70da4938c7d25455263f5 (diff) | |
Make clicking the trackball on a <select> element work.
Optionally pass a frame and node pointer to nativeClick, since
the hit testing does not find the HTMLSelectElement node. Also
change the signature of nativeClick to return void, since
we never use the return value. Requires a change in
external/webkit.
Diffstat (limited to 'core/java/android/webkit')
| -rw-r--r-- | core/java/android/webkit/WebView.java | 7 | ||||
| -rw-r--r-- | core/java/android/webkit/WebViewCore.java | 4 |
2 files changed, 6 insertions, 5 deletions
diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java index 5f002491865b..8be9a6893873 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 926bd18e82bd..89c8bc2d512b 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: |