Imported WebKit commit 37c5e5041d39a14ea0d429a77ebd352e4bd26516 (http://svn.webkit.org/repository/webkit/trunk@128608)

New snapshot that enables WebKit2 build on Windows (still some bugs) and allows for WebKit to be built with qmake && make

4 files changed, 15 insertions, 9 deletions

diff --git a/Source/WebCore/testing/InternalSettings.cpp b/Source/WebCore/testing/InternalSettings.cpp
index 4022f875f..b95bbc36c 100755
--- a/Source/WebCore/testing/InternalSettings.cpp
+++ b/Source/WebCore/testing/InternalSettings.cpp
@@ -97,6 +97,8 @@ InternalSettings::Backup::Backup(Page* page, Settings* settings)
     , m_originalDialogElementEnabled(RuntimeEnabledFeatures::dialogElementEnabled())
 #endif
     , m_canStartMedia(page->canStartMedia())
+    , m_originalMockScrollbarsEnabled(settings->mockScrollbarsEnabled())
+    , m_langAttributeAwareFormControlUIEnabled(RuntimeEnabledFeatures::langAttributeAwareFormControlUIEnabled())
 {
 }
 
@@ -129,6 +131,8 @@ void InternalSettings::Backup::restoreTo(Page* page, Settings* settings)
     RuntimeEnabledFeatures::setDialogElementEnabled(m_originalDialogElementEnabled);
 #endif
     page->setCanStartMedia(m_canStartMedia);
+    settings->setMockScrollbarsEnabled(m_originalMockScrollbarsEnabled);
+    RuntimeEnabledFeatures::setLangAttributeAwareFormControlUIEnabled(m_langAttributeAwareFormControlUIEnabled);
 }
 
 InternalSettings* InternalSettings::from(Page* page)
@@ -642,4 +646,9 @@ void InternalSettings::setStorageBlockingPolicy(const String& mode, ExceptionCod
         ec = SYNTAX_ERR;
 }
 
+void InternalSettings::setLangAttributeAwareFormControlUIEnabled(bool enabled)
+{
+    RuntimeEnabledFeatures::setLangAttributeAwareFormControlUIEnabled(enabled);
+}
+
 }
diff --git a/Source/WebCore/testing/InternalSettings.h b/Source/WebCore/testing/InternalSettings.h
index 83ab9b2d4..f5aad8edc 100755
--- a/Source/WebCore/testing/InternalSettings.h
+++ b/Source/WebCore/testing/InternalSettings.h
@@ -79,6 +79,8 @@ public:
         bool m_originalDialogElementEnabled;
 #endif
         bool m_canStartMedia;
+        bool m_originalMockScrollbarsEnabled;
+        bool m_langAttributeAwareFormControlUIEnabled;
     };
 
     typedef RefCountedSupplement<Page, InternalSettings> SuperType;
@@ -142,6 +144,7 @@ public:
     String configurationForViewport(float devicePixelRatio, int deviceWidth, int deviceHeight, int availableWidth, int availableHeight, ExceptionCode&);
     void setMemoryInfoEnabled(bool, ExceptionCode&);
     void setStorageBlockingPolicy(const String&, ExceptionCode&);
+    void setLangAttributeAwareFormControlUIEnabled(bool);
 private:
     explicit InternalSettings(Page*);
     virtual void hostDestroyed() OVERRIDE { m_page = 0; }
diff --git a/Source/WebCore/testing/InternalSettings.idl b/Source/WebCore/testing/InternalSettings.idl
index 517baa633..8f97f89ff 100755
--- a/Source/WebCore/testing/InternalSettings.idl
+++ b/Source/WebCore/testing/InternalSettings.idl
@@ -68,6 +68,7 @@ module window {
         void setJavaScriptProfilingEnabled(in boolean creates) raises(DOMException);
         void setWindowFocusRestricted(in boolean restricted) raises(DOMException);
         void setDialogElementEnabled(in boolean enabled) raises(DOMException);
+        void setLangAttributeAwareFormControlUIEnabled(in boolean enabled);
 
         void setPagination(in DOMString mode, in long gap, in [Optional] long pageLength) raises(DOMException);
         sequence<String> userPreferredLanguages();
diff --git a/Source/WebCore/testing/Internals.cpp b/Source/WebCore/testing/Internals.cpp
index 04cfecd0d..369481422 100644
--- a/Source/WebCore/testing/Internals.cpp
+++ b/Source/WebCore/testing/Internals.cpp
@@ -972,15 +972,8 @@ PassRefPtr<NodeList> Internals::nodesFromRect(Document* document, int x, int y,
         ec = INVALID_ACCESS_ERR;
         return 0;
     }
-    HitTestRequest::HitTestRequestType hitType = HitTestRequest::ReadOnly | HitTestRequest::Active;
-    if (ignoreClipping)
-        hitType |= HitTestRequest::IgnoreClipping;
-    if (allowShadowContent)
-        hitType |= HitTestRequest::AllowShadowContent;
-    if (allowChildFrameContent)
-        hitType |= HitTestRequest::AllowChildFrameContent;
-
-    return document->nodesFromRect(x, y, topPadding, rightPadding, bottomPadding, leftPadding, hitType);
+
+    return document->nodesFromRect(x, y, topPadding, rightPadding, bottomPadding, leftPadding, ignoreClipping, allowShadowContent, allowChildFrameContent);
 }
 
 void Internals::emitInspectorDidBeginFrame()