From dcc8cf2e65d1aa555cce12431a16547e66b469ee Mon Sep 17 00:00:00 2001
From: Steve Block <steveblock@google.com>
Date: Tue, 27 Apr 2010 16:31:00 +0100
Subject: Merge webkit.org at r58033 : Initial merge by git

Change-Id: If006c38561af287c50cd578d251629b51e4d8cd1
---
 WebKit/chromium/public/WebFormElement.h | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

(limited to 'WebKit/chromium/public/WebFormElement.h')

diff --git a/WebKit/chromium/public/WebFormElement.h b/WebKit/chromium/public/WebFormElement.h
index b07bff9..8cb4e47 100644
--- a/WebKit/chromium/public/WebFormElement.h
+++ b/WebKit/chromium/public/WebFormElement.h
@@ -32,15 +32,17 @@
 #define WebFormElement_h
 
 #include "WebElement.h"
-#include "WebInputElement.h"
 #include "WebVector.h"
 
 #if WEBKIT_IMPLEMENTATION
 namespace WebCore { class HTMLFormElement; }
-namespace WTF { template <typename T> class PassRefPtr; }
 #endif
 
 namespace WebKit {
+
+    class WebInputElement;
+    class WebFormControlElement;
+
     // A container for passing around a reference to a form element.  Provides
     // some information about the form.
     class WebFormElement : public WebElement {
@@ -57,12 +59,6 @@ namespace WebKit {
         }
         WEBKIT_API void assign(const WebFormElement& e) { WebElement::assign(e); }
 
-#if WEBKIT_IMPLEMENTATION
-        WebFormElement(const WTF::PassRefPtr<WebCore::HTMLFormElement>&);
-        WebFormElement& operator=(const WTF::PassRefPtr<WebCore::HTMLFormElement>&);
-        operator WTF::PassRefPtr<WebCore::HTMLFormElement>() const;
-#endif
-
         WEBKIT_API bool autoComplete() const;
         WEBKIT_API WebString action() const;
         WEBKIT_API WebString name() const;
@@ -70,7 +66,15 @@ namespace WebKit {
         WEBKIT_API void submit();
         // 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
+        WebFormElement(const WTF::PassRefPtr<WebCore::HTMLFormElement>&);
+        WebFormElement& operator=(const WTF::PassRefPtr<WebCore::HTMLFormElement>&);
+        operator WTF::PassRefPtr<WebCore::HTMLFormElement>() const;
+#endif
     };
 
 } // namespace WebKit
-- 
cgit v1.1