Imported QtWebKit TP3 (git b57bc6801f1876c3220d5a4bfea33d620d477443)

Change-Id: I3b1d8a2808782c9f34d50240000e20cb38d3680f
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>

1 files changed, 9 insertions, 4 deletions

diff --git a/Tools/TestWebKitAPI/Tests/WebKit2ObjC/PreventImageLoadWithAutoResizing_Bundle.cpp b/Tools/TestWebKitAPI/Tests/WebKit2ObjC/PreventImageLoadWithAutoResizing_Bundle.cpp
index 9f73d7541..dde94407a 100644
--- a/Tools/TestWebKitAPI/Tests/WebKit2ObjC/PreventImageLoadWithAutoResizing_Bundle.cpp
+++ b/Tools/TestWebKitAPI/Tests/WebKit2ObjC/PreventImageLoadWithAutoResizing_Bundle.cpp
@@ -24,11 +24,14 @@
  */
 
 #include "config.h"
+
+#if WK_HAVE_C_SPI
+
 #include "InjectedBundleTest.h"
 #include "PlatformUtilities.h"
 #include "Test.h"
 
-#include <WebKit2/WKBundlePage.h>
+#include <WebKit/WKBundlePage.h>
 
 #include <wtf/Assertions.h>
 
@@ -48,13 +51,13 @@ public:
 
     virtual void didCreatePage(WKBundleRef bundle, WKBundlePageRef page)
     {
-        WKBundlePageResourceLoadClient resourceLoadClient;
+        WKBundlePageResourceLoadClientV0 resourceLoadClient;
         memset(&resourceLoadClient, 0, sizeof(resourceLoadClient));
         
-        resourceLoadClient.version = 0;
+        resourceLoadClient.base.version = 0;
         resourceLoadClient.willSendRequestForFrame = willSendRequestForFrame;
 
-        WKBundlePageSetResourceLoadClient(page, &resourceLoadClient);
+        WKBundlePageSetResourceLoadClient(page, &resourceLoadClient.base);
 
     }
 };
@@ -62,3 +65,5 @@ public:
 static InjectedBundleTest::Register<DenyWillSendRequestTest> registrar("DenyWillSendRequestTest");
 
 } // namespace TestWebKitAPI
+
+#endif