Merge WebKit at r67178 : Initial merge by git.

Change-Id: I57e01163b6866cb029cdadf405a0394a3918bc18

10 files changed, 19 insertions, 23 deletions

diff --git a/WebCore/wml/WMLDocument.h b/WebCore/wml/WMLDocument.h
index f2be938..3057d9b 100644
--- a/WebCore/wml/WMLDocument.h
+++ b/WebCore/wml/WMLDocument.h
@@ -34,7 +34,7 @@ class WMLDocument : public Document {
 public:
     static PassRefPtr<WMLDocument> create(Frame* frame, const KURL& url)
     {
-        return adoptRef(adoptRef(new WMLDocument(frame, url))));
+        return adoptRef(new WMLDocument(frame, url));
     }
 
     virtual ~WMLDocument();
diff --git a/WebCore/wml/WMLFormControlElement.h b/WebCore/wml/WMLFormControlElement.h
index 43f8dee..674303b 100644
--- a/WebCore/wml/WMLFormControlElement.h
+++ b/WebCore/wml/WMLFormControlElement.h
@@ -28,7 +28,9 @@ namespace WebCore {
 
 class WMLFormControlElement : public WMLElement {
 public:
-    WMLFormControlElement(const QualifiedName&, Document*);
+    static PassRefPtr<WMLFormControlElement> create(const QualifiedName&, Document*);
+
+
     virtual ~WMLFormControlElement();
 
     virtual bool isFormControlElement() const { return true; }
@@ -44,6 +46,9 @@ public:
     virtual void attach();
     virtual void recalcStyle(StyleChange);
 
+protected:
+    WMLFormControlElement(const QualifiedName&, Document*);
+
 private:
     bool m_valueMatchesRenderer;
 };
diff --git a/WebCore/wml/WMLImageElement.cpp b/WebCore/wml/WMLImageElement.cpp
index c4f6b06..5e15ccb 100644
--- a/WebCore/wml/WMLImageElement.cpp
+++ b/WebCore/wml/WMLImageElement.cpp
@@ -101,9 +101,10 @@ void WMLImageElement::attach()
 
     if (renderer() && renderer()->isImage() && m_imageLoader.haveFiredBeforeLoadEvent()) {
         RenderImage* imageObj = toRenderImage(renderer());
-        if (imageObj->hasImage())
+        RenderImageResource* renderImageResource = imageObj->imageResource();
+        if (renderImageResource->hasImage())
             return;
-        imageObj->setCachedImage(m_imageLoader.image());
+        renderImageResource->setCachedImage(m_imageLoader.image());
         
         // If we have no image at all because we have no src attribute, set
         // image height and width for the alt text instead.
diff --git a/WebCore/wml/WMLInputElement.h b/WebCore/wml/WMLInputElement.h
index 70d85e9..df7f497 100644
--- a/WebCore/wml/WMLInputElement.h
+++ b/WebCore/wml/WMLInputElement.h
@@ -82,6 +82,7 @@ public:
     virtual void defaultEventHandler(Event*);
     virtual void cacheSelection(int start, int end);
 
+    virtual bool isAcceptableValue(const String&) const { return true; }
     virtual String sanitizeValue(const String& proposedValue) const { return constrainValue(proposedValue); }
 
     virtual void documentDidBecomeActive();
diff --git a/WebCore/wml/WMLIntrinsicEvent.cpp b/WebCore/wml/WMLIntrinsicEvent.cpp
index ec5e987..bb631b9 100644
--- a/WebCore/wml/WMLIntrinsicEvent.cpp
+++ b/WebCore/wml/WMLIntrinsicEvent.cpp
@@ -43,11 +43,6 @@ WMLIntrinsicEvent::WMLIntrinsicEvent(Document* document, const String& targetURL
     m_taskElement->setAttribute(HTMLNames::hrefAttr, targetURL);
 }
 
-PassRefPtr<WMLIntrinsicEvent> WMLIntrinsicEvent::create(const QualifiedName& tagName, Document* document)
-{
-    return adoptRef(new WMLIntrinsicEvent(tagName, document));
-}
-
 WMLIntrinsicEvent::WMLIntrinsicEvent(WMLTaskElement* taskElement)
     : m_taskElement(taskElement)
 {
diff --git a/WebCore/wml/WMLIntrinsicEvent.h b/WebCore/wml/WMLIntrinsicEvent.h
index 2a98bee..9a974fb 100644
--- a/WebCore/wml/WMLIntrinsicEvent.h
+++ b/WebCore/wml/WMLIntrinsicEvent.h
@@ -22,12 +22,12 @@
 #define WMLIntrinsicEvent_h
 
 #if ENABLE(WML)
+#include "WMLTaskElement.h"
+
 #include <wtf/PassRefPtr.h>
 #include <wtf/RefCounted.h>
 #include <wtf/RefPtr.h>
 
-#include "WMLTaskElement.h"
-
 namespace WebCore {
 
 class Document;
diff --git a/WebCore/wml/WMLSelectElement.cpp b/WebCore/wml/WMLSelectElement.cpp
index 81c3a77..78749b3 100644
--- a/WebCore/wml/WMLSelectElement.cpp
+++ b/WebCore/wml/WMLSelectElement.cpp
@@ -114,8 +114,9 @@ void WMLSelectElement::setSelectedIndex(int optionIndex, bool deselect)
     SelectElement::setSelectedIndex(m_data, this, optionIndex, deselect, false, false);
 }
 
-void WMLSelectElement::setSelectedIndexByUser(int optionIndex, bool deselect, bool fireOnChangeNow)
+void WMLSelectElement::setSelectedIndexByUser(int optionIndex, bool deselect, bool fireOnChangeNow, bool allowMultipleSelection)
 {
+    UNUSED_PARAM(allowMultipleSelection);
     SelectElement::setSelectedIndex(m_data, this, optionIndex, deselect, fireOnChangeNow, true);
 }
 
diff --git a/WebCore/wml/WMLSelectElement.h b/WebCore/wml/WMLSelectElement.h
index 00b4649..16bb382 100644
--- a/WebCore/wml/WMLSelectElement.h
+++ b/WebCore/wml/WMLSelectElement.h
@@ -51,7 +51,7 @@ public:
 
     virtual int selectedIndex() const;
     virtual void setSelectedIndex(int index, bool deselect = true);
-    virtual void setSelectedIndexByUser(int index, bool deselect = true, bool fireOnChangeNow = false);
+    virtual void setSelectedIndexByUser(int index, bool deselect = true, bool fireOnChangeNow = false, bool allowMultipleSelection = false);
 
     virtual int size() const { return m_data.size(); }
     virtual bool multiple() const { return m_data.multiple(); }
diff --git a/WebCore/wml/WMLTaskElement.cpp b/WebCore/wml/WMLTaskElement.cpp
index 4ef3496..d49a03e 100644
--- a/WebCore/wml/WMLTaskElement.cpp
+++ b/WebCore/wml/WMLTaskElement.cpp
@@ -39,11 +39,6 @@ WMLTaskElement::WMLTaskElement(const QualifiedName& tagName, Document* doc)
 {
 }
 
-PassRefPtr<WMLTaskElement> WMLTaskElement::create(const QualifiedName& tagName, Document* document)
-{
-    return adoptRef(new WMLTaskElement(tagName, document));
-}
-
 WMLTaskElement::~WMLTaskElement()
 {
 }
diff --git a/WebCore/wml/WMLTaskElement.h b/WebCore/wml/WMLTaskElement.h
index b7c5376..91e2a32 100644
--- a/WebCore/wml/WMLTaskElement.h
+++ b/WebCore/wml/WMLTaskElement.h
@@ -33,11 +33,6 @@ class WMLSetvarElement;
 
 class WMLTaskElement : public WMLElement {
 public:
-    static PassRefPtr<WMLTaskElement> create(const QualifiedName& tagName, Document*);
-
-    WMLTaskElement(const QualifiedName& tagName, Document*);
-    virtual ~WMLTaskElement();
-
     virtual bool isWMLTaskElement() const { return true; }
 
     virtual void insertedIntoDocument();
@@ -48,6 +43,9 @@ public:
     void deregisterVariableSetter(WMLSetvarElement*);
 
 protected:
+    WMLTaskElement(const QualifiedName& tagName, Document*);
+    virtual ~WMLTaskElement();
+
     void storeVariableState(WMLPageState*);
 
 private: