diff options
| author | Cary Clark <cary@android.com> | 2009-07-22 11:27:28 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-07-22 11:27:28 -0700 |
| commit | 7a7a9f77e27f6e56fb70bf2df47838fcf8caa229 (patch) | |
| tree | 915d03f5c178848c99906396b111a89570820166 /WebKit | |
| parent | 769e21eaac67b6b46de0e2cafc31f61fb990179e (diff) | |
| parent | 70522f5f5fb44f2f4df7a08aa64263c619e299cb (diff) | |
| download | external_webkit-7a7a9f77e27f6e56fb70bf2df47838fcf8caa229.zip external_webkit-7a7a9f77e27f6e56fb70bf2df47838fcf8caa229.tar.gz external_webkit-7a7a9f77e27f6e56fb70bf2df47838fcf8caa229.tar.bz2 | |
am 70522f5f: adjust right edge of copy bounds if edge is not found
Merge commit '70522f5f5fb44f2f4df7a08aa64263c619e299cb'
* commit '70522f5f5fb44f2f4df7a08aa64263c619e299cb':
adjust right edge of copy bounds if edge is not found
Diffstat (limited to 'WebKit')
| -rw-r--r-- | WebKit/android/jni/WebViewCore.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/WebKit/android/jni/WebViewCore.cpp b/WebKit/android/jni/WebViewCore.cpp index f9dfa61..9f457f4 100644 --- a/WebKit/android/jni/WebViewCore.cpp +++ b/WebKit/android/jni/WebViewCore.cpp @@ -1372,11 +1372,17 @@ WebCore::String WebViewCore::getSelection(SkRegion* selRgn) DBG_NAV_LOG("!node"); return result; } - WebCore::IntPoint endPt = WebCore::IntPoint(rect.fRight - 2, cy); + WebCore::IntPoint endPt = WebCore::IntPoint(rect.fRight - 1, cy); hitTestResult = m_mainFrame->eventHandler()->hitTestResultAtPoint(endPt, false); WebCore::Node* endNode = hitTestResult.innerNode(); if (!endNode) { - DBG_NAV_LOG("!endNode"); + DBG_NAV_LOG("!endNode (right-1)"); + endPt = WebCore::IntPoint(rect.fRight - 2, cy); + hitTestResult = m_mainFrame->eventHandler()->hitTestResultAtPoint(endPt, false); + endNode = hitTestResult.innerNode(); + } + if (!endNode) { + DBG_NAV_LOG("!endNode (right-2)"); return result; } int start = findTextBoxIndex(node, startPt); |