<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[160036] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/160036">160036</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2013-12-03 13:53:21 -0800 (Tue, 03 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>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:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedAPIcWKDeclarationSpecifiersh">trunk/Source/WebKit2/Shared/API/c/WKDeclarationSpecifiers.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKNotificationManagercpp">trunk/Source/WebKit2/UIProcess/API/C/WKNotificationManager.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKNotificationManagerh">trunk/Source/WebKit2/UIProcess/API/C/WKNotificationManager.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKNotificationProviderh">trunk/Source/WebKit2/UIProcess/API/C/WKNotificationProvider.h</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsWebKitTestRunnerTestControllercpp">trunk/Tools/WebKitTestRunner/TestController.cpp</a></li>
<li><a href="#trunkToolsWebKitTestRunnerWebNotificationProvidercpp">trunk/Tools/WebKitTestRunner/WebNotificationProvider.cpp</a></li>
<li><a href="#trunkToolsWebKitTestRunnerWebNotificationProviderh">trunk/Tools/WebKitTestRunner/WebNotificationProvider.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (160035 => 160036)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2013-12-03 21:50:43 UTC (rev 160035)
+++ trunk/Source/WebKit2/ChangeLog 2013-12-03 21:53:21 UTC (rev 160036)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+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.
+
</ins><span class="cx"> 2013-12-03 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> Indexed Database work should be done on a non-main queue
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIcWKDeclarationSpecifiersh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/API/c/WKDeclarationSpecifiers.h (160035 => 160036)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/API/c/WKDeclarationSpecifiers.h 2013-12-03 21:50:43 UTC (rev 160035)
+++ trunk/Source/WebKit2/Shared/API/c/WKDeclarationSpecifiers.h 2013-12-03 21:53:21 UTC (rev 160036)
</span><span class="lines">@@ -46,4 +46,16 @@
</span><span class="cx"> #endif
</span><span class="cx"> #endif /* !defined(WK_INLINE) */
</span><span class="cx">
</span><ins>+#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
+
</ins><span class="cx"> #endif /* WKDeclarationSpecifiers_h */
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKNotificationManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKNotificationManager.cpp (160035 => 160036)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKNotificationManager.cpp 2013-12-03 21:50:43 UTC (rev 160035)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKNotificationManager.cpp 2013-12-03 21:53:21 UTC (rev 160036)
</span><span class="lines">@@ -36,9 +36,9 @@
</span><span class="cx"> return toAPI(WebNotificationManagerProxy::APIType);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WKNotificationManagerSetProvider(WKNotificationManagerRef managerRef, const WKNotificationProvider* wkProvider)
</del><ins>+void WKNotificationManagerSetProvider(WKNotificationManagerRef managerRef, const WKNotificationProviderBase* wkProvider)
</ins><span class="cx"> {
</span><del>- toImpl(managerRef)->initializeProvider(reinterpret_cast<const WKNotificationProviderBase*>(wkProvider));
</del><ins>+ toImpl(managerRef)->initializeProvider(wkProvider);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WKNotificationManagerProviderDidShowNotification(WKNotificationManagerRef managerRef, uint64_t notificationID)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKNotificationManagerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKNotificationManager.h (160035 => 160036)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKNotificationManager.h 2013-12-03 21:50:43 UTC (rev 160035)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKNotificationManager.h 2013-12-03 21:53:21 UTC (rev 160036)
</span><span class="lines">@@ -34,7 +34,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> WK_EXPORT WKTypeID WKNotificationManagerGetTypeID();
</span><del>-WK_EXPORT void WKNotificationManagerSetProvider(WKNotificationManagerRef managerRef, const WKNotificationProvider* wkProvider);
</del><ins>+WK_EXPORT void WKNotificationManagerSetProvider(WKNotificationManagerRef managerRef, const WKNotificationProviderBase* wkProvider);
</ins><span class="cx">
</span><span class="cx"> WK_EXPORT void WKNotificationManagerProviderDidShowNotification(WKNotificationManagerRef managerRef, uint64_t notificationID);
</span><span class="cx"> WK_EXPORT void WKNotificationManagerProviderDidClickNotification(WKNotificationManagerRef managerRef, uint64_t notificationID);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKNotificationProviderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKNotificationProvider.h (160035 => 160036)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKNotificationProvider.h 2013-12-03 21:50:43 UTC (rev 160035)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKNotificationProvider.h 2013-12-03 21:53:21 UTC (rev 160036)
</span><span class="lines">@@ -58,8 +58,7 @@
</span><span class="cx"> WKNotificationProviderClearNotificationsCallback clearNotifications;
</span><span class="cx"> } WKNotificationProviderV0;
</span><span class="cx">
</span><del>-// FIXME: Deprecate.
-enum { kWKNotificationProviderCurrentVersion = 0 };
</del><ins>+enum { kWKNotificationProviderCurrentVersion WK_ENUM_DEPRECATED("Use an explicit version number instead") = 0, };
</ins><span class="cx"> typedef struct WKNotificationProvider {
</span><span class="cx"> int version;
</span><span class="cx"> const void* clientInfo;
</span><span class="lines">@@ -72,7 +71,7 @@
</span><span class="cx"> WKNotificationProviderRemoveNotificationManagerCallback removeNotificationManager;
</span><span class="cx"> WKNotificationProviderNotificationPermissionsCallback notificationPermissions;
</span><span class="cx"> WKNotificationProviderClearNotificationsCallback clearNotifications;
</span><del>-} WKNotificationProvider;
</del><ins>+} WKNotificationProvider WK_DEPRECATED("Use an explicit versioned struct instead");
</ins><span class="cx">
</span><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (160035 => 160036)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2013-12-03 21:50:43 UTC (rev 160035)
+++ trunk/Tools/ChangeLog 2013-12-03 21:53:21 UTC (rev 160036)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+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:
+
</ins><span class="cx"> 2013-12-03 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> [Win] Support 64-bit Application Support Libraries Location
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerTestControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/TestController.cpp (160035 => 160036)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/TestController.cpp 2013-12-03 21:50:43 UTC (rev 160035)
+++ trunk/Tools/WebKitTestRunner/TestController.cpp 2013-12-03 21:53:21 UTC (rev 160036)
</span><span class="lines">@@ -376,8 +376,8 @@
</span><span class="cx"> WKContextSetInjectedBundleClient(m_context.get(), &injectedBundleClient);
</span><span class="cx">
</span><span class="cx"> WKNotificationManagerRef notificationManager = WKContextGetNotificationManager(m_context.get());
</span><del>- WKNotificationProvider notificationKit = m_webNotificationProvider.provider();
- WKNotificationManagerSetProvider(notificationManager, &notificationKit);
</del><ins>+ WKNotificationProviderV0 notificationKit = m_webNotificationProvider.provider();
+ WKNotificationManagerSetProvider(notificationManager, &notificationKit.base);
</ins><span class="cx">
</span><span class="cx"> if (testPluginDirectory())
</span><span class="cx"> WKContextSetAdditionalPluginsDirectory(m_context.get(), testPluginDirectory());
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerWebNotificationProvidercpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/WebNotificationProvider.cpp (160035 => 160036)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/WebNotificationProvider.cpp 2013-12-03 21:50:43 UTC (rev 160035)
+++ trunk/Tools/WebKitTestRunner/WebNotificationProvider.cpp 2013-12-03 21:53:21 UTC (rev 160036)
</span><span class="lines">@@ -68,11 +68,10 @@
</span><span class="cx"> WKNotificationManagerSetProvider(m_notificationManager.get(), 0);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-WKNotificationProvider WebNotificationProvider::provider()
</del><ins>+WKNotificationProviderV0 WebNotificationProvider::provider()
</ins><span class="cx"> {
</span><del>- WKNotificationProvider notificationProvider = {
- kWKNotificationProviderCurrentVersion,
- this,
</del><ins>+ WKNotificationProviderV0 notificationProvider = {
+ { kWKNotificationProviderCurrentVersion, this },
</ins><span class="cx"> WTR::showWebNotification,
</span><span class="cx"> WTR::closeWebNotification,
</span><span class="cx"> 0, // didDestroyNotification
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerWebNotificationProviderh"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/WebNotificationProvider.h (160035 => 160036)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/WebNotificationProvider.h 2013-12-03 21:50:43 UTC (rev 160035)
+++ trunk/Tools/WebKitTestRunner/WebNotificationProvider.h 2013-12-03 21:53:21 UTC (rev 160036)
</span><span class="lines">@@ -37,7 +37,7 @@
</span><span class="cx"> public:
</span><span class="cx"> WebNotificationProvider();
</span><span class="cx"> ~WebNotificationProvider();
</span><del>- WKNotificationProvider provider();
</del><ins>+ WKNotificationProviderV0 provider();
</ins><span class="cx">
</span><span class="cx"> void showWebNotification(WKPageRef, WKNotificationRef);
</span><span class="cx"> void closeWebNotification(WKNotificationRef);
</span></span></pre>
</div>
</div>
</body>
</html>