From 41386e9cb918eed93b3f13648cbef387e371e451 Mon Sep 17 00:00:00 2001
From: Lorry Tar Creator <lorry-tar-importer@lorry>
Date: Wed, 20 May 2015 09:56:07 +0000
Subject: webkitgtk-2.4.9

---
 Tools/WebKitTestRunner/WebNotificationProvider.cpp | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

(limited to 'Tools/WebKitTestRunner/WebNotificationProvider.cpp')

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
-- 
cgit v1.2.1