Import Qt5x2 branch of QtWebkit for Qt 5.2

Importing a new snapshot of webkit.

Change-Id: I2d01ad12cdc8af8cb015387641120a9d7ea5f10c
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>

1 files changed, 8 insertions, 36 deletions

diff --git a/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleFrame.cpp b/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleFrame.cpp
index 55c29279e..61b380803 100644
--- a/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleFrame.cpp
+++ b/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleFrame.cpp
@@ -33,7 +33,9 @@
 #include "WKData.h"
 #include "WebFrame.h"
 #include "WebSecurityOrigin.h"
+#include <WebCore/Document.h>
 #include <WebCore/Frame.h>
+#include <WebCore/FrameLoader.h>
 #include <WebCore/FrameView.h>
 
 using namespace WebCore;
@@ -92,31 +94,6 @@ WKArrayRef WKBundleFrameCopyChildFrames(WKBundleFrameRef frameRef)
     return toAPI(toImpl(frameRef)->childFrames().leakRef());    
 }
 
-unsigned WKBundleFrameGetNumberOfActiveAnimations(WKBundleFrameRef frameRef)
-{
-    return toImpl(frameRef)->numberOfActiveAnimations();
-}
-
-bool WKBundleFramePauseAnimationOnElementWithId(WKBundleFrameRef frameRef, WKStringRef animationName, WKStringRef elementID, double time)
-{
-    return toImpl(frameRef)->pauseAnimationOnElementWithId(toWTFString(animationName), toWTFString(elementID), time);
-}
-
-bool WKBundleFramePauseTransitionOnElementWithId(WKBundleFrameRef frameRef, WKStringRef propertyName, WKStringRef elementID, double time)
-{
-    return toImpl(frameRef)->pauseTransitionOnElementWithId(toWTFString(propertyName), toWTFString(elementID), time);
-}
-
-void WKBundleFrameSuspendAnimations(WKBundleFrameRef frameRef)
-{
-    toImpl(frameRef)->suspendAnimations();
-}
-
-void WKBundleFrameResumeAnimations(WKBundleFrameRef frameRef)
-{
-    toImpl(frameRef)->resumeAnimations();
-}
-
 JSGlobalContextRef WKBundleFrameGetJavaScriptContext(WKBundleFrameRef frameRef)
 {
     return toImpl(frameRef)->jsContext();
@@ -147,21 +124,11 @@ WKStringRef WKBundleFrameCopyName(WKBundleFrameRef frameRef)
     return toCopiedAPI(toImpl(frameRef)->name());
 }
 
-JSValueRef WKBundleFrameGetComputedStyleIncludingVisitedInfo(WKBundleFrameRef frameRef, JSObjectRef element)
-{
-    return toImpl(frameRef)->computedStyleIncludingVisitedInfo(element);
-}
-
 WKStringRef WKBundleFrameCopyCounterValue(WKBundleFrameRef frameRef, JSObjectRef element)
 {
     return toCopiedAPI(toImpl(frameRef)->counterValue(element));
 }
 
-WKStringRef WKBundleFrameCopyMarkerText(WKBundleFrameRef frameRef, JSObjectRef element)
-{
-    return toCopiedAPI(toImpl(frameRef)->markerText(element));
-}
-
 WKStringRef WKBundleFrameCopyInnerText(WKBundleFrameRef frameRef)
 {
     return toCopiedAPI(toImpl(frameRef)->innerText());
@@ -254,6 +221,11 @@ bool WKBundleFrameContainsAnyFormElements(WKBundleFrameRef frameRef)
     return toImpl(frameRef)->containsAnyFormElements();
 }
 
+bool WKBundleFrameContainsAnyFormControls(WKBundleFrameRef frameRef)
+{
+    return toImpl(frameRef)->containsAnyFormControls();
+}
+
 void WKBundleFrameSetTextDirection(WKBundleFrameRef frameRef, WKStringRef directionRef)
 {
     toImpl(frameRef)->setTextDirection(toWTFString(directionRef));
@@ -266,7 +238,7 @@ WKDataRef WKBundleFrameCopyWebArchive(WKBundleFrameRef frameRef)
 
 WKDataRef WKBundleFrameCopyWebArchiveFilteringSubframes(WKBundleFrameRef frameRef, WKBundleFrameFrameFilterCallback frameFilterCallback, void* context)
 {
-#if PLATFORM(MAC) || PLATFORM(WIN)
+#if PLATFORM(MAC)
     RetainPtr<CFDataRef> data = toImpl(frameRef)->webArchiveData(frameFilterCallback, context);
     if (data)
         return WKDataCreate(CFDataGetBytePtr(data.get()), CFDataGetLength(data.get()));