Changeset 62893 in webkit

Timestamp:

Jul 8, 2010 10:25:47 PM (14 years ago)

Author:

jcivelli@chromium.org

Message:

2010-07-08 Jay Civelli <​jcivelli@chromium.org>

Reviewed by Darin Fisher.

[chromium] Exposing the EditorClient text field related methods
to the WebViewClient. Also adding some more accessors methods
to the WebNode and WebInputElement.
This is needed to move the password autocomplete out of the
Chromium WebKit API to the Chromium code.
​https://bugs.webkit.org/show_bug.cgi?id=41286

• public/WebInputElement.h:
• public/WebNode.h: (WebKit::operator!=): (WebKit::operator<):
• public/WebViewClient.h: (WebKit::WebViewClient::textFieldDidBeginEditing): (WebKit::WebViewClient::textFieldDidEndEditing): (WebKit::WebViewClient::textDidChangeInTextField): (WebKit::WebViewClient::textFieldHandlingKeyDown): (WebKit::WebViewClient::didAcceptAutocompleteSuggestion):
• src/EditorClientImpl.cpp: (WebKit::EditorClientImpl::textFieldDidBeginEditing): (WebKit::EditorClientImpl::textFieldDidEndEditing): (WebKit::EditorClientImpl::textDidChangeInTextField): (WebKit::EditorClientImpl::onAutocompleteSuggestionAccepted): (WebKit::EditorClientImpl::doTextFieldCommandFromEvent):
• src/WebInputElement.cpp: (WebKit::WebInputElement::readOnly): (WebKit::WebInputElement::setSelectionRange): (WebKit::WebInputElement::selectionStart): (WebKit::WebInputElement::selectionEnd):
• src/WebNode.cpp: (WebKit::WebNode::lessThan):

Location:

trunk/WebKit/chromium

Files:

• ChangeLog (modified) (1 diff)
• public/WebInputElement.h (modified) (2 diffs)
• public/WebNode.h (modified) (2 diffs)
• public/WebViewClient.h (modified) (3 diffs)
• src/EditorClientImpl.cpp (modified) (7 diffs)
• src/WebInputElement.cpp (modified) (2 diffs)
• src/WebNode.cpp (modified) (1 diff)

trunk/WebKit/chromium/ChangeLog

@@ +1 @@
+2010-07-08  Jay Civelli  <jcivelli@chromium.org>
+
+        Reviewed by Darin Fisher.
+
+        [chromium] Exposing the EditorClient text field related methods
+        to the WebViewClient. Also adding some more accessors methods
+        to the WebNode and WebInputElement.
+        This is needed to move the password autocomplete out of the
+        Chromium WebKit API to the Chromium code.
+        https://bugs.webkit.org/show_bug.cgi?id=41286
+
+        * public/WebInputElement.h:
+        * public/WebNode.h:
+        (WebKit::operator!=):
+        (WebKit::operator<):
+        * public/WebViewClient.h:
+        (WebKit::WebViewClient::textFieldDidBeginEditing):
+        (WebKit::WebViewClient::textFieldDidEndEditing):
+        (WebKit::WebViewClient::textDidChangeInTextField):
+        (WebKit::WebViewClient::textFieldHandlingKeyDown):
+        (WebKit::WebViewClient::didAcceptAutocompleteSuggestion):
+        * src/EditorClientImpl.cpp:
+        (WebKit::EditorClientImpl::textFieldDidBeginEditing):
+        (WebKit::EditorClientImpl::textFieldDidEndEditing):
+        (WebKit::EditorClientImpl::textDidChangeInTextField):
+        (WebKit::EditorClientImpl::onAutocompleteSuggestionAccepted):
+        (WebKit::EditorClientImpl::doTextFieldCommandFromEvent):
+        * src/WebInputElement.cpp:
+        (WebKit::WebInputElement::readOnly):
+        (WebKit::WebInputElement::setSelectionRange):
+        (WebKit::WebInputElement::selectionStart):
+        (WebKit::WebInputElement::selectionEnd):
+        * src/WebNode.cpp:
+        (WebKit::WebNode::lessThan):
+
 2010-07-08  Aaron Boodman  <aa@chromium.org>
 

trunk/WebKit/chromium/public/WebInputElement.h

@@ -81 +81 @@
 
         WEBKIT_API bool autoComplete() const;
+        WEBKIT_API bool isReadOnly() const;
         WEBKIT_API bool isEnabledFormControl() const;
         WEBKIT_API InputType inputType() const;
@@ -97 +98 @@
         WEBKIT_API void dispatchFormControlChangeEvent();
         WEBKIT_API void setSelectionRange(int, int);
+        WEBKIT_API int selectionStart();
+        WEBKIT_API int selectionEnd();
 
 #if WEBKIT_IMPLEMENTATION

trunk/WebKit/chromium/public/WebNode.h

@@ -62 +62 @@
 
     WEBKIT_API bool equals(const WebNode&) const;
-
+    // Required for using WebNodes in std maps.  Note the order used is
+    // arbitrary and should not be expected to have any specific meaning.
+    WEBKIT_API bool lessThan(const WebNode&) const;
+    
     bool isNull() const { return m_private.isNull(); }
 
@@ -151 +154 @@
 }
 
+inline bool operator<(const WebNode& a, const WebNode& b)
+{
+    return a.lessThan(b);
+}
+
 } // namespace WebKit
 

trunk/WebKit/chromium/public/WebViewClient.h

@@ -46 +46 @@
 class WebAccessibilityObject;
 class WebDragData;
+class WebElement;
 class WebFileChooserCompletion;
 class WebFrame;
 class WebGeolocationService;
 class WebImage;
