diff options
| author | Cary Clark <cary@android.com> | 2010-08-27 08:19:11 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-27 08:19:11 -0700 |
| commit | 586c86325776ca506c6380ab41f9e66a69704f45 (patch) | |
| tree | e36521684f58a23cea6bafc23cb1bc7d12122e5a | |
| parent | e7a0708886b515f34d0a7e034cdea391681bf7f1 (diff) | |
| parent | 90fa57cd8b940ab1b46a85da92d950392a77e9da (diff) | |
| download | external_webkit-586c86325776ca506c6380ab41f9e66a69704f45.zip external_webkit-586c86325776ca506c6380ab41f9e66a69704f45.tar.gz external_webkit-586c86325776ca506c6380ab41f9e66a69704f45.tar.bz2 | |
am 90fa57cd: DO NOT MERGE make the text selection easier to hit
Merge commit '90fa57cd8b940ab1b46a85da92d950392a77e9da' into gingerbread-plus-aosp
* commit '90fa57cd8b940ab1b46a85da92d950392a77e9da':
DO NOT MERGE make the text selection easier to hit
| -rw-r--r-- | WebKit/android/nav/SelectText.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/WebKit/android/nav/SelectText.cpp b/WebKit/android/nav/SelectText.cpp index fc93972..e303d2b 100644 --- a/WebKit/android/nav/SelectText.cpp +++ b/WebKit/android/nav/SelectText.cpp @@ -1426,7 +1426,10 @@ bool SelectText::hitSelection(int x, int y) const int bottom = m_selEnd.fBottom + CONTROL_HEIGHT / 2; if (hitCorner(right, bottom, x, y)) return true; - return m_selRegion.contains(x, y); + SkIRect test; + test.set(x - CONTROL_WIDTH, y - CONTROL_HEIGHT, x + CONTROL_WIDTH, + y + CONTROL_HEIGHT); + return m_selRegion.intersects(test); } void SelectText::moveSelection(const SkPicture* picture, int x, int y) |