1 files changed, 28 insertions, 15 deletions
diff --git a/WebKit/chromium/src/WebElement.cpp b/WebKit/chromium/src/WebElement.cpp
index d0a0862..f45cba9 100644
--- a/WebKit/chromium/src/WebElement.cpp
+++ b/WebKit/chromium/src/WebElement.cpp
@@ -32,26 +32,19 @@
 #include "WebElement.h"
 
 #include "Element.h"
+#include "RenderBoxModelObject.h"
+#include "RenderObject.h"
 #include <wtf/PassRefPtr.h>
 
+#include "WebNamedNodeMap.h"
+
 using namespace WebCore;
 
 namespace WebKit {
 
-WebElement::WebElement(const WTF::PassRefPtr<WebCore::Element>& elem)
-    : WebNode(elem.releaseRef())
-{
-}
-
-WebElement& WebElement::operator=(const WTF::PassRefPtr<WebCore::Element>& elem)
+bool WebElement::isFormControlElement() const
 {
-    WebNode::assign(elem.releaseRef());
-    return *this;
-}
-
-WebElement::operator WTF::PassRefPtr<Element>() const
-{
-    return PassRefPtr<Element>(static_cast<Element*>(m_private));
+    return constUnwrap<Element>()->isFormControlElement();
 }
 
 WebString WebElement::tagName() const
@@ -62,7 +55,7 @@ WebString WebElement::tagName() const
 bool WebElement::hasTagName(const WebString& tagName) const
 {
     return equalIgnoringCase(constUnwrap<Element>()->tagName(),
-                             tagName.operator WebCore::String());
+                             tagName.operator String());
 }
 
 bool WebElement::hasAttribute(const WebString& attrName) const
@@ -82,10 +75,30 @@ bool WebElement::setAttribute(const WebString& attrName, const WebString& attrVa
     return !exceptionCode;
 }
 
+WebNamedNodeMap WebElement::attributes() const
+{
+    return WebNamedNodeMap(m_private->attributes());
+}
+
 WebString WebElement::innerText() const
 {
     return constUnwrap<Element>()->innerText();
 }
 
-} // namespace WebKit
+WebElement::WebElement(const PassRefPtr<Element>& elem)
+    : WebNode(elem)
+{
+}
 
+WebElement& WebElement::operator=(const PassRefPtr<Element>& elem)
+{
+    m_private = elem;
+    return *this;
+}
+
+WebElement::operator PassRefPtr<Element>() const
+{
+    return static_cast<Element*>(m_private.get());
+}
+
+} // namespace WebKit