Changeset 56637 in webkit

Timestamp:

Mar 26, 2010 12:40:40 PM (14 years ago)

Author:

jhawkins@chromium.org

Message:

2010-03-24 James Hawkins <​jhawkins@chromium.org>

Reviewed by Darin Fisher.

[Chromium] Implement WebFormControlElement and WebSelectElement. Add
a getFormControlElements method to WebFormElement.

​https://bugs.webkit.org/show_bug.cgi?id=36562

• WebKit.gyp:
• public/WebElement.h:
• public/WebFormControlElement.h: Added.
• public/WebFormElement.h:
• public/WebInputElement.h: (WebKit::WebInputElement::WebInputElement): (WebKit::WebInputElement::operator=): (WebKit::WebInputElement::assign):
• public/WebSelectElement.h: Added.
• src/WebElement.cpp: (WebKit::WebElement::isFormControlElement):
• src/WebFormControlElement.cpp: Added.
• src/WebFormElement.cpp: (WebKit::WebFormElement::getFormControlElements):
• src/WebInputElement.cpp: (WebKit::WebInputElement::WebInputElement):
• src/WebSelectElement.cpp: Added.

Location:

trunk/WebKit/chromium

Files:

• ChangeLog (modified) (1 diff)
• WebKit.gyp (modified) (4 diffs)
• public/WebElement.h (modified) (1 diff)
• public/WebFormControlElement.h (added)
• public/WebFormElement.h (modified) (3 diffs)
• public/WebInputElement.h (modified) (4 diffs)
• public/WebSelectElement.h (added)
• src/WebElement.cpp (modified) (1 diff)
• src/WebFormControlElement.cpp (added)
• src/WebFormElement.cpp (modified) (2 diffs)
• src/WebInputElement.cpp (modified) (2 diffs)
• src/WebSelectElement.cpp (added)

trunk/WebKit/chromium/ChangeLog

@@ +1 @@
+2010-03-24  James Hawkins  <jhawkins@chromium.org>
+
+        Reviewed by Darin Fisher.
+
+        [Chromium] Implement WebFormControlElement and WebSelectElement.  Add
+        a getFormControlElements method to WebFormElement.
+
+        https://bugs.webkit.org/show_bug.cgi?id=36562
+
+        * WebKit.gyp:
+        * public/WebElement.h:
+        * public/WebFormControlElement.h: Added.
+        * public/WebFormElement.h:
+        * public/WebInputElement.h:
+        (WebKit::WebInputElement::WebInputElement):
+        (WebKit::WebInputElement::operator=):
+        (WebKit::WebInputElement::assign):
+        * public/WebSelectElement.h: Added.
+        * src/WebElement.cpp:
+        (WebKit::WebElement::isFormControlElement):
+        * src/WebFormControlElement.cpp: Added.
+        * src/WebFormElement.cpp:
+        (WebKit::WebFormElement::getFormControlElements):
+        * src/WebInputElement.cpp:
+        (WebKit::WebInputElement::WebInputElement):
+        * src/WebSelectElement.cpp: Added.
+
 2010-03-26  Andrey Kosyakov  <caseq@chromium.org>
 

trunk/WebKit/chromium/WebKit.gyp

@@ -121 +121 @@
                 'public/WebFrameClient.h',
                 'public/WebFontCache.h',
+                'public/WebFormControlElement.h',
                 'public/WebFormElement.h',
                 'public/WebGlyphCache.h',
@@ -173 +174 @@
                 'public/WebSecurityOrigin.h',
                 'public/WebSecurityPolicy.h',
+                'public/WebSelectElement.h',
                 'public/WebSerializedScriptValue.h',
                 'public/WebSettings.h',
@@ -312 +314 @@
                 'src/WebFileChooserCompletionImpl.h',
                 'src/WebFontCache.cpp',
+                'src/WebFormControlElement.cpp',
                 'src/WebFormElement.cpp',
                 'src/WebFrameImpl.cpp',
@@ -359 +362 @@
                 'src/WebSecurityOrigin.cpp',
                 'src/WebSecurityPolicy.cpp',
+                'src/WebSelectElement.cpp',
                 'src/WebSerializedScriptValue.cpp',
                 'src/WebSettingsImpl.cpp',

trunk/WebKit/chromium/public/WebElement.h

@@ -48 +48 @@
         void assign(const WebElement& e) { WebNode::assign(e); }
 
+        WEBKIT_API bool isFormControlElement() const;
         WEBKIT_API WebString tagName() const;
         WEBKIT_API bool hasTagName(const WebString&) const;

trunk/WebKit/chromium/public/WebFormElement.h

@@ -32 +32 @@
 #define WebFormElement_h
 
