Merge Webkit at r58956: Initial merge by Git.

Change-Id: I1d9fb60ea2c3f2ddc04c17a871acdb39353be228

3 files changed, 6 insertions, 3 deletions

diff --git a/WebCore/wml/WMLAnchorElement.cpp b/WebCore/wml/WMLAnchorElement.cpp
index b9b3f53..ac9c8f2 100644
--- a/WebCore/wml/WMLAnchorElement.cpp
+++ b/WebCore/wml/WMLAnchorElement.cpp
@@ -34,10 +34,10 @@ WMLAnchorElement::WMLAnchorElement(const QualifiedName& tagName, Document* doc)
     : WMLAElement(tagName, doc)
     , m_task(0)
 {
-    // Calling setIsLink(true), and returning a non-null value on CSSStyleSelectors' linkAttribute
+    // Calling setIsLink(), and returning a non-null value on CSSStyleSelectors' linkAttribute
     // method, makes it possible to 'appear as link' (just like <a href="..">) without the need to
     // actually set the href value to an empty value in the DOM tree.
-    setIsLink(true);
+    setIsLink();
 }
 
 WMLAnchorElement::~WMLAnchorElement()
diff --git a/WebCore/wml/WMLElement.cpp b/WebCore/wml/WMLElement.cpp
index 3004aba..89fd07a 100644
--- a/WebCore/wml/WMLElement.cpp
+++ b/WebCore/wml/WMLElement.cpp
@@ -39,7 +39,7 @@ namespace WebCore {
 using namespace WMLNames;
 
 WMLElement::WMLElement(const QualifiedName& tagName, Document* document)
-    : StyledElement(tagName, document, CreateElementZeroRefCount)
+    : StyledElement(tagName, document, CreateStyledElementZeroRefCount)
 {
 }
 
diff --git a/WebCore/wml/WMLInputElement.h b/WebCore/wml/WMLInputElement.h
index eea633b..bd4e175 100644
--- a/WebCore/wml/WMLInputElement.h
+++ b/WebCore/wml/WMLInputElement.h
@@ -88,6 +88,9 @@ public:
 
     bool isConformedToInputMask(const String&);
     bool isConformedToInputMask(UChar, unsigned, bool isUserInput = true);
+#if ENABLE(WCSS)
+    virtual InputElementData data() const { return m_data; }
+#endif
 
 private:
     friend class WMLCardElement;