Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(431)

Unified Diff: Source/web/WebViewImpl.cpp

Issue 939603002: Adding support for Smart GO NEXT feature in Android Chrome (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Breaking the traversal when reaches outside current form scope. Created 5 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/web/WebViewImpl.h ('k') | public/web/WebTextInputType.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/web/WebViewImpl.cpp
diff --git a/Source/web/WebViewImpl.cpp b/Source/web/WebViewImpl.cpp
index 50a9d84742d99a31c48274c54d42174bc6df2596..80e03e2c8d3372a924de57eee148c6dd5c800d0c 100644
--- a/Source/web/WebViewImpl.cpp
+++ b/Source/web/WebViewImpl.cpp
@@ -116,6 +116,7 @@
#include "public/platform/WebCompositeAndReadbackAsyncCallback.h"
#include "public/platform/WebDragData.h"
#include "public/platform/WebFloatPoint.h"
+#include "public/platform/WebFocusType.h"
#include "public/platform/WebGestureCurve.h"
#include "public/platform/WebImage.h"
#include "public/platform/WebLayerTreeView.h"
@@ -2519,9 +2520,65 @@ int WebViewImpl::textInputFlags()
}
}
+ if (wantEnterEvents(element))
+ flags |= WebTextInputFlagWantEnterEvents;
+
+ if (haveNextInput(element, WebFocusTypeForward))
+ flags |= WebTextInputFlagHaveNextInput;
+
+ if (haveNextInput(element, WebFocusTypeBackward))
+ flags |= WebTextInputFlagHavePreviousInput;
+
return flags;
}
+Element* WebViewImpl::haveNextInput(Element* element, WebFocusType focusType)
tkent 2015/04/14 23:27:19 The function name is not reasonable. - The name lo
AKV 2015/04/16 19:05:19 Done. nextFocusableElement is ideal. Thanks :)
+{
+ if (!element->isFormControlElement())
tkent 2015/04/14 23:27:19 Do you want to reject a contenteditable element th
AKV 2015/04/16 19:05:19 I care about elements which are inside the form. I
tkent 2015/04/17 04:12:35 IsFormControlElement() return false for contentedi
+ return nullptr;
+
+ HTMLFormControlElement* formControlElement = toHTMLFormControlElement(element);
+ Node* parentFormNode = reinterpret_cast<Node*>(formControlElement->formOwner());
tkent 2015/04/14 23:27:19 |parentFormNode| is not a good name because it's n
AKV 2015/04/16 19:05:19 Done.
+ if (!parentFormNode)
+ return nullptr;
+
+ Node* nextNode = element;
+ while ((nextNode = page()->focusController().findFocusableNode(focusType, *nextNode))) {
+ if (!nextNode->isDescendantOf(parentFormNode))
tkent 2015/04/14 23:27:19 This doesn't work for the following case. <form i
kochi 2015/04/15 01:09:18 Hmm, I was not aware of this way of declaring form
AKV 2015/04/16 19:05:19 Thanks. I have taken care this case by checking fo
AKV 2015/04/16 19:05:19 Thanks. I have taken care this case by checking fo
+ return nullptr;
+ LayoutObject* layout = nextNode->layoutObject();
+ if (nextNode->isContentEditable() || (layout && layout->isTextControl())) {
+ // TODO(AKV) Extend it for Select element, Radio button and Check boxes
+ if (nextNode->isElementNode())
tkent 2015/04/14 23:27:19 No need to check isElementNode. Only elements are
AKV 2015/04/16 19:05:19 Done.
+ return toElement(nextNode);
+ }
+ }
+ return nullptr;
+}
+
+bool WebViewImpl::wantEnterEvents(Element* element)
tkent 2015/04/14 23:27:19 The argument should be |const Element&|. The func
AKV 2015/04/16 19:05:19 I wanted to check whether the element has any list
tkent 2015/04/17 04:12:35 No way to check only Enter key. BTW, If we don't
+{
+ if (!element->isFormControlElement())
+ return false;
+
+ return (element->hasEventListeners(EventTypeNames::keydown) || element->hasEventListeners(EventTypeNames::keypress) || element->hasEventListeners(EventTypeNames::keystatuseschange) || element->hasEventListeners(EventTypeNames::keyup));
tkent 2015/04/14 23:27:19 Why do you check keystatuschange event, which is f
AKV 2015/04/16 19:05:19 Right. this is not required.
+}
+
+void WebViewImpl::advanceFocusToNextInputField(WebFocusType focusType)
+{
+ Element* element = focusedElement();
+ if (!element)
+ return;
+
+ Element* nextElement = haveNextInput(element, focusType);
+ if (!nextElement)
+ return;
+
+ nextElement->scrollIntoViewIfNeeded(true /*centerIfNeeded*/);
+ nextElement->dispatchSimulatedClick(0, SendMouseUpDownEvents);
tkent 2015/04/14 23:27:19 0 -> nullptr. Why do you need to dispatch a click
AKV 2015/04/16 19:05:19 Not required. Thanks.
+ nextElement->focus(false, focusType);
tkent 2015/04/14 23:27:19 The click event handler can delete |nextElement|.
AKV 2015/04/16 19:05:19 Thanks. I corrected it.
+}
+
WebString WebViewImpl::inputModeOfFocusedElement()
{
if (!RuntimeEnabledFeatures::inputModeAttributeEnabled())
« no previous file with comments | « Source/web/WebViewImpl.h ('k') | public/web/WebTextInputType.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698