From a2aaeda3cab40ff823fc40ebff51b828d1a9bc1c Mon Sep 17 00:00:00 2001 From: Leon Scroggins Date: Mon, 8 Feb 2010 11:34:36 -0500 Subject: Remove code which retrieves the action associated with a textfield. This code was written because we previously only had one action button on the IME for textfields. Now that textfields can always have a next button, we no longer need it. --- WebKit/android/nav/CachedRoot.cpp | 32 -------------------------------- 1 file changed, 32 deletions(-) (limited to 'WebKit/android/nav/CachedRoot.cpp') diff --git a/WebKit/android/nav/CachedRoot.cpp b/WebKit/android/nav/CachedRoot.cpp index 5805e5f..54e0c15 100644 --- a/WebKit/android/nav/CachedRoot.cpp +++ b/WebKit/android/nav/CachedRoot.cpp @@ -756,38 +756,6 @@ bool CachedRoot::checkRings(const WTF::Vector& rings, return ringCheck.success(); } -CachedRoot::ImeAction CachedRoot::currentTextFieldAction() const -{ - const CachedFrame* currentFrame; - const CachedNode* current = currentCursor(¤tFrame); - if (!current || !current->isTextInput()) { - // Although the cursor is not on a textfield, a textfield may have - // focus. Find the action for that textfield. - current = currentFocus(¤tFrame); - if (!current || !current->isTextInput()) - // Error case. No cursor and no focus. - return FAILURE; - } - const CachedNode* firstTextfield = nextTextField(0, 0, false); - if (!firstTextfield) { - // Error case. There are no textfields in this tree. - return FAILURE; - } - // Now find the next textfield/area starting with the cursor - const CachedFrame* potentialFrame; - const CachedNode* potentialNext - = currentFrame->nextTextField(current, &potentialFrame, true); - if (potentialNext && currentFrame->textInput(current)->formPointer() - == potentialFrame->textInput(potentialNext)->formPointer()) { - // There is a textfield/area after the cursor in the same form, - // so the textfield under the cursor should have the NEXT action - return NEXT; - } - // If this line is reached, we know that the textfield under the cursor is - // the last one. Make it GO to allow a submit - return GO; -} - const CachedNode* CachedRoot::findAt(const WebCore::IntRect& rect, const CachedFrame** framePtr, int* x, int* y, bool checkForHidden) const { -- cgit v1.1