From 6882a04fb36642862b11efe514251d32070c3d65 Mon Sep 17 00:00:00 2001
From: Konstantin Tokarev <annulen@yandex.ru>
Date: Thu, 25 Aug 2016 19:20:41 +0300
Subject: Imported QtWebKit TP3 (git b57bc6801f1876c3220d5a4bfea33d620d477443)

Change-Id: I3b1d8a2808782c9f34d50240000e20cb38d3680f
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
---
 .../Tests/WebKit2/DocumentStartUserScriptAlertCrash.cpp  | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

(limited to 'Tools/TestWebKitAPI/Tests/WebKit2/DocumentStartUserScriptAlertCrash.cpp')

diff --git a/Tools/TestWebKitAPI/Tests/WebKit2/DocumentStartUserScriptAlertCrash.cpp b/Tools/TestWebKitAPI/Tests/WebKit2/DocumentStartUserScriptAlertCrash.cpp
index 7559da28d..21bca74dd 100644
--- a/Tools/TestWebKitAPI/Tests/WebKit2/DocumentStartUserScriptAlertCrash.cpp
+++ b/Tools/TestWebKitAPI/Tests/WebKit2/DocumentStartUserScriptAlertCrash.cpp
@@ -24,10 +24,13 @@
  */
 
 #include "config.h"
+
+#if WK_HAVE_C_SPI
+
 #include "PlatformUtilities.h"
 #include "PlatformWebView.h"
 #include "Test.h"
-#include <WebKit2/WKRetainPtr.h>
+#include <WebKit/WKRetainPtr.h>
 
 namespace TestWebKitAPI {
 
@@ -50,12 +53,13 @@ TEST(WebKit2, DocumentStartUserScriptAlertCrashTest)
     WKRetainPtr<WKContextRef> context(AdoptWK, Util::createContextForInjectedBundleTest("DocumentStartUserScriptAlertCrashTest", pageGroup.get()));
     PlatformWebView webView(context.get(), pageGroup.get());
 
-    WKPageUIClient uiClient;
+    WKPageUIClientV0 uiClient;
     memset(&uiClient, 0, sizeof(uiClient));
-    uiClient.version = 0;
-    uiClient.clientInfo = 0;
+
+    uiClient.base.version = 0;
     uiClient.runJavaScriptAlert = runJavaScriptAlert;
-    WKPageSetPageUIClient(webView.page(), &uiClient);
+
+    WKPageSetPageUIClient(webView.page(), &uiClient.base);
 
     WKRetainPtr<WKURLRef> url(AdoptWK, Util::createURLForResource("simple", "html"));
     WKPageLoadURL(webView.page(), url.get());
@@ -64,3 +68,5 @@ TEST(WebKit2, DocumentStartUserScriptAlertCrashTest)
 }
 
 } // namespace TestWebKitAPI
+
+#endif
-- 
cgit v1.2.1