<!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>[169984] trunk/Source/WebKit2</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/169984">169984</a></dd>
<dt>Author</dt> <dd>mitz@apple.com</dd>
<dt>Date</dt> <dd>2014-06-14 16:11:42 -0700 (Sat, 14 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Get rid of GenericAPICallback
https://bugs.webkit.org/show_bug.cgi?id=133909
Reviewed by Sam Weinig.
In preparation for passing callbacks as functions, replace GenericAPICallback::create, which
returned a GenericCallback, with a function template that returns an appropriate callback
function.
* UIProcess/API/C/WKApplicationCacheManager.cpp:
(WKApplicationCacheManagerGetApplicationCacheOrigins):
* UIProcess/API/C/WKContext.cpp:
(WKContextGetStatistics):
(WKContextGetStatisticsWithOptions):
* UIProcess/API/C/WKCookieManager.cpp:
(WKCookieManagerGetHostnamesWithCookies):
(WKCookieManagerGetHTTPCookieAcceptPolicy):
* UIProcess/API/C/WKDatabaseManager.cpp:
(WKDatabaseManagerGetDatabasesByOrigin):
(WKDatabaseManagerGetDatabaseOrigins):
* UIProcess/API/C/WKFrame.cpp:
(WKFrameGetMainResourceData):
(WKFrameGetResourceData):
(WKFrameGetWebArchive):
* UIProcess/API/C/WKKeyValueStorageManager.cpp:
(WKKeyValueStorageManagerGetKeyValueStorageOrigins):
(WKKeyValueStorageManagerGetStorageDetailsByOrigin):
* UIProcess/API/C/WKMediaCacheManager.cpp:
(WKMediaCacheManagerGetHostnamesWithMediaCache):
* UIProcess/API/C/WKOriginDataManager.cpp:
(WKOriginDataManagerGetOrigins):
* UIProcess/API/C/WKPage.cpp:
(WKPageRunJavaScriptInMainFrame):
(WKPageRenderTreeExternalRepresentation):
(WKPageGetSourceForFrame):
(WKPageGetContentsAsString):
(WKPageGetBytecodeProfile):
(WKPageGetSelectionAsWebArchiveData):
(WKPageGetContentsAsMHTMLData):
(WKPageDrawPagesToPDF):
* UIProcess/API/C/WKPluginSiteDataManager.cpp:
(WKPluginSiteDataManagerGetSitesWithData):
* UIProcess/API/C/WKResourceCacheManager.cpp:
(WKResourceCacheManagerGetCacheOrigins):
* UIProcess/GenericCallback.h:
(WebKit::toGenericCallbackFunction): Added. Given a C SPI callback function, returns a generic
callback function that wraps it.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKApplicationCacheManagercpp">trunk/Source/WebKit2/UIProcess/API/C/WKApplicationCacheManager.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKContextcpp">trunk/Source/WebKit2/UIProcess/API/C/WKContext.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKCookieManagercpp">trunk/Source/WebKit2/UIProcess/API/C/WKCookieManager.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKDatabaseManagercpp">trunk/Source/WebKit2/UIProcess/API/C/WKDatabaseManager.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKFramecpp">trunk/Source/WebKit2/UIProcess/API/C/WKFrame.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKKeyValueStorageManagercpp">trunk/Source/WebKit2/UIProcess/API/C/WKKeyValueStorageManager.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKMediaCacheManagercpp">trunk/Source/WebKit2/UIProcess/API/C/WKMediaCacheManager.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKOriginDataManagercpp">trunk/Source/WebKit2/UIProcess/API/C/WKOriginDataManager.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKPagecpp">trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKPluginSiteDataManagercpp">trunk/Source/WebKit2/UIProcess/API/C/WKPluginSiteDataManager.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKResourceCacheManagercpp">trunk/Source/WebKit2/UIProcess/API/C/WKResourceCacheManager.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitCookieManagercpp">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitCookieManager.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessGenericCallbackh">trunk/Source/WebKit2/UIProcess/GenericCallback.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (169983 => 169984)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-06-14 22:44:42 UTC (rev 169983)
+++ trunk/Source/WebKit2/ChangeLog 2014-06-14 23:11:42 UTC (rev 169984)
</span><span class="lines">@@ -1,5 +1,56 @@
</span><span class="cx"> 2014-06-14 Dan Bernstein <mitz@apple.com>
</span><span class="cx">
</span><ins>+ Get rid of GenericAPICallback
+ https://bugs.webkit.org/show_bug.cgi?id=133909
+
+ Reviewed by Sam Weinig.
+
+ In preparation for passing callbacks as functions, replace GenericAPICallback::create, which
+ returned a GenericCallback, with a function template that returns an appropriate callback
+ function.
+
+ * UIProcess/API/C/WKApplicationCacheManager.cpp:
+ (WKApplicationCacheManagerGetApplicationCacheOrigins):
+ * UIProcess/API/C/WKContext.cpp:
+ (WKContextGetStatistics):
+ (WKContextGetStatisticsWithOptions):
+ * UIProcess/API/C/WKCookieManager.cpp:
+ (WKCookieManagerGetHostnamesWithCookies):
+ (WKCookieManagerGetHTTPCookieAcceptPolicy):
+ * UIProcess/API/C/WKDatabaseManager.cpp:
+ (WKDatabaseManagerGetDatabasesByOrigin):
+ (WKDatabaseManagerGetDatabaseOrigins):
+ * UIProcess/API/C/WKFrame.cpp:
+ (WKFrameGetMainResourceData):
+ (WKFrameGetResourceData):
+ (WKFrameGetWebArchive):
+ * UIProcess/API/C/WKKeyValueStorageManager.cpp:
+ (WKKeyValueStorageManagerGetKeyValueStorageOrigins):
+ (WKKeyValueStorageManagerGetStorageDetailsByOrigin):
+ * UIProcess/API/C/WKMediaCacheManager.cpp:
+ (WKMediaCacheManagerGetHostnamesWithMediaCache):
+ * UIProcess/API/C/WKOriginDataManager.cpp:
+ (WKOriginDataManagerGetOrigins):
+ * UIProcess/API/C/WKPage.cpp:
+ (WKPageRunJavaScriptInMainFrame):
+ (WKPageRenderTreeExternalRepresentation):
+ (WKPageGetSourceForFrame):
+ (WKPageGetContentsAsString):
+ (WKPageGetBytecodeProfile):
+ (WKPageGetSelectionAsWebArchiveData):
+ (WKPageGetContentsAsMHTMLData):
+ (WKPageDrawPagesToPDF):
+ * UIProcess/API/C/WKPluginSiteDataManager.cpp:
+ (WKPluginSiteDataManagerGetSitesWithData):
+ * UIProcess/API/C/WKResourceCacheManager.cpp:
+ (WKResourceCacheManagerGetCacheOrigins):
+
+ * UIProcess/GenericCallback.h:
+ (WebKit::toGenericCallbackFunction): Added. Given a C SPI callback function, returns a generic
+ callback function that wraps it.
+
+2014-06-14 Dan Bernstein <mitz@apple.com>
+
</ins><span class="cx"> Reverted the last change, which broken the Mac build.
</span><span class="cx">
</span><span class="cx"> * UIProcess/GenericCallback.h:
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKApplicationCacheManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKApplicationCacheManager.cpp (169983 => 169984)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKApplicationCacheManager.cpp 2014-06-14 22:44:42 UTC (rev 169983)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKApplicationCacheManager.cpp 2014-06-14 23:11:42 UTC (rev 169984)
</span><span class="lines">@@ -31,8 +31,6 @@
</span><span class="cx">
</span><span class="cx"> using namespace WebKit;
</span><span class="cx">
</span><del>-typedef GenericAPICallback<WKArrayRef> ArrayAPICallback;
-
</del><span class="cx"> WKTypeID WKApplicationCacheManagerGetTypeID()
</span><span class="cx"> {
</span><span class="cx"> return toAPI(WebApplicationCacheManagerProxy::APIType);
</span><span class="lines">@@ -40,7 +38,7 @@
</span><span class="cx">
</span><span class="cx"> void WKApplicationCacheManagerGetApplicationCacheOrigins(WKApplicationCacheManagerRef applicationCacheManagerRef, void* context, WKApplicationCacheManagerGetApplicationCacheOriginsFunction callback)
</span><span class="cx"> {
</span><del>- toImpl(applicationCacheManagerRef)->getApplicationCacheOrigins(ArrayAPICallback::create(context, callback));
</del><ins>+ toImpl(applicationCacheManagerRef)->getApplicationCacheOrigins(ArrayCallback::create(toGenericCallbackFunction(context, callback)));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WKApplicationCacheManagerDeleteEntriesForOrigin(WKApplicationCacheManagerRef applicationCacheManagerRef, WKSecurityOriginRef originRef)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKContext.cpp (169983 => 169984)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKContext.cpp 2014-06-14 22:44:42 UTC (rev 169983)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKContext.cpp 2014-06-14 23:11:42 UTC (rev 169984)
</span><span class="lines">@@ -68,8 +68,6 @@
</span><span class="cx"> using namespace WebCore;
</span><span class="cx"> using namespace WebKit;
</span><span class="cx">
</span><del>-typedef GenericAPICallback<WKDictionaryRef> DictionaryAPICallback;
-
</del><span class="cx"> WKTypeID WKContextGetTypeID()
</span><span class="cx"> {
</span><span class="cx"> return toAPI(WebContext::APIType);
</span><span class="lines">@@ -519,12 +517,12 @@
</span><span class="cx">
</span><span class="cx"> void WKContextGetStatistics(WKContextRef contextRef, void* context, WKContextGetStatisticsFunction callback)
</span><span class="cx"> {
</span><del>- toImpl(contextRef)->getStatistics(0xFFFFFFFF, DictionaryAPICallback::create(context, callback));
</del><ins>+ toImpl(contextRef)->getStatistics(0xFFFFFFFF, DictionaryCallback::create(toGenericCallbackFunction(context, callback)));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WKContextGetStatisticsWithOptions(WKContextRef contextRef, WKStatisticsOptions optionsMask, void* context, WKContextGetStatisticsFunction callback)
</span><span class="cx"> {
</span><del>- toImpl(contextRef)->getStatistics(optionsMask, DictionaryAPICallback::create(context, callback));
</del><ins>+ toImpl(contextRef)->getStatistics(optionsMask, DictionaryCallback::create(toGenericCallbackFunction(context, callback)));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WKContextGarbageCollectJavaScriptObjects(WKContextRef contextRef)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKCookieManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKCookieManager.cpp (169983 => 169984)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKCookieManager.cpp 2014-06-14 22:44:42 UTC (rev 169983)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKCookieManager.cpp 2014-06-14 23:11:42 UTC (rev 169984)
</span><span class="lines">@@ -31,9 +31,6 @@
</span><span class="cx">
</span><span class="cx"> using namespace WebKit;
</span><span class="cx">
</span><del>-typedef GenericAPICallback<WKArrayRef> ArrayAPICallback;
-typedef GenericAPICallback<WKHTTPCookieAcceptPolicy, HTTPCookieAcceptPolicy> HTTPCookieAcceptPolicyAPICallback;
-
</del><span class="cx"> WKTypeID WKCookieManagerGetTypeID()
</span><span class="cx"> {
</span><span class="cx"> return toAPI(WebCookieManagerProxy::APIType);
</span><span class="lines">@@ -46,7 +43,7 @@
</span><span class="cx">
</span><span class="cx"> void WKCookieManagerGetHostnamesWithCookies(WKCookieManagerRef cookieManagerRef, void* context, WKCookieManagerGetCookieHostnamesFunction callback)
</span><span class="cx"> {
</span><del>- toImpl(cookieManagerRef)->getHostnamesWithCookies(ArrayAPICallback::create(context, callback));
</del><ins>+ toImpl(cookieManagerRef)->getHostnamesWithCookies(ArrayCallback::create(toGenericCallbackFunction(context, callback)));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WKCookieManagerDeleteCookiesForHostname(WKCookieManagerRef cookieManagerRef, WKStringRef hostname)
</span><span class="lines">@@ -71,7 +68,7 @@
</span><span class="cx">
</span><span class="cx"> void WKCookieManagerGetHTTPCookieAcceptPolicy(WKCookieManagerRef cookieManager, void* context, WKCookieManagerGetHTTPCookieAcceptPolicyFunction callback)
</span><span class="cx"> {
</span><del>- toImpl(cookieManager)->getHTTPCookieAcceptPolicy(HTTPCookieAcceptPolicyAPICallback::create(context, callback));
</del><ins>+ toImpl(cookieManager)->getHTTPCookieAcceptPolicy(HTTPCookieAcceptPolicyCallback::create(toGenericCallbackFunction<WKHTTPCookieAcceptPolicy, HTTPCookieAcceptPolicy>(context, callback)));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WKCookieManagerStartObservingCookieChanges(WKCookieManagerRef cookieManager)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKDatabaseManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKDatabaseManager.cpp (169983 => 169984)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKDatabaseManager.cpp 2014-06-14 22:44:42 UTC (rev 169983)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKDatabaseManager.cpp 2014-06-14 23:11:42 UTC (rev 169984)
</span><span class="lines">@@ -31,10 +31,6 @@
</span><span class="cx">
</span><span class="cx"> using namespace WebKit;
</span><span class="cx">
</span><del>-#if ENABLE(SQL_DATABASE)
-typedef GenericAPICallback<WKArrayRef> ArrayAPICallback;
-#endif
-
</del><span class="cx"> WKTypeID WKDatabaseManagerGetTypeID()
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(SQL_DATABASE)
</span><span class="lines">@@ -159,7 +155,7 @@
</span><span class="cx"> void WKDatabaseManagerGetDatabasesByOrigin(WKDatabaseManagerRef databaseManagerRef, void* context, WKDatabaseManagerGetDatabasesByOriginFunction callback)
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(SQL_DATABASE)
</span><del>- toImpl(databaseManagerRef)->getDatabasesByOrigin(ArrayAPICallback::create(context, callback));
</del><ins>+ toImpl(databaseManagerRef)->getDatabasesByOrigin(ArrayCallback::create(toGenericCallbackFunction(context, callback)));
</ins><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(databaseManagerRef);
</span><span class="cx"> UNUSED_PARAM(context);
</span><span class="lines">@@ -170,7 +166,7 @@
</span><span class="cx"> void WKDatabaseManagerGetDatabaseOrigins(WKDatabaseManagerRef databaseManagerRef, void* context, WKDatabaseManagerGetDatabaseOriginsFunction callback)
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(SQL_DATABASE)
</span><del>- toImpl(databaseManagerRef)->getDatabaseOrigins(ArrayAPICallback::create(context, callback));
</del><ins>+ toImpl(databaseManagerRef)->getDatabaseOrigins(ArrayCallback::create(toGenericCallbackFunction(context, callback)));
</ins><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(databaseManagerRef);
</span><span class="cx"> UNUSED_PARAM(context);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKFramecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKFrame.cpp (169983 => 169984)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKFrame.cpp 2014-06-14 22:44:42 UTC (rev 169983)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKFrame.cpp 2014-06-14 23:11:42 UTC (rev 169984)
</span><span class="lines">@@ -31,8 +31,6 @@
</span><span class="cx">
</span><span class="cx"> using namespace WebKit;
</span><span class="cx">
</span><del>-typedef GenericAPICallback<WKDataRef> DataAPICallback;
-
</del><span class="cx"> WKTypeID WKFrameGetTypeID()
</span><span class="cx"> {
</span><span class="cx"> return toAPI(WebFrameProxy::APIType);
</span><span class="lines">@@ -126,17 +124,17 @@
</span><span class="cx">
</span><span class="cx"> void WKFrameGetMainResourceData(WKFrameRef frameRef, WKFrameGetResourceDataFunction callback, void* context)
</span><span class="cx"> {
</span><del>- toImpl(frameRef)->getMainResourceData(DataAPICallback::create(context, callback));
</del><ins>+ toImpl(frameRef)->getMainResourceData(DataCallback::create(toGenericCallbackFunction(context, callback)));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WKFrameGetResourceData(WKFrameRef frameRef, WKURLRef resourceURL, WKFrameGetResourceDataFunction callback, void* context)
</span><span class="cx"> {
</span><del>- toImpl(frameRef)->getResourceData(toImpl(resourceURL), DataAPICallback::create(context, callback));
</del><ins>+ toImpl(frameRef)->getResourceData(toImpl(resourceURL), DataCallback::create(toGenericCallbackFunction(context, callback)));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WKFrameGetWebArchive(WKFrameRef frameRef, WKFrameGetWebArchiveFunction callback, void* context)
</span><span class="cx"> {
</span><del>- toImpl(frameRef)->getWebArchive(DataAPICallback::create(context, callback));
</del><ins>+ toImpl(frameRef)->getWebArchive(DataCallback::create(toGenericCallbackFunction(context, callback)));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // NOTE: These are deprecated and should be removed. They currently do nothing.
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKKeyValueStorageManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKKeyValueStorageManager.cpp (169983 => 169984)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKKeyValueStorageManager.cpp 2014-06-14 22:44:42 UTC (rev 169983)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKKeyValueStorageManager.cpp 2014-06-14 23:11:42 UTC (rev 169984)
</span><span class="lines">@@ -31,8 +31,6 @@
</span><span class="cx">
</span><span class="cx"> using namespace WebKit;
</span><span class="cx">
</span><del>-typedef GenericAPICallback<WKArrayRef> ArrayAPICallback;
-
</del><span class="cx"> WKTypeID WKKeyValueStorageManagerGetTypeID()
</span><span class="cx"> {
</span><span class="cx"> return toAPI(WebKeyValueStorageManager::APIType);
</span><span class="lines">@@ -58,12 +56,12 @@
</span><span class="cx">
</span><span class="cx"> void WKKeyValueStorageManagerGetKeyValueStorageOrigins(WKKeyValueStorageManagerRef keyValueStorageManagerRef, void* context, WKKeyValueStorageManagerGetKeyValueStorageOriginsFunction callback)
</span><span class="cx"> {
</span><del>- toImpl(keyValueStorageManagerRef)->getKeyValueStorageOrigins(ArrayAPICallback::create(context, callback));
</del><ins>+ toImpl(keyValueStorageManagerRef)->getKeyValueStorageOrigins(ArrayCallback::create(toGenericCallbackFunction(context, callback)));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WKKeyValueStorageManagerGetStorageDetailsByOrigin(WKKeyValueStorageManagerRef keyValueStorageManagerRef, void* context, WKKeyValueStorageManagerGetStorageDetailsByOriginFunction callback)
</span><span class="cx"> {
</span><del>- toImpl(keyValueStorageManagerRef)->getStorageDetailsByOrigin(ArrayAPICallback::create(context, callback));
</del><ins>+ toImpl(keyValueStorageManagerRef)->getStorageDetailsByOrigin(ArrayCallback::create(toGenericCallbackFunction(context, callback)));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WKKeyValueStorageManagerDeleteEntriesForOrigin(WKKeyValueStorageManagerRef keyValueStorageManagerRef, WKSecurityOriginRef originRef)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKMediaCacheManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKMediaCacheManager.cpp (169983 => 169984)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKMediaCacheManager.cpp 2014-06-14 22:44:42 UTC (rev 169983)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKMediaCacheManager.cpp 2014-06-14 23:11:42 UTC (rev 169984)
</span><span class="lines">@@ -31,8 +31,6 @@
</span><span class="cx">
</span><span class="cx"> using namespace WebKit;
</span><span class="cx">
</span><del>-typedef GenericAPICallback<WKArrayRef> ArrayAPICallback;
-
</del><span class="cx"> WKTypeID WKMediaCacheManagerGetTypeID()
</span><span class="cx"> {
</span><span class="cx"> return toAPI(WebMediaCacheManagerProxy::APIType);
</span><span class="lines">@@ -40,7 +38,7 @@
</span><span class="cx">
</span><span class="cx"> void WKMediaCacheManagerGetHostnamesWithMediaCache(WKMediaCacheManagerRef mediaCacheManagerRef, void* context, WKMediaCacheManagerGetHostnamesWithMediaCacheFunction callback)
</span><span class="cx"> {
</span><del>- toImpl(mediaCacheManagerRef)->getHostnamesWithMediaCache(ArrayAPICallback::create(context, callback));
</del><ins>+ toImpl(mediaCacheManagerRef)->getHostnamesWithMediaCache(ArrayCallback::create(toGenericCallbackFunction(context, callback)));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WKMediaCacheManagerClearCacheForHostname(WKMediaCacheManagerRef mediaCacheManagerRef, WKStringRef hostname)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKOriginDataManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKOriginDataManager.cpp (169983 => 169984)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKOriginDataManager.cpp 2014-06-14 22:44:42 UTC (rev 169983)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKOriginDataManager.cpp 2014-06-14 23:11:42 UTC (rev 169984)
</span><span class="lines">@@ -31,8 +31,6 @@
</span><span class="cx">
</span><span class="cx"> using namespace WebKit;
</span><span class="cx">
</span><del>-typedef GenericAPICallback<WKArrayRef> ArrayAPICallback;
-
</del><span class="cx"> WKTypeID WKOriginDataManagerGetTypeID()
</span><span class="cx"> {
</span><span class="cx"> return toAPI(WebOriginDataManagerProxy::APIType);
</span><span class="lines">@@ -40,7 +38,7 @@
</span><span class="cx">
</span><span class="cx"> void WKOriginDataManagerGetOrigins(WKOriginDataManagerRef originDataManagerRef, WKOriginDataTypes types, void* context, WKOriginDataManagerGetOriginsFunction callback)
</span><span class="cx"> {
</span><del>- toImpl(originDataManagerRef)->getOrigins(types, ArrayAPICallback::create(context, callback));
</del><ins>+ toImpl(originDataManagerRef)->getOrigins(types, ArrayCallback::create(toGenericCallbackFunction(context, callback)));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WKOriginDataManagerDeleteEntriesForOrigin(WKOriginDataManagerRef originDataManagerRef, WKOriginDataTypes types, WKSecurityOriginRef originRef)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp (169983 => 169984)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2014-06-14 22:44:42 UTC (rev 169983)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2014-06-14 23:11:42 UTC (rev 169984)
</span><span class="lines">@@ -77,10 +77,6 @@
</span><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span><del>-typedef GenericAPICallback<WKDataRef> DataAPICallback;
-typedef GenericAPICallback<WKStringRef, StringImpl*> StringAPICallback;
-typedef GenericAPICallback<WKSerializedScriptValueRef> ScriptValueAPICallback;
-
</del><span class="cx"> WKTypeID WKPageGetTypeID()
</span><span class="cx"> {
</span><span class="cx"> return toAPI(WebPageProxy::APIType);
</span><span class="lines">@@ -1566,7 +1562,7 @@
</span><span class="cx">
</span><span class="cx"> void WKPageRunJavaScriptInMainFrame(WKPageRef pageRef, WKStringRef scriptRef, void* context, WKPageRunJavaScriptFunction callback)
</span><span class="cx"> {
</span><del>- toImpl(pageRef)->runJavaScriptInMainFrame(toImpl(scriptRef)->string(), ScriptValueAPICallback::create(context, callback));
</del><ins>+ toImpl(pageRef)->runJavaScriptInMainFrame(toImpl(scriptRef)->string(), ScriptValueCallback::create(toGenericCallbackFunction(context, callback)));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #ifdef __BLOCKS__
</span><span class="lines">@@ -1585,33 +1581,33 @@
</span><span class="cx">
</span><span class="cx"> void WKPageRenderTreeExternalRepresentation(WKPageRef pageRef, void* context, WKPageRenderTreeExternalRepresentationFunction callback)
</span><span class="cx"> {
</span><del>- toImpl(pageRef)->getRenderTreeExternalRepresentation(StringAPICallback::create(context, callback));
</del><ins>+ toImpl(pageRef)->getRenderTreeExternalRepresentation(StringCallback::create(toGenericCallbackFunction<WKStringRef, StringImpl*>(context, callback)));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WKPageGetSourceForFrame(WKPageRef pageRef, WKFrameRef frameRef, void* context, WKPageGetSourceForFrameFunction callback)
</span><span class="cx"> {
</span><del>- toImpl(pageRef)->getSourceForFrame(toImpl(frameRef), StringAPICallback::create(context, callback));
</del><ins>+ toImpl(pageRef)->getSourceForFrame(toImpl(frameRef), StringCallback::create(toGenericCallbackFunction<WKStringRef, StringImpl*>(context, callback)));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WKPageGetContentsAsString(WKPageRef pageRef, void* context, WKPageGetContentsAsStringFunction callback)
</span><span class="cx"> {
</span><del>- toImpl(pageRef)->getContentsAsString(StringAPICallback::create(context, callback));
</del><ins>+ toImpl(pageRef)->getContentsAsString(StringCallback::create(toGenericCallbackFunction<WKStringRef, StringImpl*>(context, callback)));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WKPageGetBytecodeProfile(WKPageRef pageRef, void* context, WKPageGetBytecodeProfileFunction callback)
</span><span class="cx"> {
</span><del>- toImpl(pageRef)->getBytecodeProfile(StringAPICallback::create(context, callback));
</del><ins>+ toImpl(pageRef)->getBytecodeProfile(StringCallback::create(toGenericCallbackFunction<WKStringRef, StringImpl*>(context, callback)));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WKPageGetSelectionAsWebArchiveData(WKPageRef pageRef, void* context, WKPageGetSelectionAsWebArchiveDataFunction callback)
</span><span class="cx"> {
</span><del>- toImpl(pageRef)->getSelectionAsWebArchiveData(DataAPICallback::create(context, callback));
</del><ins>+ toImpl(pageRef)->getSelectionAsWebArchiveData(DataCallback::create(toGenericCallbackFunction(context, callback)));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WKPageGetContentsAsMHTMLData(WKPageRef pageRef, bool useBinaryEncoding, void* context, WKPageGetContentsAsMHTMLDataFunction callback)
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(MHTML)
</span><del>- toImpl(pageRef)->getContentsAsMHTMLData(DataAPICallback::create(context, callback), useBinaryEncoding);
</del><ins>+ toImpl(pageRef)->getContentsAsMHTMLData(DataCallback::create(toGenericCallbackFunction(context, callback)), useBinaryEncoding);
</ins><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(pageRef);
</span><span class="cx"> UNUSED_PARAM(useBinaryEncoding);
</span><span class="lines">@@ -1694,7 +1690,7 @@
</span><span class="cx">
</span><span class="cx"> void WKPageDrawPagesToPDF(WKPageRef page, WKFrameRef frame, WKPrintInfo printInfo, uint32_t first, uint32_t count, WKPageDrawToPDFFunction callback, void* context)
</span><span class="cx"> {
</span><del>- toImpl(page)->drawPagesToPDF(toImpl(frame), printInfoFromWKPrintInfo(printInfo), first, count, DataAPICallback::create(context, callback));
</del><ins>+ toImpl(page)->drawPagesToPDF(toImpl(frame), printInfoFromWKPrintInfo(printInfo), first, count, DataCallback::create(toGenericCallbackFunction(context, callback)));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WKPageEndPrinting(WKPageRef page)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKPluginSiteDataManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPluginSiteDataManager.cpp (169983 => 169984)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKPluginSiteDataManager.cpp 2014-06-14 22:44:42 UTC (rev 169983)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPluginSiteDataManager.cpp 2014-06-14 23:11:42 UTC (rev 169984)
</span><span class="lines">@@ -36,10 +36,6 @@
</span><span class="cx">
</span><span class="cx"> using namespace WebKit;
</span><span class="cx">
</span><del>-#if ENABLE(NETSCAPE_PLUGIN_API)
-typedef GenericAPICallback<WKArrayRef> ArrayAPICallback;
-#endif
-
</del><span class="cx"> WKTypeID WKPluginSiteDataManagerGetTypeID()
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API)
</span><span class="lines">@@ -52,7 +48,7 @@
</span><span class="cx"> void WKPluginSiteDataManagerGetSitesWithData(WKPluginSiteDataManagerRef managerRef, void* context, WKPluginSiteDataManagerGetSitesWithDataFunction callback)
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API)
</span><del>- toImpl(managerRef)->getSitesWithData(ArrayAPICallback::create(context, callback));
</del><ins>+ toImpl(managerRef)->getSitesWithData(ArrayCallback::create(toGenericCallbackFunction(context, callback)));
</ins><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(managerRef);
</span><span class="cx"> UNUSED_PARAM(context);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKResourceCacheManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKResourceCacheManager.cpp (169983 => 169984)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKResourceCacheManager.cpp 2014-06-14 22:44:42 UTC (rev 169983)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKResourceCacheManager.cpp 2014-06-14 23:11:42 UTC (rev 169984)
</span><span class="lines">@@ -31,8 +31,6 @@
</span><span class="cx">
</span><span class="cx"> using namespace WebKit;
</span><span class="cx">
</span><del>-typedef GenericAPICallback<WKArrayRef> ArrayAPICallback;
-
</del><span class="cx"> WKTypeID WKResourceCacheManagerGetTypeID()
</span><span class="cx"> {
</span><span class="cx"> return toAPI(WebResourceCacheManagerProxy::APIType);
</span><span class="lines">@@ -40,7 +38,7 @@
</span><span class="cx">
</span><span class="cx"> void WKResourceCacheManagerGetCacheOrigins(WKResourceCacheManagerRef cacheManagerRef, void* context, WKResourceCacheManagerGetCacheOriginsFunction callback)
</span><span class="cx"> {
</span><del>- toImpl(cacheManagerRef)->getCacheOrigins(ArrayAPICallback::create(context, callback));
</del><ins>+ toImpl(cacheManagerRef)->getCacheOrigins(ArrayCallback::create(toGenericCallbackFunction(context, callback)));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WKResourceCacheManagerClearCacheForOrigin(WKResourceCacheManagerRef cacheManagerRef, WKSecurityOriginRef originRef, WKResourceCachesToClear cachesToClear)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitCookieManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitCookieManager.cpp (169983 => 169984)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitCookieManager.cpp 2014-06-14 22:44:42 UTC (rev 169983)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitCookieManager.cpp 2014-06-14 23:11:42 UTC (rev 169984)
</span><span class="lines">@@ -30,9 +30,6 @@
</span><span class="cx">
</span><span class="cx"> using namespace WebKit;
</span><span class="cx">
</span><del>-typedef GenericAPICallback<WKArrayRef> ArrayAPICallback;
-typedef GenericAPICallback<WKHTTPCookieAcceptPolicy, HTTPCookieAcceptPolicy> HTTPCookieAcceptPolicyAPICallback;
-
</del><span class="cx"> /**
</span><span class="cx"> * SECTION: WebKitCookieManager
</span><span class="cx"> * @Short_description: Defines how to handle cookies in a #WebKitWebContext
</span><span class="lines">@@ -214,7 +211,7 @@
</span><span class="cx"> g_return_if_fail(WEBKIT_IS_COOKIE_MANAGER(manager));
</span><span class="cx">
</span><span class="cx"> GTask* task = g_task_new(manager, cancellable, callback, userData);
</span><del>- manager->priv->webCookieManager->getHTTPCookieAcceptPolicy(HTTPCookieAcceptPolicyAPICallback::create(task, webkitCookieManagerGetAcceptPolicyCallback));
</del><ins>+ manager->priv->webCookieManager->getHTTPCookieAcceptPolicy(HTTPCookieAcceptPolicyCallback::create(toGenericCallbackFunction<WKHTTPCookieAcceptPolicy, HTTPCookieAcceptPolicy>(task, webkitCookieManagerGetAcceptPolicyCallback)));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -272,7 +269,7 @@
</span><span class="cx"> g_return_if_fail(WEBKIT_IS_COOKIE_MANAGER(manager));
</span><span class="cx">
</span><span class="cx"> GTask* task = g_task_new(manager, cancellable, callback, userData);
</span><del>- manager->priv->webCookieManager->getHostnamesWithCookies(ArrayAPICallback::create(task, webkitCookieManagerGetDomainsWithCookiesCallback));
</del><ins>+ manager->priv->webCookieManager->getHostnamesWithCookies(ArrayCallback::create(toGenericCallbackFunction(task, webkitCookieManagerGetDomainsWithCookiesCallback)));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessGenericCallbackh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/GenericCallback.h (169983 => 169984)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/GenericCallback.h 2014-06-14 22:44:42 UTC (rev 169983)
+++ trunk/Source/WebKit2/UIProcess/GenericCallback.h 2014-06-14 23:11:42 UTC (rev 169984)
</span><span class="lines">@@ -169,18 +169,13 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> template<typename APIReturnValueType, typename InternalReturnValueType = typename APITypeInfo<APIReturnValueType>::ImplType>
</span><del>-class GenericAPICallback : public CallbackBase {
-public:
- typedef void (*CallbackFunction)(APIReturnValueType, WKErrorRef, void*);
</del><ins>+static typename GenericCallback<InternalReturnValueType>::CallbackFunction toGenericCallbackFunction(void* context, void (*callback)(APIReturnValueType, WKErrorRef, void*))
+{
+ return [context, callback](InternalReturnValueType returnValue, CallbackBase::Error error) {
+ callback(toAPI(returnValue), error != CallbackBase::Error::None ? toAPI(API::Error::create().get()) : 0, context);
+ };
+}
</ins><span class="cx">
</span><del>- static PassRefPtr<GenericCallback<InternalReturnValueType>> create(void* context, CallbackFunction callback)
- {
- return GenericCallback<InternalReturnValueType>::create([context, callback](InternalReturnValueType returnValue, CallbackBase::Error error) {
- callback(toAPI(returnValue), error != CallbackBase::Error::None ? toAPI(API::Error::create().get()) : 0, context);
- });
- }
-};
-
</del><span class="cx"> typedef GenericCallback<const Vector<WebCore::IntRect>&, double> ComputedPagesCallback;
</span><span class="cx"> typedef GenericCallback<const ShareableBitmap::Handle&> ImageCallback;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>