From 6ea14fae517da56092ed519906404da3127e10c0 Mon Sep 17 00:00:00 2001
From: Leon Scroggins <scroggo@google.com>
Date: Fri, 22 Jan 2010 11:32:42 -0500
Subject: Call nextTextfield on the CachedFrame that contains the cursor/focus.

Fixes http://b/issue?id=2359748
---
 WebKit/android/nav/WebView.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'WebKit/android')

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();
-- 
cgit v1.1