diff options
author | Lorry Tar Creator <lorry-tar-importer@lorry> | 2015-05-20 09:56:07 +0000 |
---|---|---|
committer | Lorry Tar Creator <lorry-tar-importer@lorry> | 2015-05-20 09:56:07 +0000 |
commit | 41386e9cb918eed93b3f13648cbef387e371e451 (patch) | |
tree | a97f9d7bd1d9d091833286085f72da9d83fd0606 /Tools/TestWebKitAPI/Tests/WebKit2/UserMessage.cpp | |
parent | e15dd966d523731101f70ccf768bba12435a0208 (diff) | |
download | WebKitGtk-tarball-41386e9cb918eed93b3f13648cbef387e371e451.tar.gz |
webkitgtk-2.4.9webkitgtk-2.4.9
Diffstat (limited to 'Tools/TestWebKitAPI/Tests/WebKit2/UserMessage.cpp')
-rw-r--r-- | Tools/TestWebKitAPI/Tests/WebKit2/UserMessage.cpp | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/Tools/TestWebKitAPI/Tests/WebKit2/UserMessage.cpp b/Tools/TestWebKitAPI/Tests/WebKit2/UserMessage.cpp index 064cbb838..2585a06ff 100644 --- a/Tools/TestWebKitAPI/Tests/WebKit2/UserMessage.cpp +++ b/Tools/TestWebKitAPI/Tests/WebKit2/UserMessage.cpp @@ -24,13 +24,12 @@ */ #include "config.h" - -#if WK_HAVE_C_SPI - #include "Test.h" #include "PlatformUtilities.h" #include "PlatformWebView.h" +#include <wtf/OwnPtr.h> +#include <wtf/PassOwnPtr.h> namespace TestWebKitAPI { @@ -43,7 +42,7 @@ public: } WKRetainPtr<WKContextRef> context; - std::unique_ptr<PlatformWebView> webView; + OwnPtr<PlatformWebView> webView; WKRetainPtr<WKTypeRef> recievedBody; @@ -81,7 +80,7 @@ public: WKPageLoaderClientV3 loaderClient; memset(&loaderClient, 0, sizeof(loaderClient)); - loaderClient.base.version = 3; + loaderClient.base.version = kWKPageLoaderClientCurrentVersion; loaderClient.base.clientInfo = clientInfo; loaderClient.didFinishLoadForFrame = didFinishLoadForFrame; @@ -93,7 +92,7 @@ public: context = adoptWK(Util::createContextForInjectedBundleTest("UserMessageTest")); setInjectedBundleClient(context.get(), this); - webView = std::make_unique<PlatformWebView>(context.get()); + webView = adoptPtr(new PlatformWebView(context.get())); setPageLoaderClient(webView->page(), this); didFinishLoad = false; @@ -158,5 +157,3 @@ TEST_F(WebKit2UserMessageRoundTripTest, WKString) } } // namespace TestWebKitAPI - -#endif |