diff options
| author | Ben Murdoch <benm@google.com> | 2009-11-19 05:05:27 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-11-19 05:05:27 -0800 |
| commit | 9f81a58578c15490558b48c2c3856128b979bc1c (patch) | |
| tree | 4a91d126cbdc471f67da149065908df48de3b82f | |
| parent | f9f42d8049cccfc5163c162a7569c902b984a050 (diff) | |
| parent | 35e8de89551825ca19f069d029757ecd852661a4 (diff) | |
| download | frameworks_base-9f81a58578c15490558b48c2c3856128b979bc1c.zip frameworks_base-9f81a58578c15490558b48c2c3856128b979bc1c.tar.gz frameworks_base-9f81a58578c15490558b48c2c3856128b979bc1c.tar.bz2 | |
am 35e8de89: am 0a784a54: When requesting the href of a link, also request the link\'s text.
Merge commit '35e8de89551825ca19f069d029757ecd852661a4'
* commit '35e8de89551825ca19f069d029757ecd852661a4':
When requesting the href of a link, also request the link's text.
| -rw-r--r-- | core/java/android/webkit/WebViewCore.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/core/java/android/webkit/WebViewCore.java b/core/java/android/webkit/WebViewCore.java index e0e7897..769f0b1 100644 --- a/core/java/android/webkit/WebViewCore.java +++ b/core/java/android/webkit/WebViewCore.java @@ -506,6 +506,7 @@ final class WebViewCore { int framePtr, int x, int y); private native String nativeRetrieveHref(int framePtr, int nodePtr); + private native String nativeRetrieveAnchorText(int framePtr, int nodePtr); private native void nativeTouchUp(int touchGeneration, int framePtr, int nodePtr, int x, int y); @@ -1160,8 +1161,10 @@ final class WebViewCore { case REQUEST_CURSOR_HREF: { Message hrefMsg = (Message) msg.obj; - String res = nativeRetrieveHref(msg.arg1, msg.arg2); - hrefMsg.getData().putString("url", res); + hrefMsg.getData().putString("url", + nativeRetrieveHref(msg.arg1, msg.arg2)); + hrefMsg.getData().putString("title", + nativeRetrieveAnchorText(msg.arg1, msg.arg2)); hrefMsg.sendToTarget(); break; } |