-#include "WebInputElement.h"
+#include "WebElement.h"
 #include "WebVector.h"
 
@@ -40 +40 @@
 
 namespace WebKit {
+
+    class WebInputElement;
+    class WebFormControlElement;
+
     // A container for passing around a reference to a form element.  Provides
     // some information about the form.
@@ -63 +67 @@
         // FIXME: Deprecate and replace with WebVector<WebElement>.
         WEBKIT_API void getNamedElements(const WebString&, WebVector<WebNode>&);
+        // DEPRECATED: Replaced by getFormControlElements.
         WEBKIT_API void getInputElements(WebVector<WebInputElement>&) const;
+        WEBKIT_API void getFormControlElements(WebVector<WebFormControlElement>&) const;
 
 #if WEBKIT_IMPLEMENTATION

trunk/WebKit/chromium/public/WebInputElement.h

@@ -32 +32 @@
 #define WebInputElement_h
 
-#include "WebElement.h"
+#include "WebFormControlElement.h"
 
 #if WEBKIT_IMPLEMENTATION
@@ -41 +41 @@
 
     // Provides readonly access to some properties of a DOM input element node.
-    class WebInputElement : public WebElement {
+    class WebInputElement : public WebFormControlElement {
     public:
-        WebInputElement() : WebElement() { }
-        WebInputElement(const WebInputElement& n) : WebElement(n) { }
+        WebInputElement() : WebFormControlElement() { }
+        WebInputElement(const WebInputElement& e) : WebFormControlElement(e) { }
 
-        WebInputElement& operator=(const WebInputElement& n) { WebElement::assign(n); return *this; }
-        WEBKIT_API void assign(const WebInputElement& n) { WebElement::assign(n); }
+        WebInputElement& operator=(const WebInputElement& e)
+        {
+            WebFormControlElement::assign(e);
+            return *this;
+        }
+        WEBKIT_API void assign(const WebInputElement& e) { WebFormControlElement::assign(e); }
 
         enum InputType {
@@ -79 +83 @@
         WEBKIT_API bool isEnabledFormControl() const;
         WEBKIT_API InputType inputType() const;
-        WEBKIT_API WebString formControlType() const;
         WEBKIT_API bool isActivatedSubmit() const;
         WEBKIT_API void setActivatedSubmit(bool);
@@ -87 +90 @@
         WEBKIT_API void dispatchFormControlChangeEvent();
         WEBKIT_API void setSelectionRange(int, int);
+        // DEPRECATED: The following two methods have been moved to WebFormControlElement.
         WEBKIT_API WebString name() const;
         // Returns the name that should be used for the specified |element| when
-        // storing autofill data.  This is either the field name or its id, an empty
-        // string if it has no name and no id.
+        // storing AutoFill data.  This is either the field name or its id, an
+        // empty string if it has no name and no id.
         WEBKIT_API WebString nameForAutofill() const;
 

trunk/WebKit/chromium/src/WebElement.cpp

@@ -38 +38 @@
 
 namespace WebKit {
+
+bool WebElement::isFormControlElement() const
+{
+    return constUnwrap<Element>()->isFormControlElement();
+}
 
 WebString WebElement::tagName() const

trunk/WebKit/chromium/src/WebFormElement.cpp

@@ -36 +36 @@
 #include "HTMLInputElement.h"
 #include "HTMLNames.h"
+#include "WebFormControlElement.h"
+#include "WebInputElement.h"
 #include "WebString.h"
 #include "WebURL.h"
@@ -89 +91 @@
 }
 
+void WebFormElement::getFormControlElements(WebVector<WebFormControlElement>& result) const
+{
+    const HTMLFormElement* form = constUnwrap<HTMLFormElement>();
+    Vector<RefPtr<HTMLFormControlElement> > tempVector;
+    for (size_t i = 0; i < form->formElements.size(); i++) {
+        if (form->formElements[i]->hasLocalName(HTMLNames::inputTag)
+            || form->formElements[i]->hasLocalName(HTMLNames::selectTag))
+            tempVector.append(form->formElements[i]);
+    }
+    result.assign(tempVector);
+}
+
 WebFormElement::WebFormElement(const PassRefPtr<HTMLFormElement>& e)
     : WebElement(e)

trunk/WebKit/chromium/src/WebInputElement.cpp

@@ -56 +56 @@
 }
 
-WebString WebInputElement::formControlType() const
-{
-    return constUnwrap<HTMLInputElement>()->formControlType();
-}
-
 bool WebInputElement::isActivatedSubmit() const
 {
@@ -115 +110 @@
 
 WebInputElement::WebInputElement(const PassRefPtr<HTMLInputElement>& elem)
-    : WebElement(elem)
+    : WebFormControlElement(elem)
 {
 }