summaryrefslogtreecommitdiff
path: root/Tools/WebKitTestRunner/WebNotificationProvider.cpp
diff options
context:
space:
mode:
authorLorry Tar Creator <lorry-tar-importer@lorry>2015-05-20 09:56:07 +0000
committerLorry Tar Creator <lorry-tar-importer@lorry>2015-05-20 09:56:07 +0000
commit41386e9cb918eed93b3f13648cbef387e371e451 (patch)
treea97f9d7bd1d9d091833286085f72da9d83fd0606 /Tools/WebKitTestRunner/WebNotificationProvider.cpp
parente15dd966d523731101f70ccf768bba12435a0208 (diff)
downloadWebKitGtk-tarball-41386e9cb918eed93b3f13648cbef387e371e451.tar.gz
webkitgtk-2.4.9webkitgtk-2.4.9
Diffstat (limited to 'Tools/WebKitTestRunner/WebNotificationProvider.cpp')
-rw-r--r--Tools/WebKitTestRunner/WebNotificationProvider.cpp13
1 files changed, 6 insertions, 7 deletions
diff --git a/Tools/WebKitTestRunner/WebNotificationProvider.cpp b/Tools/WebKitTestRunner/WebNotificationProvider.cpp
index a46aabc2a..55064249f 100644
--- a/Tools/WebKitTestRunner/WebNotificationProvider.cpp
+++ b/Tools/WebKitTestRunner/WebNotificationProvider.cpp
@@ -26,10 +26,10 @@
#include "config.h"
#include "WebNotificationProvider.h"
-#include <WebKit/WKMutableArray.h>
-#include <WebKit/WKNotification.h>
-#include <WebKit/WKNumber.h>
-#include <WebKit/WKSecurityOriginRef.h>
+#include <WebKit2/WKMutableArray.h>
+#include <WebKit2/WKNotification.h>
+#include <WebKit2/WKNumber.h>
+#include <WebKit2/WKSecurityOrigin.h>
#include <wtf/Assertions.h>
namespace WTR {
@@ -65,14 +65,13 @@ WebNotificationProvider::WebNotificationProvider()
WebNotificationProvider::~WebNotificationProvider()
{
- if (m_notificationManager)
- WKNotificationManagerSetProvider(m_notificationManager.get(), nullptr);
+ WKNotificationManagerSetProvider(m_notificationManager.get(), 0);
}
WKNotificationProviderV0 WebNotificationProvider::provider()
{
WKNotificationProviderV0 notificationProvider = {
- { 0, this },
+ { kWKNotificationProviderCurrentVersion, this },
WTR::showWebNotification,
WTR::closeWebNotification,
0, // didDestroyNotification