Imported QtWebKit TP3 (git b57bc6801f1876c3220d5a4bfea33d620d477443)

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

1 files changed, 15 insertions, 11 deletions

diff --git a/Tools/TestWebKitAPI/Tests/WebKit2/PasteboardNotifications_Bundle.cpp b/Tools/TestWebKitAPI/Tests/WebKit2/PasteboardNotifications_Bundle.cpp
index d33b77b55..8c1404e7a 100644
--- a/Tools/TestWebKitAPI/Tests/WebKit2/PasteboardNotifications_Bundle.cpp
+++ b/Tools/TestWebKitAPI/Tests/WebKit2/PasteboardNotifications_Bundle.cpp
@@ -24,13 +24,16 @@
  */
 
 #include "config.h"
+
+#if WK_HAVE_C_SPI
+
 #include "InjectedBundleTest.h"
 
 #include "PlatformUtilities.h"
-#include <WebKit2/WKArray.h>
-#include <WebKit2/WKBundlePage.h>
-#include <WebKit2/WKBundleBackForwardListItem.h>
-#include <WebKit2/WKWebArchive.h>
+#include <WebKit/WKArray.h>
+#include <WebKit/WKBundlePage.h>
+#include <WebKit/WKBundleBackForwardListItem.h>
+#include <WebKit/WKWebArchive.h>
 
 namespace TestWebKitAPI {
 
@@ -46,7 +49,7 @@ static InjectedBundleTest::Register<PasteboardNotificationsTest> registrar("Past
 static void willWriteToPasteboard(WKBundlePageRef page, WKBundleRangeHandleRef range,  const void*)
 {
     if (!range)
-        WKBundlePostMessage(InjectedBundleController::shared().bundle(), Util::toWK("PasteboardNotificationTestDoneMessageName").get(), Util::toWK("willWritetoPasteboardFail").get());
+        WKBundlePostMessage(InjectedBundleController::singleton().bundle(), Util::toWK("PasteboardNotificationTestDoneMessageName").get(), Util::toWK("willWritetoPasteboardFail").get());
 }
 
 static void getPasteboardDataForRange(WKBundlePageRef, WKBundleRangeHandleRef range, WKArrayRef* pasteboardTypes, WKArrayRef* pasteboardData, const void*)
@@ -59,7 +62,7 @@ static void getPasteboardDataForRange(WKBundlePageRef, WKBundleRangeHandleRef ra
 
 static void didWriteToPasteboard(WKBundlePageRef, const void*)
 {
-    WKBundlePostMessage(InjectedBundleController::shared().bundle(), Util::toWK("PasteboardNotificationTestDoneMessageName").get(), Util::toWK("didWriteToPasteboard").get());
+    WKBundlePostMessage(InjectedBundleController::singleton().bundle(), Util::toWK("PasteboardNotificationTestDoneMessageName").get(), Util::toWK("didWriteToPasteboard").get());
 }
 
 PasteboardNotificationsTest::PasteboardNotificationsTest(const std::string& identifier)
@@ -69,17 +72,18 @@ PasteboardNotificationsTest::PasteboardNotificationsTest(const std::string& iden
 
 void PasteboardNotificationsTest::didCreatePage(WKBundleRef bundle, WKBundlePageRef page)
 {    
-    WKBundlePageEditorClient pageEditorClient;
-
+    WKBundlePageEditorClientV1 pageEditorClient;
     memset(&pageEditorClient, 0, sizeof(pageEditorClient));
 
-    pageEditorClient.version = 1;
-    pageEditorClient.clientInfo = this;
+    pageEditorClient.base.version = 1;
+    pageEditorClient.base.clientInfo = this;
     pageEditorClient.willWriteToPasteboard = willWriteToPasteboard;
     pageEditorClient.getPasteboardDataForRange = getPasteboardDataForRange;
     pageEditorClient.didWriteToPasteboard = didWriteToPasteboard;
 
-    WKBundlePageSetEditorClient(page, &pageEditorClient);
+    WKBundlePageSetEditorClient(page, &pageEditorClient.base);
 }
 
 } // namespace TestWebKitAPI
+
+#endif