summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeon Scroggins <scroggo@google.com>2010-01-22 11:32:42 -0500
committerLeon Scroggins <scroggo@google.com>2010-01-22 11:32:42 -0500
commit6ea14fae517da56092ed519906404da3127e10c0 (patch)
tree7c081a05880a6d332a12e1420cc75688b2aac28d
parent86f0e4ae22d2ffb6039a3c366cc9aec3c82b0777 (diff)
downloadexternal_webkit-6ea14fae517da56092ed519906404da3127e10c0.zip
external_webkit-6ea14fae517da56092ed519906404da3127e10c0.tar.gz
external_webkit-6ea14fae517da56092ed519906404da3127e10c0.tar.bz2
Call nextTextfield on the CachedFrame that contains the cursor/focus.
Fixes http://b/issue?id=2359748
-rw-r--r--WebKit/android/nav/WebView.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/WebKit/android/nav/WebView.cpp b/WebKit/android/nav/WebView.cpp
index 98f308c..dae93fc 100644
--- a/WebKit/android/nav/WebView.cpp
+++ b/WebKit/android/nav/WebView.cpp
@@ -1998,13 +1998,15 @@ static void nativeMoveCursorToNextTextInput(JNIEnv *env, jobject obj)
CachedRoot* root = view->getFrameCache(WebView::DontAllowNewer);
if (!root)
return;
- const CachedNode* current = root->currentCursor();
+ const CachedFrame* containingFrame;
+ const CachedNode* current = root->currentCursor(&containingFrame);
if (!current)
- current = root->currentFocus();
+ current = root->currentFocus(&containingFrame);
if (!current)
return;
const CachedFrame* frame;
- const CachedNode* next = root->nextTextField(current, &frame, true);
+ const CachedNode* next = containingFrame->nextTextField(current, &frame,
+ true);
if (!next)
return;
const WebCore::IntRect& bounds = next->bounds();