diff options
| author | Patrick Scott <phanna@android.com> | 2011-02-22 11:20:56 -0500 |
|---|---|---|
| committer | Patrick Scott <phanna@android.com> | 2011-02-22 11:20:56 -0500 |
| commit | b0c9a2b4033eca931163e8223d7eaa8889337144 (patch) | |
| tree | 41b25d823cd2bad82c86882e1c0fe5d252ec6d6e /WebKit/android/nav/WebView.cpp | |
| parent | e248a68aa5529c1e5faba09893cf079b0657d898 (diff) | |
| download | external_webkit-b0c9a2b4033eca931163e8223d7eaa8889337144.zip external_webkit-b0c9a2b4033eca931163e8223d7eaa8889337144.tar.gz external_webkit-b0c9a2b4033eca931163e8223d7eaa8889337144.tar.bz2 | |
Scroll the RenderLayer during touch events.
Keep track of the owning layer for each LayerAndroid. No longer need to unadjust
the node bounds since the node will be scrolled into view.
Bug: 3442108
Change-Id: I7c9604d347af326ccfb86e6d3f2b95b7ce1b97c1
Diffstat (limited to 'WebKit/android/nav/WebView.cpp')
| -rw-r--r-- | WebKit/android/nav/WebView.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/WebKit/android/nav/WebView.cpp b/WebKit/android/nav/WebView.cpp index edd362c..96ded71 100644 --- a/WebKit/android/nav/WebView.cpp +++ b/WebKit/android/nav/WebView.cpp @@ -936,7 +936,7 @@ void selectBestAt(const WebCore::IntRect& rect) } else { DBG_NAV_LOGD("CachedNode:%p (%d)", node, node->index()); WebCore::IntRect bounds = node->bounds(frame); - root->rootHistory()->setMouseBounds(frame->unadjustBounds(node, bounds)); + root->rootHistory()->setMouseBounds(bounds); m_viewImpl->updateCursorBounds(root, frame, node); showCursorTimed(); root->setCursor(const_cast<CachedFrame*>(frame), @@ -988,8 +988,6 @@ 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); - // No need to call unadjustBounds below. rx and ry are already adjusted to - // the absolute position of the node. WebCore::IntRect navBounds = WebCore::IntRect(rx, ry, 1, 1); history->setNavBounds(navBounds); history->setMouseBounds(navBounds); @@ -2240,7 +2238,7 @@ static bool nativeMoveCursorToNextTextInput(JNIEnv *env, jobject obj) if (!next) return false; const WebCore::IntRect& bounds = next->bounds(frame); - root->rootHistory()->setMouseBounds(frame->unadjustBounds(next, bounds)); + root->rootHistory()->setMouseBounds(bounds); view->getWebViewCore()->updateCursorBounds(root, frame, next); view->showCursorUntimed(); root->setCursor(const_cast<CachedFrame*>(frame), |