Diff
Modified: trunk/Source/WebKit2/ChangeLog (169983 => 169984)
--- 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)
@@ -1,5 +1,56 @@
2014-06-14 Dan Bernstein <[email protected]>
+ 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 <[email protected]>
+
Reverted the last change, which broken the Mac build.
* UIProcess/GenericCallback.h:
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKApplicationCacheManager.cpp (169983 => 169984)
--- 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)
@@ -31,8 +31,6 @@
using namespace WebKit;
-typedef GenericAPICallback<WKArrayRef> ArrayAPICallback;
-
WKTypeID WKApplicationCacheManagerGetTypeID()
{
return toAPI(WebApplicationCacheManagerProxy::APIType);
@@ -40,7 +38,7 @@
void WKApplicationCacheManagerGetApplicationCacheOrigins(WKApplicationCacheManagerRef applicationCacheManagerRef, void* context, WKApplicationCacheManagerGetApplicationCacheOriginsFunction callback)
{
- toImpl(applicationCacheManagerRef)->getApplicationCacheOrigins(ArrayAPICallback::create(context, callback));
+ toImpl(applicationCacheManagerRef)->getApplicationCacheOrigins(ArrayCallback::create(toGenericCallbackFunction(context, callback)));
}
void WKApplicationCacheManagerDeleteEntriesForOrigin(WKApplicationCacheManagerRef applicationCacheManagerRef, WKSecurityOriginRef originRef)
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKContext.cpp (169983 => 169984)
--- 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)
@@ -68,8 +68,6 @@
using namespace WebCore;
using namespace WebKit;
-typedef GenericAPICallback<WKDictionaryRef> DictionaryAPICallback;
-
WKTypeID WKContextGetTypeID()
{
return toAPI(WebContext::APIType);
@@ -519,12 +517,12 @@
void WKContextGetStatistics(WKContextRef contextRef, void* context, WKContextGetStatisticsFunction callback)
{
- toImpl(contextRef)->getStatistics(0xFFFFFFFF, DictionaryAPICallback::create(context, callback));
+ toImpl(contextRef)->getStatistics(0xFFFFFFFF, DictionaryCallback::create(toGenericCallbackFunction(context, callback)));
}
void WKContextGetStatisticsWithOptions(WKContextRef contextRef, WKStatisticsOptions optionsMask, void* context, WKContextGetStatisticsFunction callback)
{
- toImpl(contextRef)->getStatistics(optionsMask, DictionaryAPICallback::create(context, callback));
+ toImpl(contextRef)->getStatistics(optionsMask, DictionaryCallback::create(toGenericCallbackFunction(context, callback)));
}
void WKContextGarbageCollectJavaScriptObjects(WKContextRef contextRef)
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKCookieManager.cpp (169983 => 169984)
--- 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)
@@ -31,9 +31,6 @@
using namespace WebKit;
-typedef GenericAPICallback<WKArrayRef> ArrayAPICallback;
-typedef GenericAPICallback<WKHTTPCookieAcceptPolicy, HTTPCookieAcceptPolicy> HTTPCookieAcceptPolicyAPICallback;
-
WKTypeID WKCookieManagerGetTypeID()
{
return toAPI(WebCookieManagerProxy::APIType);
@@ -46,7 +43,7 @@
void WKCookieManagerGetHostnamesWithCookies(WKCookieManagerRef cookieManagerRef, void* context, WKCookieManagerGetCookieHostnamesFunction callback)
{
- toImpl(cookieManagerRef)->getHostnamesWithCookies(ArrayAPICallback::create(context, callback));
+ toImpl(cookieManagerRef)->getHostnamesWithCookies(ArrayCallback::create(toGenericCallbackFunction(context, callback)));
}
void WKCookieManagerDeleteCookiesForHostname(WKCookieManagerRef cookieManagerRef, WKStringRef hostname)
@@ -71,7 +68,7 @@
void WKCookieManagerGetHTTPCookieAcceptPolicy(WKCookieManagerRef cookieManager, void* context, WKCookieManagerGetHTTPCookieAcceptPolicyFunction callback)
{
- toImpl(cookieManager)->getHTTPCookieAcceptPolicy(HTTPCookieAcceptPolicyAPICallback::create(context, callback));
+ toImpl(cookieManager)->getHTTPCookieAcceptPolicy(HTTPCookieAcceptPolicyCallback::create(toGenericCallbackFunction<WKHTTPCookieAcceptPolicy, HTTPCookieAcceptPolicy>(context, callback)));
}
void WKCookieManagerStartObservingCookieChanges(WKCookieManagerRef cookieManager)
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKDatabaseManager.cpp (169983 => 169984)
--- 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)
@@ -31,10 +31,6 @@
using namespace WebKit;
-#if ENABLE(SQL_DATABASE)
-typedef GenericAPICallback<WKArrayRef> ArrayAPICallback;
-#endif
-
WKTypeID WKDatabaseManagerGetTypeID()
{
#if ENABLE(SQL_DATABASE)
@@ -159,7 +155,7 @@
void WKDatabaseManagerGetDatabasesByOrigin(WKDatabaseManagerRef databaseManagerRef, void* context, WKDatabaseManagerGetDatabasesByOriginFunction callback)
{
#if ENABLE(SQL_DATABASE)
- toImpl(databaseManagerRef)->getDatabasesByOrigin(ArrayAPICallback::create(context, callback));
+ toImpl(databaseManagerRef)->getDatabasesByOrigin(ArrayCallback::create(toGenericCallbackFunction(context, callback)));
#else
UNUSED_PARAM(databaseManagerRef);
UNUSED_PARAM(context);
@@ -170,7 +166,7 @@
void WKDatabaseManagerGetDatabaseOrigins(WKDatabaseManagerRef databaseManagerRef, void* context, WKDatabaseManagerGetDatabaseOriginsFunction callback)
{
#if ENABLE(SQL_DATABASE)
- toImpl(databaseManagerRef)->getDatabaseOrigins(ArrayAPICallback::create(context, callback));
+ toImpl(databaseManagerRef)->getDatabaseOrigins(ArrayCallback::create(toGenericCallbackFunction(context, callback)));
#else
UNUSED_PARAM(databaseManagerRef);
UNUSED_PARAM(context);
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKFrame.cpp (169983 => 169984)
--- 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)
@@ -31,8 +31,6 @@
using namespace WebKit;
-typedef GenericAPICallback<WKDataRef> DataAPICallback;
-
WKTypeID WKFrameGetTypeID()
{
return toAPI(WebFrameProxy::APIType);
@@ -126,17 +124,17 @@
void WKFrameGetMainResourceData(WKFrameRef frameRef, WKFrameGetResourceDataFunction callback, void* context)
{
- toImpl(frameRef)->getMainResourceData(DataAPICallback::create(context, callback));
+ toImpl(frameRef)->getMainResourceData(DataCallback::create(toGenericCallbackFunction(context, callback)));
}
void WKFrameGetResourceData(WKFrameRef frameRef, WKURLRef resourceURL, WKFrameGetResourceDataFunction callback, void* context)
{
- toImpl(frameRef)->getResourceData(toImpl(resourceURL), DataAPICallback::create(context, callback));
+ toImpl(frameRef)->getResourceData(toImpl(resourceURL), DataCallback::create(toGenericCallbackFunction(context, callback)));
}
void WKFrameGetWebArchive(WKFrameRef frameRef, WKFrameGetWebArchiveFunction callback, void* context)
{
- toImpl(frameRef)->getWebArchive(DataAPICallback::create(context, callback));
+ toImpl(frameRef)->getWebArchive(DataCallback::create(toGenericCallbackFunction(context, callback)));
}
// NOTE: These are deprecated and should be removed. They currently do nothing.
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKKeyValueStorageManager.cpp (169983 => 169984)
--- 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)
@@ -31,8 +31,6 @@
using namespace WebKit;
-typedef GenericAPICallback<WKArrayRef> ArrayAPICallback;
-
WKTypeID WKKeyValueStorageManagerGetTypeID()
{
return toAPI(WebKeyValueStorageManager::APIType);
@@ -58,12 +56,12 @@
void WKKeyValueStorageManagerGetKeyValueStorageOrigins(WKKeyValueStorageManagerRef keyValueStorageManagerRef, void* context, WKKeyValueStorageManagerGetKeyValueStorageOriginsFunction callback)
{
- toImpl(keyValueStorageManagerRef)->getKeyValueStorageOrigins(ArrayAPICallback::create(context, callback));
+ toImpl(keyValueStorageManagerRef)->getKeyValueStorageOrigins(ArrayCallback::create(toGenericCallbackFunction(context, callback)));
}
void WKKeyValueStorageManagerGetStorageDetailsByOrigin(WKKeyValueStorageManagerRef keyValueStorageManagerRef, void* context, WKKeyValueStorageManagerGetStorageDetailsByOriginFunction callback)
{
- toImpl(keyValueStorageManagerRef)->getStorageDetailsByOrigin(ArrayAPICallback::create(context, callback));
+ toImpl(keyValueStorageManagerRef)->getStorageDetailsByOrigin(ArrayCallback::create(toGenericCallbackFunction(context, callback)));
}
void WKKeyValueStorageManagerDeleteEntriesForOrigin(WKKeyValueStorageManagerRef keyValueStorageManagerRef, WKSecurityOriginRef originRef)
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKMediaCacheManager.cpp (169983 => 169984)
--- 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)
@@ -31,8 +31,6 @@
using namespace WebKit;
-typedef GenericAPICallback<WKArrayRef> ArrayAPICallback;
-
WKTypeID WKMediaCacheManagerGetTypeID()
{
return toAPI(WebMediaCacheManagerProxy::APIType);
@@ -40,7 +38,7 @@
void WKMediaCacheManagerGetHostnamesWithMediaCache(WKMediaCacheManagerRef mediaCacheManagerRef, void* context, WKMediaCacheManagerGetHostnamesWithMediaCacheFunction callback)
{
- toImpl(mediaCacheManagerRef)->getHostnamesWithMediaCache(ArrayAPICallback::create(context, callback));
+ toImpl(mediaCacheManagerRef)->getHostnamesWithMediaCache(ArrayCallback::create(toGenericCallbackFunction(context, callback)));
}
void WKMediaCacheManagerClearCacheForHostname(WKMediaCacheManagerRef mediaCacheManagerRef, WKStringRef hostname)
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKOriginDataManager.cpp (169983 => 169984)
--- 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)
@@ -31,8 +31,6 @@
using namespace WebKit;
-typedef GenericAPICallback<WKArrayRef> ArrayAPICallback;
-
WKTypeID WKOriginDataManagerGetTypeID()
{
return toAPI(WebOriginDataManagerProxy::APIType);
@@ -40,7 +38,7 @@
void WKOriginDataManagerGetOrigins(WKOriginDataManagerRef originDataManagerRef, WKOriginDataTypes types, void* context, WKOriginDataManagerGetOriginsFunction callback)
{
- toImpl(originDataManagerRef)->getOrigins(types, ArrayAPICallback::create(context, callback));
+ toImpl(originDataManagerRef)->getOrigins(types, ArrayCallback::create(toGenericCallbackFunction(context, callback)));
}
void WKOriginDataManagerDeleteEntriesForOrigin(WKOriginDataManagerRef originDataManagerRef, WKOriginDataTypes types, WKSecurityOriginRef originRef)
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp (169983 => 169984)
--- 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)
@@ -77,10 +77,6 @@
}
-typedef GenericAPICallback<WKDataRef> DataAPICallback;
-typedef GenericAPICallback<WKStringRef, StringImpl*> StringAPICallback;
-typedef GenericAPICallback<WKSerializedScriptValueRef> ScriptValueAPICallback;
-
WKTypeID WKPageGetTypeID()
{
return toAPI(WebPageProxy::APIType);
@@ -1566,7 +1562,7 @@
void WKPageRunJavaScriptInMainFrame(WKPageRef pageRef, WKStringRef scriptRef, void* context, WKPageRunJavaScriptFunction callback)
{
- toImpl(pageRef)->runJavaScriptInMainFrame(toImpl(scriptRef)->string(), ScriptValueAPICallback::create(context, callback));
+ toImpl(pageRef)->runJavaScriptInMainFrame(toImpl(scriptRef)->string(), ScriptValueCallback::create(toGenericCallbackFunction(context, callback)));
}
#ifdef __BLOCKS__
@@ -1585,33 +1581,33 @@
void WKPageRenderTreeExternalRepresentation(WKPageRef pageRef, void* context, WKPageRenderTreeExternalRepresentationFunction callback)
{
- toImpl(pageRef)->getRenderTreeExternalRepresentation(StringAPICallback::create(context, callback));
+ toImpl(pageRef)->getRenderTreeExternalRepresentation(StringCallback::create(toGenericCallbackFunction<WKStringRef, StringImpl*>(context, callback)));
}
void WKPageGetSourceForFrame(WKPageRef pageRef, WKFrameRef frameRef, void* context, WKPageGetSourceForFrameFunction callback)
{
- toImpl(pageRef)->getSourceForFrame(toImpl(frameRef), StringAPICallback::create(context, callback));
+ toImpl(pageRef)->getSourceForFrame(toImpl(frameRef), StringCallback::create(toGenericCallbackFunction<WKStringRef, StringImpl*>(context, callback)));
}
void WKPageGetContentsAsString(WKPageRef pageRef, void* context, WKPageGetContentsAsStringFunction callback)
{
- toImpl(pageRef)->getContentsAsString(StringAPICallback::create(context, callback));
+ toImpl(pageRef)->getContentsAsString(StringCallback::create(toGenericCallbackFunction<WKStringRef, StringImpl*>(context, callback)));
}
void WKPageGetBytecodeProfile(WKPageRef pageRef, void* context, WKPageGetBytecodeProfileFunction callback)
{
- toImpl(pageRef)->getBytecodeProfile(StringAPICallback::create(context, callback));
+ toImpl(pageRef)->getBytecodeProfile(StringCallback::create(toGenericCallbackFunction<WKStringRef, StringImpl*>(context, callback)));
}
void WKPageGetSelectionAsWebArchiveData(WKPageRef pageRef, void* context, WKPageGetSelectionAsWebArchiveDataFunction callback)
{
- toImpl(pageRef)->getSelectionAsWebArchiveData(DataAPICallback::create(context, callback));
+ toImpl(pageRef)->getSelectionAsWebArchiveData(DataCallback::create(toGenericCallbackFunction(context, callback)));
}
void WKPageGetContentsAsMHTMLData(WKPageRef pageRef, bool useBinaryEncoding, void* context, WKPageGetContentsAsMHTMLDataFunction callback)
{
#if ENABLE(MHTML)
- toImpl(pageRef)->getContentsAsMHTMLData(DataAPICallback::create(context, callback), useBinaryEncoding);
+ toImpl(pageRef)->getContentsAsMHTMLData(DataCallback::create(toGenericCallbackFunction(context, callback)), useBinaryEncoding);
#else
UNUSED_PARAM(pageRef);
UNUSED_PARAM(useBinaryEncoding);
@@ -1694,7 +1690,7 @@
void WKPageDrawPagesToPDF(WKPageRef page, WKFrameRef frame, WKPrintInfo printInfo, uint32_t first, uint32_t count, WKPageDrawToPDFFunction callback, void* context)
{
- toImpl(page)->drawPagesToPDF(toImpl(frame), printInfoFromWKPrintInfo(printInfo), first, count, DataAPICallback::create(context, callback));
+ toImpl(page)->drawPagesToPDF(toImpl(frame), printInfoFromWKPrintInfo(printInfo), first, count, DataCallback::create(toGenericCallbackFunction(context, callback)));
}
void WKPageEndPrinting(WKPageRef page)
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPluginSiteDataManager.cpp (169983 => 169984)
--- 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)
@@ -36,10 +36,6 @@
using namespace WebKit;
-#if ENABLE(NETSCAPE_PLUGIN_API)
-typedef GenericAPICallback<WKArrayRef> ArrayAPICallback;
-#endif
-
WKTypeID WKPluginSiteDataManagerGetTypeID()
{
#if ENABLE(NETSCAPE_PLUGIN_API)
@@ -52,7 +48,7 @@
void WKPluginSiteDataManagerGetSitesWithData(WKPluginSiteDataManagerRef managerRef, void* context, WKPluginSiteDataManagerGetSitesWithDataFunction callback)
{
#if ENABLE(NETSCAPE_PLUGIN_API)
- toImpl(managerRef)->getSitesWithData(ArrayAPICallback::create(context, callback));
+ toImpl(managerRef)->getSitesWithData(ArrayCallback::create(toGenericCallbackFunction(context, callback)));
#else
UNUSED_PARAM(managerRef);
UNUSED_PARAM(context);
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKResourceCacheManager.cpp (169983 => 169984)
--- 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)
@@ -31,8 +31,6 @@
using namespace WebKit;
-typedef GenericAPICallback<WKArrayRef> ArrayAPICallback;
-
WKTypeID WKResourceCacheManagerGetTypeID()
{
return toAPI(WebResourceCacheManagerProxy::APIType);
@@ -40,7 +38,7 @@
void WKResourceCacheManagerGetCacheOrigins(WKResourceCacheManagerRef cacheManagerRef, void* context, WKResourceCacheManagerGetCacheOriginsFunction callback)
{
- toImpl(cacheManagerRef)->getCacheOrigins(ArrayAPICallback::create(context, callback));
+ toImpl(cacheManagerRef)->getCacheOrigins(ArrayCallback::create(toGenericCallbackFunction(context, callback)));
}
void WKResourceCacheManagerClearCacheForOrigin(WKResourceCacheManagerRef cacheManagerRef, WKSecurityOriginRef originRef, WKResourceCachesToClear cachesToClear)
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitCookieManager.cpp (169983 => 169984)
--- 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)
@@ -30,9 +30,6 @@
using namespace WebKit;
-typedef GenericAPICallback<WKArrayRef> ArrayAPICallback;
-typedef GenericAPICallback<WKHTTPCookieAcceptPolicy, HTTPCookieAcceptPolicy> HTTPCookieAcceptPolicyAPICallback;
-
/**
* SECTION: WebKitCookieManager
* @Short_description: Defines how to handle cookies in a #WebKitWebContext
@@ -214,7 +211,7 @@
g_return_if_fail(WEBKIT_IS_COOKIE_MANAGER(manager));
GTask* task = g_task_new(manager, cancellable, callback, userData);
- manager->priv->webCookieManager->getHTTPCookieAcceptPolicy(HTTPCookieAcceptPolicyAPICallback::create(task, webkitCookieManagerGetAcceptPolicyCallback));
+ manager->priv->webCookieManager->getHTTPCookieAcceptPolicy(HTTPCookieAcceptPolicyCallback::create(toGenericCallbackFunction<WKHTTPCookieAcceptPolicy, HTTPCookieAcceptPolicy>(task, webkitCookieManagerGetAcceptPolicyCallback)));
}
/**
@@ -272,7 +269,7 @@
g_return_if_fail(WEBKIT_IS_COOKIE_MANAGER(manager));
GTask* task = g_task_new(manager, cancellable, callback, userData);
- manager->priv->webCookieManager->getHostnamesWithCookies(ArrayAPICallback::create(task, webkitCookieManagerGetDomainsWithCookiesCallback));
+ manager->priv->webCookieManager->getHostnamesWithCookies(ArrayCallback::create(toGenericCallbackFunction(task, webkitCookieManagerGetDomainsWithCookiesCallback)));
}
/**
Modified: trunk/Source/WebKit2/UIProcess/GenericCallback.h (169983 => 169984)
--- 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)
@@ -169,18 +169,13 @@
};
template<typename APIReturnValueType, typename InternalReturnValueType = typename APITypeInfo<APIReturnValueType>::ImplType>
-class GenericAPICallback : public CallbackBase {
-public:
- typedef void (*CallbackFunction)(APIReturnValueType, WKErrorRef, void*);
+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);
+ };
+}
- 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);
- });
- }
-};
-
typedef GenericCallback<const Vector<WebCore::IntRect>&, double> ComputedPagesCallback;
typedef GenericCallback<const ShareableBitmap::Handle&> ImageCallback;
