Changeset 160036 in webkit

Timestamp:

Dec 3, 2013 1:53:21 PM (10 years ago)

Author:

andersca@apple.com

Message:

Deprecate WKNotificationProvider
​https://bugs.webkit.org/show_bug.cgi?id=125178

Reviewed by Sam Weinig.

Source/WebKit2:

• Shared/API/c/WKDeclarationSpecifiers.h:

Add WK_DEPRECATED and WK_ENUM_DEPRECATED macros so we can things as deprecated.

• UIProcess/API/C/WKNotificationManager.cpp:

(WKNotificationManagerSetProvider):

• UIProcess/API/C/WKNotificationManager.h:

WKNotificationManagerSetProvider now takes a WKNotificationProviderBase.

• UIProcess/API/C/WKNotificationProvider.h:

Deprecate WKNotificationProvider and kWKNotificationProviderCurrentVersion.

Tools:

Update for WebKit2 changes.

• WebKitTestRunner/TestController.cpp:

(WTR::TestController::initialize):

• WebKitTestRunner/WebNotificationProvider.cpp:

(WTR::WebNotificationProvider::provider):

• WebKitTestRunner/WebNotificationProvider.h:

Location:

trunk

Files:

• Source/WebKit2/ChangeLog (modified) (1 diff)
• Source/WebKit2/Shared/API/c/WKDeclarationSpecifiers.h (modified) (1 diff)
• Source/WebKit2/UIProcess/API/C/WKNotificationManager.cpp (modified) (1 diff)
• Source/WebKit2/UIProcess/API/C/WKNotificationManager.h (modified) (1 diff)
• Source/WebKit2/UIProcess/API/C/WKNotificationProvider.h (modified) (2 diffs)
• Tools/ChangeLog (modified) (1 diff)
• Tools/WebKitTestRunner/TestController.cpp (modified) (1 diff)
• Tools/WebKitTestRunner/WebNotificationProvider.cpp (modified) (1 diff)
• Tools/WebKitTestRunner/WebNotificationProvider.h (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2013-12-03  Anders Carlsson  <andersca@apple.com>
+
+        Deprecate WKNotificationProvider
+        https://bugs.webkit.org/show_bug.cgi?id=125178
+
+        Reviewed by Sam Weinig.
+
+        * Shared/API/c/WKDeclarationSpecifiers.h:
+        Add WK_DEPRECATED and WK_ENUM_DEPRECATED macros so we can things as deprecated.
+
+        * UIProcess/API/C/WKNotificationManager.cpp:
+        (WKNotificationManagerSetProvider):
+        * UIProcess/API/C/WKNotificationManager.h:
+        WKNotificationManagerSetProvider now takes a WKNotificationProviderBase.
+
+        * UIProcess/API/C/WKNotificationProvider.h:
+        Deprecate WKNotificationProvider and kWKNotificationProviderCurrentVersion.
+
 2013-12-03  Brady Eidson  <beidson@apple.com>
 

trunk/Source/WebKit2/Shared/API/c/WKDeclarationSpecifiers.h

@@ -47 +47 @@
 #endif /* !defined(WK_INLINE) */
 
+#if defined(__has_extension) && __has_extension(enumerator_attributes) && __has_extension(attribute_unavailable_with_message)
+#define WK_DEPRECATED(message) __attribute__((deprecated(message)))
+#else
+#define WK_DEPRECATED(message)
+#endif
+
+#if defined(__has_extension) && __has_extension(enumerator_attributes) && __has_extension(attribute_unavailable_with_message)
+#define WK_ENUM_DEPRECATED(message) __attribute__((deprecated(message)))
+#else
+#define WK_ENUM_DEPRECATED(message)
+#endif
+
 #endif /* WKDeclarationSpecifiers_h */

trunk/Source/WebKit2/UIProcess/API/C/WKNotificationManager.cpp

@@ -37 +37 @@
 }
 