+class WebInputElement;
+class WebKeyboardEvent;
 class WebNode;
 class WebNotificationPresenter;
@@ -133 +136 @@
     virtual void didEndEditing() { }
 
+    // These methods are called when the users edits a text-field.
+    virtual void textFieldDidBeginEditing(const WebInputElement&) { }
+    virtual void textFieldDidEndEditing(const WebInputElement&) { }
+    virtual void textFieldDidChange(const WebInputElement&) { }
+    virtual void textFieldDidReceiveKeyDown(const WebInputElement&, const WebKeyboardEvent&) { }
+
     // This method is called in response to WebView's handleInputEvent()
     // when the default action for the current keyboard event is not
@@ -313 +322 @@
     virtual void didClearAutoFillSelection(const WebNode&) { }
 
+    // Informs the browser that the user has selected an autocomplete (password
+    // or field) suggestion from the drop-down.  The input element text has
+    // already been set to the selected suggestion.
+    virtual void didAcceptAutocompleteSuggestion(const WebInputElement&) { }
+
     // Geolocation ---------------------------------------------------------
 

trunk/WebKit/chromium/src/EditorClientImpl.cpp

@@ -44 +44 @@
 #include "DOMUtilitiesPrivate.h"
 #include "WebEditingAction.h"
+#include "WebElement.h"
 #include "WebFrameImpl.h"
 #include "WebKit.h"
 #include "WebInputElement.h"
+#include "WebInputEventConversion.h"
 #include "WebNode.h"
 #include "WebPasswordAutocompleteListener.h"
@@ -91 +93 @@
     // it if in testing mode and the test specifically requests it by using this
     // magic class name.
-    return WebKit::layoutTestMode()
+    return layoutTestMode()
            && elem->getAttribute(HTMLNames::classAttr) == "needsDeletionUI";
 }
@@ -645 +647 @@
 }
 
-void EditorClientImpl::textFieldDidBeginEditing(Element*)
-{
+void EditorClientImpl::textFieldDidBeginEditing(Element* element)
+{
+    HTMLInputElement* inputElement = toHTMLInputElement(element);
+    if (m_webView->client() && inputElement)
+        m_webView->client()->textFieldDidBeginEditing(WebInputElement(inputElement));
 }
 
 void EditorClientImpl::textFieldDidEndEditing(Element* element)
 {
+    HTMLInputElement* inputElement = toHTMLInputElement(element);
+    if (m_webView->client() && inputElement)
+        m_webView->client()->textFieldDidEndEditing(WebInputElement(inputElement));
+
     // Notification that focus was lost.  Be careful with this, it's also sent
     // when the page is being closed.
@@ -665 +674 @@
 
     // Notify any password-listener of the focus change.
-    HTMLInputElement* inputElement = WebKit::toHTMLInputElement(element);
     if (!inputElement)
         return;
@@ -683 +691 @@
 {
     ASSERT(element->hasLocalName(HTMLNames::inputTag));
+    HTMLInputElement* inputElement = static_cast<HTMLInputElement*>(element);
+    if (m_webView->client())
+        m_webView->client()->textFieldDidChange(WebInputElement(inputElement));
+
     // Note that we only show the autofill popup in this case if the caret is at
     // the end.  This matches FireFox and Safari but not IE.
-    autofill(static_cast<HTMLInputElement*>(element), false, false,
-             true);
+    autofill(inputElement, false, false, true);
 }
 
 bool EditorClientImpl::showFormAutofillForNode(Node* node)
 {
-    HTMLInputElement* inputElement = WebKit::toHTMLInputElement(node);
+    HTMLInputElement* inputElement = toHTMLInputElement(node);
     if (inputElement)
         return autofill(inputElement, true, true, false);
@@ -793 +804 @@
 void EditorClientImpl::onAutocompleteSuggestionAccepted(HTMLInputElement* textField)
 {
+    if (m_webView->client())
+        m_webView->client()->didAcceptAutocompleteSuggestion(WebInputElement(textField));
+
     WebFrameImpl* webframe = WebFrameImpl::fromFrame(textField->document()->frame());
     if (!webframe)
@@ -803 +817 @@
                                                    KeyboardEvent* event)
 {
+    HTMLInputElement* inputElement = toHTMLInputElement(element);
+    if (m_webView->client() && inputElement) {
+        m_webView->client()->textFieldDidReceiveKeyDown(WebInputElement(inputElement),
+                                                        WebKeyboardEventBuilder(*event));
+    }
+
     // Remember if backspace was pressed for the autofill.  It is not clear how to
     // find if backspace was pressed from textFieldDidBeginEditing and

trunk/WebKit/chromium/src/WebInputElement.cpp

@@ -44 +44 @@
 {
     return constUnwrap<HTMLInputElement>()->autoComplete();
+}
+
+bool WebInputElement::isReadOnly() const
+{
+    return constUnwrap<HTMLInputElement>()->readOnly();
 }
 
@@ -126 +131 @@
 }
 
+int WebInputElement::selectionStart()
+{
+    return unwrap<HTMLInputElement>()->selectionStart();
+}
+
+int WebInputElement::selectionEnd()
+{
+    return unwrap<HTMLInputElement>()->selectionEnd();
+}
+
 WebInputElement::WebInputElement(const PassRefPtr<HTMLInputElement>& elem)
     : WebFormControlElement(elem)

trunk/WebKit/chromium/src/WebNode.cpp

@@ -68 +68 @@
 }
 
+bool WebNode::lessThan(const WebNode& n) const
+{
+    return (m_private.get() < n.m_private.get());
+}
+
 WebNode::NodeType WebNode::nodeType() const
 {