diff options
author | Leon Scroggins <scroggo@google.com> | 2010-01-07 12:45:32 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2010-01-07 12:45:32 -0800 |
commit | b4ca27904cd6e62bd2b633ea156c1cefc3413171 (patch) | |
tree | 84b6ca49cbadc3d85c7fe5028b4c50a3a52c6605 /WebKit | |
parent | 012b75708aa7a7d3a3dd6a02b514e080317ccd39 (diff) | |
parent | e44f974f1d7e25a2823901e0f34c04aa924b7527 (diff) | |
download | external_webkit-b4ca27904cd6e62bd2b633ea156c1cefc3413171.zip external_webkit-b4ca27904cd6e62bd2b633ea156c1cefc3413171.tar.gz external_webkit-b4ca27904cd6e62bd2b633ea156c1cefc3413171.tar.bz2 |
am e44f974f: am 15f1e443: In motionUp, update the CachedHistory\'s mMouseBounds.
Merge commit 'e44f974f1d7e25a2823901e0f34c04aa924b7527'
* commit 'e44f974f1d7e25a2823901e0f34c04aa924b7527':
In motionUp, update the CachedHistory's mMouseBounds.
Diffstat (limited to 'WebKit')
-rw-r--r-- | WebKit/android/nav/WebView.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/WebKit/android/nav/WebView.cpp b/WebKit/android/nav/WebView.cpp index 6a0eb00..a536589 100644 --- a/WebKit/android/nav/WebView.cpp +++ b/WebKit/android/nav/WebView.cpp @@ -948,7 +948,9 @@ bool motionUp(int x, int y, int slop) } DBG_NAV_LOGD("CachedNode:%p (%d) x=%d y=%d rx=%d ry=%d", result, result->index(), x, y, rx, ry); - setNavBounds(WebCore::IntRect(rx, ry, 1, 1)); + WebCore::IntRect navBounds = WebCore::IntRect(rx, ry, 1, 1); + setNavBounds(navBounds); + root->rootHistory()->setMouseBounds(navBounds); updateCursorBounds(root, frame, result); root->setCursor(const_cast<CachedFrame*>(frame), const_cast<CachedNode*>(result)); |