-void WKNotificationManagerSetProvider(WKNotificationManagerRef managerRef, const WKNotificationProvider* wkProvider)
+void WKNotificationManagerSetProvider(WKNotificationManagerRef managerRef, const WKNotificationProviderBase* wkProvider)
 {
-    toImpl(managerRef)->initializeProvider(reinterpret_cast<const WKNotificationProviderBase*>(wkProvider));
+    toImpl(managerRef)->initializeProvider(wkProvider);
 }
 

trunk/Source/WebKit2/UIProcess/API/C/WKNotificationManager.h

@@ -35 +35 @@
 
 WK_EXPORT WKTypeID WKNotificationManagerGetTypeID();
-WK_EXPORT void WKNotificationManagerSetProvider(WKNotificationManagerRef managerRef, const WKNotificationProvider* wkProvider);
+WK_EXPORT void WKNotificationManagerSetProvider(WKNotificationManagerRef managerRef, const WKNotificationProviderBase* wkProvider);
 
 WK_EXPORT void WKNotificationManagerProviderDidShowNotification(WKNotificationManagerRef managerRef, uint64_t notificationID);

trunk/Source/WebKit2/UIProcess/API/C/WKNotificationProvider.h

@@ -59 +59 @@
 } WKNotificationProviderV0;
 
-// FIXME: Deprecate.
-enum { kWKNotificationProviderCurrentVersion = 0 };
+enum { kWKNotificationProviderCurrentVersion WK_ENUM_DEPRECATED("Use an explicit version number instead") = 0, };
 typedef struct WKNotificationProvider {
     int                                                                   version;
@@ -73 +72 @@
     WKNotificationProviderNotificationPermissionsCallback                 notificationPermissions;
     WKNotificationProviderClearNotificationsCallback                      clearNotifications;
-} WKNotificationProvider;
+} WKNotificationProvider WK_DEPRECATED("Use an explicit versioned struct instead");
 
 #ifdef __cplusplus

trunk/Tools/ChangeLog

@@ +1 @@
+2013-12-03  Anders Carlsson  <andersca@apple.com>
+
+        Deprecate WKNotificationProvider
+        https://bugs.webkit.org/show_bug.cgi?id=125178
+
+        Reviewed by Sam Weinig.
+
+        Update for WebKit2 changes.
+
+        * WebKitTestRunner/TestController.cpp:
+        (WTR::TestController::initialize):
+        * WebKitTestRunner/WebNotificationProvider.cpp:
+        (WTR::WebNotificationProvider::provider):
+        * WebKitTestRunner/WebNotificationProvider.h:
+
 2013-12-03  Brent Fulgham  <bfulgham@apple.com>
 

trunk/Tools/WebKitTestRunner/TestController.cpp

@@ -377 +377 @@
 
     WKNotificationManagerRef notificationManager = WKContextGetNotificationManager(m_context.get());
-    WKNotificationProvider notificationKit = m_webNotificationProvider.provider();
-    WKNotificationManagerSetProvider(notificationManager, &notificationKit);
+    WKNotificationProviderV0 notificationKit = m_webNotificationProvider.provider();
+    WKNotificationManagerSetProvider(notificationManager, &notificationKit.base);
 
     if (testPluginDirectory())

trunk/Tools/WebKitTestRunner/WebNotificationProvider.cpp

@@ -69 +69 @@
 }
 
-WKNotificationProvider WebNotificationProvider::provider()
+WKNotificationProviderV0 WebNotificationProvider::provider()
 {
-    WKNotificationProvider notificationProvider = {
-        kWKNotificationProviderCurrentVersion,
-        this,
+    WKNotificationProviderV0 notificationProvider = {
+        { kWKNotificationProviderCurrentVersion, this },
         WTR::showWebNotification,
         WTR::closeWebNotification,

trunk/Tools/WebKitTestRunner/WebNotificationProvider.h

@@ -38 +38 @@
     WebNotificationProvider();
     ~WebNotificationProvider();
-    WKNotificationProvider provider();
+    WKNotificationProviderV0 provider();
 
     void showWebNotification(WKPageRef, WKNotificationRef);