diff options
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/webkit/WebView.java | 11 | ||||
| -rw-r--r-- | core/java/android/webkit/WebViewCore.java | 4 |
2 files changed, 7 insertions, 8 deletions
diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java index c57931817e20..c45d815f622d 100644 --- a/core/java/android/webkit/WebView.java +++ b/core/java/android/webkit/WebView.java @@ -2183,14 +2183,13 @@ public class WebView extends AbsoluteLayout // look at the cursor node, and not the focus node. Also, what is // getFocusNodePath? public void requestFocusNodeHref(Message hrefMsg) { - if (hrefMsg == null || mNativeClass == 0) { + if (hrefMsg == null) { return; } - if (nativeCursorIsAnchor()) { - mWebViewCore.sendMessage(EventHub.REQUEST_CURSOR_HREF, - nativeCursorFramePointer(), nativeCursorNodePointer(), - hrefMsg); - } + int contentX = viewToContentX((int) mLastTouchX + mScrollX); + int contentY = viewToContentY((int) mLastTouchY + mScrollY); + mWebViewCore.sendMessage(EventHub.REQUEST_CURSOR_HREF, + contentX, contentY, hrefMsg); } /** diff --git a/core/java/android/webkit/WebViewCore.java b/core/java/android/webkit/WebViewCore.java index b7d20b4ce81c..99a0386287ef 100644 --- a/core/java/android/webkit/WebViewCore.java +++ b/core/java/android/webkit/WebViewCore.java @@ -553,8 +553,8 @@ final class WebViewCore { private native void nativeMoveMouseIfLatest(int moveGeneration, int framePtr, int x, int y); - private native String nativeRetrieveHref(int framePtr, int nodePtr); - private native String nativeRetrieveAnchorText(int framePtr, int nodePtr); + private native String nativeRetrieveHref(int x, int y); + private native String nativeRetrieveAnchorText(int x, int y); private native void nativeTouchUp(int touchGeneration, int framePtr, int nodePtr, int x, int y); |