Merge webkit.org at r58033 : Initial merge by git

Change-Id: If006c38561af287c50cd578d251629b51e4d8cd1

10 files changed, 23 insertions, 9 deletions

diff --git a/WebCore/wml/WMLAElement.cpp b/WebCore/wml/WMLAElement.cpp
index 8bd6fad..55b2698 100644
--- a/WebCore/wml/WMLAElement.cpp
+++ b/WebCore/wml/WMLAElement.cpp
@@ -29,7 +29,6 @@
 #if ENABLE(WML)
 #include "WMLAElement.h"
 
-#include "DNS.h"
 #include "Event.h"
 #include "EventHandler.h"
 #include "EventNames.h"
@@ -40,6 +39,7 @@
 #include "MappedAttribute.h"
 #include "MouseEvent.h"
 #include "RenderBox.h"
+#include "ResourceHandle.h"
 #include "WMLNames.h"
 
 namespace WebCore {
@@ -61,7 +61,7 @@ void WMLAElement::parseMappedAttribute(MappedAttribute* attr)
         if (isLink() && document()->isDNSPrefetchEnabled()) {
             String value = attr->value();
             if (protocolIs(value, "http") || protocolIs(value, "https") || value.startsWith("//"))
-                prefetchDNS(document()->completeURL(value).host());
+                ResourceHandle::prepareForURL(document()->completeURL(value));
         }
     } else if (attr->name() == HTMLNames::nameAttr
                || attr->name() == HTMLNames::titleAttr
diff --git a/WebCore/wml/WMLErrorHandling.cpp b/WebCore/wml/WMLErrorHandling.cpp
index d62ccb7..6184772 100644
--- a/WebCore/wml/WMLErrorHandling.cpp
+++ b/WebCore/wml/WMLErrorHandling.cpp
@@ -24,11 +24,11 @@
 #include "WMLErrorHandling.h"
 
 #include "Console.h"
-#include "CString.h"
 #include "Frame.h"
 #include "Document.h"
 #include "DOMWindow.h"
 #include "XMLTokenizer.h"
+#include <wtf/text/CString.h>
 
 namespace WebCore {
 
diff --git a/WebCore/wml/WMLGoElement.cpp b/WebCore/wml/WMLGoElement.cpp
index 8076207..4378f34 100644
--- a/WebCore/wml/WMLGoElement.cpp
+++ b/WebCore/wml/WMLGoElement.cpp
@@ -23,7 +23,6 @@
 #if ENABLE(WML)
 #include "WMLGoElement.h"
 
-#include "CString.h"
 #include "FormData.h"
 #include "Frame.h"
 #include "FrameLoader.h"
@@ -38,6 +37,7 @@
 #include "WMLPostfieldElement.h"
 #include "WMLTimerElement.h"
 #include "WMLVariables.h"
+#include <wtf/text/CString.h>
 
 namespace WebCore {
 
diff --git a/WebCore/wml/WMLOptionElement.cpp b/WebCore/wml/WMLOptionElement.cpp
index 61fa762..ac41a06 100644
--- a/WebCore/wml/WMLOptionElement.cpp
+++ b/WebCore/wml/WMLOptionElement.cpp
@@ -170,6 +170,12 @@ void WMLOptionElement::handleIntrinsicEventIfNeeded()
         eventHandler->triggerIntrinsicEvent(WMLIntrinsicEventOnPick);
 }
 
+bool WMLOptionElement::disabled() const
+{
+    /* Dummy implementation, as disabled() is pure virtual in OptionElement class */
+    return false;
+}
+
 }
 
 #endif
diff --git a/WebCore/wml/WMLOptionElement.h b/WebCore/wml/WMLOptionElement.h
index c34f319..6283070 100644
--- a/WebCore/wml/WMLOptionElement.h
+++ b/WebCore/wml/WMLOptionElement.h
@@ -54,6 +54,8 @@ public:
     virtual String textIndentedToRespectGroupLabel() const;
     virtual String value() const;
 
+    virtual bool disabled() const;
+
 private:
     virtual RenderStyle* nonRendererRenderStyle() const;
     void handleIntrinsicEventIfNeeded();
diff --git a/WebCore/wml/WMLPageState.cpp b/WebCore/wml/WMLPageState.cpp
index 4cf3e34..d03cf44 100644
--- a/WebCore/wml/WMLPageState.cpp
+++ b/WebCore/wml/WMLPageState.cpp
@@ -25,12 +25,12 @@
 #include "WMLPageState.h"
 
 #include "BackForwardList.h"
-#include "CString.h"
 #include "Document.h"
 #include "Frame.h"
 #include "HistoryItem.h"
 #include "KURL.h"
 #include "Page.h"
+#include <wtf/text/CString.h>
 
 namespace WebCore {
 
diff --git a/WebCore/wml/WMLPostfieldElement.cpp b/WebCore/wml/WMLPostfieldElement.cpp
index 21f4c5b..5cf26c7 100644
--- a/WebCore/wml/WMLPostfieldElement.cpp
+++ b/WebCore/wml/WMLPostfieldElement.cpp
@@ -23,12 +23,12 @@
 #if ENABLE(WML)
 #include "WMLPostfieldElement.h"
 
-#include "CString.h"
 #include "TextEncoding.h"
 #include "HTMLNames.h"
 #include "WMLDocument.h"
 #include "WMLGoElement.h"
 #include "WMLNames.h"
+#include <wtf/text/CString.h>
 
 namespace WebCore {
 
diff --git a/WebCore/wml/WMLSelectElement.cpp b/WebCore/wml/WMLSelectElement.cpp
index e6041f4..bc86d12 100644
--- a/WebCore/wml/WMLSelectElement.cpp
+++ b/WebCore/wml/WMLSelectElement.cpp
@@ -22,7 +22,6 @@
 
 #if ENABLE(WML)
 #include "WMLSelectElement.h"
-#include "CString.h"
 #include "HTMLNames.h"
 #include "MappedAttribute.h"
 #include "OptionElement.h"
@@ -32,6 +31,7 @@
 #include "WMLNames.h"
 #include "WMLVariables.h"
 #include <wtf/StdLibExtras.h>
+#include <wtf/text/CString.h>
 
 namespace WebCore {
 
@@ -545,6 +545,11 @@ String WMLSelectElement::ivalue() const
     return parseValueSubstitutingVariableReferences(getAttribute(ivalueAttr));
 }
 
+void WMLSelectElement::listBoxSelectItem(int listIndex, bool allowMultiplySelections, bool shift, bool fireOnChangeNow)
+{
+    /* Dummy implementation as listBoxSelectItem is pure virtual in SelectElement class */
+}
+
 }
 
 #endif
diff --git a/WebCore/wml/WMLSelectElement.h b/WebCore/wml/WMLSelectElement.h
index 5ab7da6..3ec7fd2 100644
--- a/WebCore/wml/WMLSelectElement.h
+++ b/WebCore/wml/WMLSelectElement.h
@@ -86,7 +86,8 @@ public:
     void selectInitialOptions();
 
     bool initialized() const { return m_initialized; }
-
+    
+    virtual void listBoxSelectItem(int listIndex, bool allowMultiplySelections, bool shift, bool fireOnChangeNow = true);
 private:
     virtual void insertedIntoTree(bool);
 
diff --git a/WebCore/wml/WMLVariables.cpp b/WebCore/wml/WMLVariables.cpp
index f48aa1c..f7be400 100644
--- a/WebCore/wml/WMLVariables.cpp
+++ b/WebCore/wml/WMLVariables.cpp
@@ -251,7 +251,7 @@ String substituteVariableReferences(const String& reference, Document* document,
         if (!conversionMode.isEmpty()) {
             // Override default escape mode, if desired
             WMLVariableEscapingMode specifiedEscapeMode = WMLVariableEscapingNone; 
-            if (isValid = isValidVariableEscapingModeString(conversionMode, specifiedEscapeMode))
+            if ((isValid = isValidVariableEscapingModeString(conversionMode, specifiedEscapeMode)))
                 escapeMode = specifiedEscapeMode;
 
             if (!isValid)