<!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>[170000] 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/170000">170000</a></dd>
<dt>Author</dt> <dd>mitz@apple.com</dd>
<dt>Date</dt> <dd>2014-06-15 21:09:25 -0700 (Sun, 15 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Part 1 of Change GenericCallback<> function parameters into std::function<>
https://bugs.webkit.org/show_bug.cgi?id=133927
Reviewed by Sam Weinig.
* 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/WKPluginSiteDataManager.cpp:
(WKPluginSiteDataManagerGetSitesWithData):
* UIProcess/API/C/WKResourceCacheManager.cpp:
(WKResourceCacheManagerGetCacheOrigins):
* UIProcess/API/Cocoa/WKWebView.mm:
(-[WKWebView _getWebArchiveDataWithCompletionHandler:]):
* UIProcess/API/mac/WKView.mm:
(-[WKView attributedSubstringForProposedRange:completionHandler:]):
* UIProcess/Plugins/WebPluginSiteDataManager.cpp:
(WebKit::WebPluginSiteDataManager::getSitesWithData):
* UIProcess/Plugins/WebPluginSiteDataManager.h:
* UIProcess/WebApplicationCacheManagerProxy.cpp:
(WebKit::WebApplicationCacheManagerProxy::getApplicationCacheOrigins):
* UIProcess/WebApplicationCacheManagerProxy.h:
* UIProcess/WebContext.cpp:
(WebKit::WebContext::getStatistics):
* UIProcess/WebContext.h:
* UIProcess/WebCookieManagerProxy.cpp:
(WebKit::WebCookieManagerProxy::getHostnamesWithCookies):
(WebKit::WebCookieManagerProxy::getHTTPCookieAcceptPolicy):
* UIProcess/WebCookieManagerProxy.h:
* UIProcess/WebDatabaseManagerProxy.cpp:
(WebKit::WebDatabaseManagerProxy::getDatabasesByOrigin):
(WebKit::WebDatabaseManagerProxy::getDatabaseOrigins):
* UIProcess/WebDatabaseManagerProxy.h:
* UIProcess/WebFrameProxy.cpp:
(WebKit::WebFrameProxy::getWebArchive):
(WebKit::WebFrameProxy::getMainResourceData):
(WebKit::WebFrameProxy::getResourceData):
* UIProcess/WebFrameProxy.h:
* UIProcess/WebKeyValueStorageManager.cpp:
(WebKit::WebKeyValueStorageManager::getKeyValueStorageOrigins):
(WebKit::WebKeyValueStorageManager::getStorageDetailsByOrigin):
* UIProcess/WebKeyValueStorageManager.h:
* UIProcess/WebMediaCacheManagerProxy.cpp:
(WebKit::WebMediaCacheManagerProxy::getHostnamesWithMediaCache):
* UIProcess/WebMediaCacheManagerProxy.h:
* UIProcess/WebOriginDataManagerProxy.cpp:
(WebKit::WebOriginDataManagerProxy::getOrigins):
* UIProcess/WebOriginDataManagerProxy.h:
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::getMainResourceDataOfFrame):
(WebKit::WebPageProxy::getResourceDataFromFrame):
(WebKit::WebPageProxy::getWebArchiveOfFrame):
* UIProcess/WebPageProxy.h:
* UIProcess/WebResourceCacheManagerProxy.cpp:
(WebKit::WebResourceCacheManagerProxy::getCacheOrigins):
* UIProcess/WebResourceCacheManagerProxy.h:
* UIProcess/ios/WKContentViewInteraction.mm:
(-[WKContentView changeSelectionWithGestureAt:withGesture:withState:]):
(-[WKContentView changeSelectionWithTouchesFrom:to:withGesture:withState:]):
* UIProcess/ios/WebPageProxyIOS.mm:
(WebKit::WebPageProxy::selectWithGesture):
(WebKit::WebPageProxy::selectWithTwoTouches):
* UIProcess/mac/WebPageProxyMac.mm:
(WebKit::WebPageProxy::attributedSubstringForCharacterRangeAsync):</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="#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="#trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPImacWKViewmm">trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessPluginsWebPluginSiteDataManagercpp">trunk/Source/WebKit2/UIProcess/Plugins/WebPluginSiteDataManager.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessPluginsWebPluginSiteDataManagerh">trunk/Source/WebKit2/UIProcess/Plugins/WebPluginSiteDataManager.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebApplicationCacheManagerProxycpp">trunk/Source/WebKit2/UIProcess/WebApplicationCacheManagerProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebApplicationCacheManagerProxyh">trunk/Source/WebKit2/UIProcess/WebApplicationCacheManagerProxy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebContextcpp">trunk/Source/WebKit2/UIProcess/WebContext.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebContexth">trunk/Source/WebKit2/UIProcess/WebContext.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebCookieManagerProxycpp">trunk/Source/WebKit2/UIProcess/WebCookieManagerProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebCookieManagerProxyh">trunk/Source/WebKit2/UIProcess/WebCookieManagerProxy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebDatabaseManagerProxycpp">trunk/Source/WebKit2/UIProcess/WebDatabaseManagerProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebDatabaseManagerProxyh">trunk/Source/WebKit2/UIProcess/WebDatabaseManagerProxy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebFrameProxycpp">trunk/Source/WebKit2/UIProcess/WebFrameProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebFrameProxyh">trunk/Source/WebKit2/UIProcess/WebFrameProxy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebKeyValueStorageManagercpp">trunk/Source/WebKit2/UIProcess/WebKeyValueStorageManager.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebKeyValueStorageManagerh">trunk/Source/WebKit2/UIProcess/WebKeyValueStorageManager.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebMediaCacheManagerProxycpp">trunk/Source/WebKit2/UIProcess/WebMediaCacheManagerProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebMediaCacheManagerProxyh">trunk/Source/WebKit2/UIProcess/WebMediaCacheManagerProxy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebOriginDataManagerProxycpp">trunk/Source/WebKit2/UIProcess/WebOriginDataManagerProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebOriginDataManagerProxyh">trunk/Source/WebKit2/UIProcess/WebOriginDataManagerProxy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxycpp">trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxyh">trunk/Source/WebKit2/UIProcess/WebPageProxy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebResourceCacheManagerProxycpp">trunk/Source/WebKit2/UIProcess/WebResourceCacheManagerProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebResourceCacheManagerProxyh">trunk/Source/WebKit2/UIProcess/WebResourceCacheManagerProxy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessiosWKContentViewInteractionmm">trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessiosWebPageProxyIOSmm">trunk/Source/WebKit2/UIProcess/ios/WebPageProxyIOS.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacWebPageProxyMacmm">trunk/Source/WebKit2/UIProcess/mac/WebPageProxyMac.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (169999 => 170000)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-06-16 04:08:53 UTC (rev 169999)
+++ trunk/Source/WebKit2/ChangeLog 2014-06-16 04:09:25 UTC (rev 170000)
</span><span class="lines">@@ -1,5 +1,91 @@
</span><span class="cx"> 2014-06-15 Dan Bernstein <mitz@apple.com>
</span><span class="cx">
</span><ins>+ Part 1 of Change GenericCallback<> function parameters into std::function<>
+ https://bugs.webkit.org/show_bug.cgi?id=133927
+
+ Reviewed by Sam Weinig.
+
+ * 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/WKPluginSiteDataManager.cpp:
+ (WKPluginSiteDataManagerGetSitesWithData):
+ * UIProcess/API/C/WKResourceCacheManager.cpp:
+ (WKResourceCacheManagerGetCacheOrigins):
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView _getWebArchiveDataWithCompletionHandler:]):
+ * UIProcess/API/mac/WKView.mm:
+ (-[WKView attributedSubstringForProposedRange:completionHandler:]):
+ * UIProcess/Plugins/WebPluginSiteDataManager.cpp:
+ (WebKit::WebPluginSiteDataManager::getSitesWithData):
+ * UIProcess/Plugins/WebPluginSiteDataManager.h:
+ * UIProcess/WebApplicationCacheManagerProxy.cpp:
+ (WebKit::WebApplicationCacheManagerProxy::getApplicationCacheOrigins):
+ * UIProcess/WebApplicationCacheManagerProxy.h:
+ * UIProcess/WebContext.cpp:
+ (WebKit::WebContext::getStatistics):
+ * UIProcess/WebContext.h:
+ * UIProcess/WebCookieManagerProxy.cpp:
+ (WebKit::WebCookieManagerProxy::getHostnamesWithCookies):
+ (WebKit::WebCookieManagerProxy::getHTTPCookieAcceptPolicy):
+ * UIProcess/WebCookieManagerProxy.h:
+ * UIProcess/WebDatabaseManagerProxy.cpp:
+ (WebKit::WebDatabaseManagerProxy::getDatabasesByOrigin):
+ (WebKit::WebDatabaseManagerProxy::getDatabaseOrigins):
+ * UIProcess/WebDatabaseManagerProxy.h:
+ * UIProcess/WebFrameProxy.cpp:
+ (WebKit::WebFrameProxy::getWebArchive):
+ (WebKit::WebFrameProxy::getMainResourceData):
+ (WebKit::WebFrameProxy::getResourceData):
+ * UIProcess/WebFrameProxy.h:
+ * UIProcess/WebKeyValueStorageManager.cpp:
+ (WebKit::WebKeyValueStorageManager::getKeyValueStorageOrigins):
+ (WebKit::WebKeyValueStorageManager::getStorageDetailsByOrigin):
+ * UIProcess/WebKeyValueStorageManager.h:
+ * UIProcess/WebMediaCacheManagerProxy.cpp:
+ (WebKit::WebMediaCacheManagerProxy::getHostnamesWithMediaCache):
+ * UIProcess/WebMediaCacheManagerProxy.h:
+ * UIProcess/WebOriginDataManagerProxy.cpp:
+ (WebKit::WebOriginDataManagerProxy::getOrigins):
+ * UIProcess/WebOriginDataManagerProxy.h:
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::getMainResourceDataOfFrame):
+ (WebKit::WebPageProxy::getResourceDataFromFrame):
+ (WebKit::WebPageProxy::getWebArchiveOfFrame):
+ * UIProcess/WebPageProxy.h:
+ * UIProcess/WebResourceCacheManagerProxy.cpp:
+ (WebKit::WebResourceCacheManagerProxy::getCacheOrigins):
+ * UIProcess/WebResourceCacheManagerProxy.h:
+ * UIProcess/ios/WKContentViewInteraction.mm:
+ (-[WKContentView changeSelectionWithGestureAt:withGesture:withState:]):
+ (-[WKContentView changeSelectionWithTouchesFrom:to:withGesture:withState:]):
+ * UIProcess/ios/WebPageProxyIOS.mm:
+ (WebKit::WebPageProxy::selectWithGesture):
+ (WebKit::WebPageProxy::selectWithTwoTouches):
+ * UIProcess/mac/WebPageProxyMac.mm:
+ (WebKit::WebPageProxy::attributedSubstringForCharacterRangeAsync):
+
+2014-06-15 Dan Bernstein <mitz@apple.com>
+
</ins><span class="cx"> <rdar://problem/17291697> [Cocoa] Can’t tell at policy decision time whether WebKit can handle the request
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=133930
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKApplicationCacheManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKApplicationCacheManager.cpp (169999 => 170000)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKApplicationCacheManager.cpp 2014-06-16 04:08:53 UTC (rev 169999)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKApplicationCacheManager.cpp 2014-06-16 04:09:25 UTC (rev 170000)
</span><span class="lines">@@ -38,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(ArrayCallback::create(toGenericCallbackFunction(context, callback)));
</del><ins>+ toImpl(applicationCacheManagerRef)->getApplicationCacheOrigins(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 (169999 => 170000)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKContext.cpp 2014-06-16 04:08:53 UTC (rev 169999)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKContext.cpp 2014-06-16 04:09:25 UTC (rev 170000)
</span><span class="lines">@@ -517,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, DictionaryCallback::create(toGenericCallbackFunction(context, callback)));
</del><ins>+ toImpl(contextRef)->getStatistics(0xFFFFFFFF, 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, DictionaryCallback::create(toGenericCallbackFunction(context, callback)));
</del><ins>+ toImpl(contextRef)->getStatistics(optionsMask, 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 (169999 => 170000)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKCookieManager.cpp 2014-06-16 04:08:53 UTC (rev 169999)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKCookieManager.cpp 2014-06-16 04:09:25 UTC (rev 170000)
</span><span class="lines">@@ -43,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(ArrayCallback::create(toGenericCallbackFunction(context, callback)));
</del><ins>+ toImpl(cookieManagerRef)->getHostnamesWithCookies(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">@@ -68,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(HTTPCookieAcceptPolicyCallback::create(toGenericCallbackFunction<WKHTTPCookieAcceptPolicy, HTTPCookieAcceptPolicy>(context, callback)));
</del><ins>+ toImpl(cookieManager)->getHTTPCookieAcceptPolicy(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 (169999 => 170000)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKDatabaseManager.cpp 2014-06-16 04:08:53 UTC (rev 169999)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKDatabaseManager.cpp 2014-06-16 04:09:25 UTC (rev 170000)
</span><span class="lines">@@ -155,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(ArrayCallback::create(toGenericCallbackFunction(context, callback)));
</del><ins>+ toImpl(databaseManagerRef)->getDatabasesByOrigin(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">@@ -166,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(ArrayCallback::create(toGenericCallbackFunction(context, callback)));
</del><ins>+ toImpl(databaseManagerRef)->getDatabaseOrigins(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 (169999 => 170000)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKFrame.cpp 2014-06-16 04:08:53 UTC (rev 169999)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKFrame.cpp 2014-06-16 04:09:25 UTC (rev 170000)
</span><span class="lines">@@ -124,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(DataCallback::create(toGenericCallbackFunction(context, callback)));
</del><ins>+ toImpl(frameRef)->getMainResourceData(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), DataCallback::create(toGenericCallbackFunction(context, callback)));
</del><ins>+ toImpl(frameRef)->getResourceData(toImpl(resourceURL), 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(DataCallback::create(toGenericCallbackFunction(context, callback)));
</del><ins>+ toImpl(frameRef)->getWebArchive(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 (169999 => 170000)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKKeyValueStorageManager.cpp 2014-06-16 04:08:53 UTC (rev 169999)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKKeyValueStorageManager.cpp 2014-06-16 04:09:25 UTC (rev 170000)
</span><span class="lines">@@ -56,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(ArrayCallback::create(toGenericCallbackFunction(context, callback)));
</del><ins>+ toImpl(keyValueStorageManagerRef)->getKeyValueStorageOrigins(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(ArrayCallback::create(toGenericCallbackFunction(context, callback)));
</del><ins>+ toImpl(keyValueStorageManagerRef)->getStorageDetailsByOrigin(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 (169999 => 170000)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKMediaCacheManager.cpp 2014-06-16 04:08:53 UTC (rev 169999)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKMediaCacheManager.cpp 2014-06-16 04:09:25 UTC (rev 170000)
</span><span class="lines">@@ -38,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(ArrayCallback::create(toGenericCallbackFunction(context, callback)));
</del><ins>+ toImpl(mediaCacheManagerRef)->getHostnamesWithMediaCache(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 (169999 => 170000)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKOriginDataManager.cpp 2014-06-16 04:08:53 UTC (rev 169999)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKOriginDataManager.cpp 2014-06-16 04:09:25 UTC (rev 170000)
</span><span class="lines">@@ -38,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, ArrayCallback::create(toGenericCallbackFunction(context, callback)));
</del><ins>+ toImpl(originDataManagerRef)->getOrigins(types, 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="trunkSourceWebKit2UIProcessAPICWKPluginSiteDataManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPluginSiteDataManager.cpp (169999 => 170000)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKPluginSiteDataManager.cpp 2014-06-16 04:08:53 UTC (rev 169999)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPluginSiteDataManager.cpp 2014-06-16 04:09:25 UTC (rev 170000)
</span><span class="lines">@@ -48,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(ArrayCallback::create(toGenericCallbackFunction(context, callback)));
</del><ins>+ toImpl(managerRef)->getSitesWithData(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 (169999 => 170000)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKResourceCacheManager.cpp 2014-06-16 04:08:53 UTC (rev 169999)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKResourceCacheManager.cpp 2014-06-16 04:09:25 UTC (rev 170000)
</span><span class="lines">@@ -38,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(ArrayCallback::create(toGenericCallbackFunction(context, callback)));
</del><ins>+ toImpl(cacheManagerRef)->getCacheOrigins(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="trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (169999 => 170000)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2014-06-16 04:08:53 UTC (rev 169999)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2014-06-16 04:09:25 UTC (rev 170000)
</span><span class="lines">@@ -1520,7 +1520,7 @@
</span><span class="cx"> {
</span><span class="cx"> auto handler = adoptNS([completionHandler copy]);
</span><span class="cx">
</span><del>- _page->getWebArchiveOfFrame(_page->mainFrame(), WebKit::DataCallback::create([handler](API::Data* data, WebKit::CallbackBase::Error error) {
</del><ins>+ _page->getWebArchiveOfFrame(_page->mainFrame(), [handler](API::Data* data, WebKit::CallbackBase::Error error) {
</ins><span class="cx"> void (^completionHandlerBlock)(NSData *, NSError *) = (void (^)(NSData *, NSError *))handler.get();
</span><span class="cx"> if (error != WebKit::CallbackBase::Error::None) {
</span><span class="cx"> // FIXME: Pipe a proper error in from the WebPageProxy.
</span><span class="lines">@@ -1528,7 +1528,7 @@
</span><span class="cx"> completionHandlerBlock(nil, error.get());
</span><span class="cx"> } else
</span><span class="cx"> completionHandlerBlock(wrapper(*data), nil);
</span><del>- }));
</del><ins>+ });
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (_WKPaginationMode)_paginationMode
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPImacWKViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm (169999 => 170000)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm 2014-06-16 04:08:53 UTC (rev 169999)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm 2014-06-16 04:09:25 UTC (rev 170000)
</span><span class="lines">@@ -1524,7 +1524,7 @@
</span><span class="cx"> RetainPtr<id> completionHandler = adoptNS([completionHandlerPtr copy]);
</span><span class="cx">
</span><span class="cx"> LOG(TextInput, "attributedSubstringFromRange:(%u, %u)", nsRange.location, nsRange.length);
</span><del>- _data->_page->attributedSubstringForCharacterRangeAsync(nsRange, AttributedStringForCharacterRangeCallback::create([completionHandler](const AttributedString& string, const EditingRange& actualRange, CallbackBase::Error error) {
</del><ins>+ _data->_page->attributedSubstringForCharacterRangeAsync(nsRange, [completionHandler](const AttributedString& string, const EditingRange& actualRange, CallbackBase::Error error) {
</ins><span class="cx"> void (^completionHandlerBlock)(NSAttributedString *, NSRange) = (void (^)(NSAttributedString *, NSRange))completionHandler.get();
</span><span class="cx"> if (error != CallbackBase::Error::None) {
</span><span class="cx"> LOG(TextInput, " ...attributedSubstringFromRange failed.");
</span><span class="lines">@@ -1533,7 +1533,7 @@
</span><span class="cx"> }
</span><span class="cx"> LOG(TextInput, " -> attributedSubstringFromRange returned %@", [string.string.get() string]);
</span><span class="cx"> completionHandlerBlock([[string.string.get() retain] autorelease], actualRange);
</span><del>- }));
</del><ins>+ });
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)firstRectForCharacterRange:(NSRange)theRange completionHandler:(void(^)(NSRect firstRect, NSRange actualRange))completionHandlerPtr
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessPluginsWebPluginSiteDataManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Plugins/WebPluginSiteDataManager.cpp (169999 => 170000)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Plugins/WebPluginSiteDataManager.cpp 2014-06-16 04:08:53 UTC (rev 169999)
+++ trunk/Source/WebKit2/UIProcess/Plugins/WebPluginSiteDataManager.cpp 2014-06-16 04:09:25 UTC (rev 170000)
</span><span class="lines">@@ -138,9 +138,9 @@
</span><span class="cx"> m_pendingClearSiteData.clear();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPluginSiteDataManager::getSitesWithData(PassRefPtr<ArrayCallback> prpCallback)
</del><ins>+void WebPluginSiteDataManager::getSitesWithData(std::function<void (API::Array*, CallbackBase::Error)> callbackFunction)
</ins><span class="cx"> {
</span><del>- RefPtr<ArrayCallback> callback = prpCallback;
</del><ins>+ RefPtr<ArrayCallback> callback = ArrayCallback::create(std::move(callbackFunction));
</ins><span class="cx">
</span><span class="cx"> if (!m_webContext) {
</span><span class="cx"> callback->invalidate();
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessPluginsWebPluginSiteDataManagerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Plugins/WebPluginSiteDataManager.h (169999 => 170000)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Plugins/WebPluginSiteDataManager.h 2014-06-16 04:08:53 UTC (rev 169999)
+++ trunk/Source/WebKit2/UIProcess/Plugins/WebPluginSiteDataManager.h 2014-06-16 04:09:25 UTC (rev 170000)
</span><span class="lines">@@ -50,7 +50,7 @@
</span><span class="cx"> void invalidate();
</span><span class="cx"> void clearContext() { m_webContext = 0; }
</span><span class="cx">
</span><del>- void getSitesWithData(PassRefPtr<ArrayCallback>);
</del><ins>+ void getSitesWithData(std::function<void (API::Array*, CallbackBase::Error)>);
</ins><span class="cx"> void didGetSitesWithData(const Vector<String>& sites, uint64_t callbackID);
</span><span class="cx">
</span><span class="cx"> void clearSiteData(API::Array* sites, uint64_t flags, uint64_t maxAgeInSeconds, PassRefPtr<VoidCallback>);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebApplicationCacheManagerProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebApplicationCacheManagerProxy.cpp (169999 => 170000)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebApplicationCacheManagerProxy.cpp 2014-06-16 04:08:53 UTC (rev 169999)
+++ trunk/Source/WebKit2/UIProcess/WebApplicationCacheManagerProxy.cpp 2014-06-16 04:09:25 UTC (rev 170000)
</span><span class="lines">@@ -80,13 +80,15 @@
</span><span class="cx"> API::Object::deref();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebApplicationCacheManagerProxy::getApplicationCacheOrigins(PassRefPtr<ArrayCallback> prpCallback)
</del><ins>+void WebApplicationCacheManagerProxy::getApplicationCacheOrigins(std::function<void (API::Array*, CallbackBase::Error)> callbackFunction)
</ins><span class="cx"> {
</span><del>- if (!context())
</del><ins>+ RefPtr<ArrayCallback> callback = ArrayCallback::create(std::move(callbackFunction));
+
+ if (!context()) {
+ callback->invalidate();
</ins><span class="cx"> return;
</span><ins>+ }
</ins><span class="cx">
</span><del>- RefPtr<ArrayCallback> callback = prpCallback;
-
</del><span class="cx"> uint64_t callbackID = callback->callbackID();
</span><span class="cx"> m_arrayCallbacks.set(callbackID, callback.release());
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebApplicationCacheManagerProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebApplicationCacheManagerProxy.h (169999 => 170000)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebApplicationCacheManagerProxy.h 2014-06-16 04:08:53 UTC (rev 169999)
+++ trunk/Source/WebKit2/UIProcess/WebApplicationCacheManagerProxy.h 2014-06-16 04:09:25 UTC (rev 170000)
</span><span class="lines">@@ -52,7 +52,7 @@
</span><span class="cx"> static PassRefPtr<WebApplicationCacheManagerProxy> create(WebContext*);
</span><span class="cx"> virtual ~WebApplicationCacheManagerProxy();
</span><span class="cx">
</span><del>- void getApplicationCacheOrigins(PassRefPtr<ArrayCallback>);
</del><ins>+ void getApplicationCacheOrigins(std::function<void (API::Array*, CallbackBase::Error)>);
</ins><span class="cx"> void deleteEntriesForOrigin(WebSecurityOrigin*);
</span><span class="cx"> void deleteAllEntries();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebContext.cpp (169999 => 170000)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebContext.cpp 2014-06-16 04:08:53 UTC (rev 169999)
+++ trunk/Source/WebKit2/UIProcess/WebContext.cpp 2014-06-16 04:09:25 UTC (rev 170000)
</span><span class="lines">@@ -1216,14 +1216,14 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebContext::getStatistics(uint32_t statisticsMask, PassRefPtr<DictionaryCallback> callback)
</del><ins>+void WebContext::getStatistics(uint32_t statisticsMask, std::function<void (ImmutableDictionary*, CallbackBase::Error)> callbackFunction)
</ins><span class="cx"> {
</span><span class="cx"> if (!statisticsMask) {
</span><del>- callback->invalidate();
</del><ins>+ callbackFunction(nullptr, CallbackBase::Error::Unknown);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- RefPtr<StatisticsRequest> request = StatisticsRequest::create(callback);
</del><ins>+ RefPtr<StatisticsRequest> request = StatisticsRequest::create(DictionaryCallback::create(std::move(callbackFunction)));
</ins><span class="cx">
</span><span class="cx"> if (statisticsMask & StatisticsRequestTypeWebContent)
</span><span class="cx"> requestWebContentStatistics(request.get());
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebContexth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebContext.h (169999 => 170000)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebContext.h 2014-06-16 04:08:53 UTC (rev 169999)
+++ trunk/Source/WebKit2/UIProcess/WebContext.h 2014-06-16 04:09:25 UTC (rev 170000)
</span><span class="lines">@@ -267,7 +267,7 @@
</span><span class="cx"> void setHTTPPipeliningEnabled(bool);
</span><span class="cx"> bool httpPipeliningEnabled() const;
</span><span class="cx">
</span><del>- void getStatistics(uint32_t statisticsMask, PassRefPtr<DictionaryCallback>);
</del><ins>+ void getStatistics(uint32_t statisticsMask, std::function<void (ImmutableDictionary*, CallbackBase::Error)>);
</ins><span class="cx">
</span><span class="cx"> void garbageCollectJavaScriptObjects();
</span><span class="cx"> void setJavaScriptGarbageCollectorTimerEnabled(bool flag);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebCookieManagerProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebCookieManagerProxy.cpp (169999 => 170000)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebCookieManagerProxy.cpp 2014-06-16 04:08:53 UTC (rev 169999)
+++ trunk/Source/WebKit2/UIProcess/WebCookieManagerProxy.cpp 2014-06-16 04:09:25 UTC (rev 170000)
</span><span class="lines">@@ -99,9 +99,9 @@
</span><span class="cx"> API::Object::deref();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebCookieManagerProxy::getHostnamesWithCookies(PassRefPtr<ArrayCallback> prpCallback)
</del><ins>+void WebCookieManagerProxy::getHostnamesWithCookies(std::function<void (API::Array*, CallbackBase::Error)> callbackFunction)
</ins><span class="cx"> {
</span><del>- RefPtr<ArrayCallback> callback = prpCallback;
</del><ins>+ RefPtr<ArrayCallback> callback = ArrayCallback::create(std::move(callbackFunction));
</ins><span class="cx"> uint64_t callbackID = callback->callbackID();
</span><span class="cx"> m_arrayCallbacks.set(callbackID, callback.release());
</span><span class="cx">
</span><span class="lines">@@ -161,9 +161,9 @@
</span><span class="cx"> context()->sendToNetworkingProcessRelaunchingIfNecessary(Messages::WebCookieManager::SetHTTPCookieAcceptPolicy(policy));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebCookieManagerProxy::getHTTPCookieAcceptPolicy(PassRefPtr<HTTPCookieAcceptPolicyCallback> prpCallback)
</del><ins>+void WebCookieManagerProxy::getHTTPCookieAcceptPolicy(std::function<void (HTTPCookieAcceptPolicy, CallbackBase::Error)> callbackFunction)
</ins><span class="cx"> {
</span><del>- RefPtr<HTTPCookieAcceptPolicyCallback> callback = prpCallback;
</del><ins>+ RefPtr<HTTPCookieAcceptPolicyCallback> callback = HTTPCookieAcceptPolicyCallback::create(std::move(callbackFunction));
</ins><span class="cx">
</span><span class="cx"> uint64_t callbackID = callback->callbackID();
</span><span class="cx"> m_httpCookieAcceptPolicyCallbacks.set(callbackID, callback.release());
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebCookieManagerProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebCookieManagerProxy.h (169999 => 170000)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebCookieManagerProxy.h 2014-06-16 04:08:53 UTC (rev 169999)
+++ trunk/Source/WebKit2/UIProcess/WebCookieManagerProxy.h 2014-06-16 04:09:25 UTC (rev 170000)
</span><span class="lines">@@ -60,13 +60,13 @@
</span><span class="cx">
</span><span class="cx"> void initializeClient(const WKCookieManagerClientBase*);
</span><span class="cx">
</span><del>- void getHostnamesWithCookies(PassRefPtr<ArrayCallback>);
</del><ins>+ void getHostnamesWithCookies(std::function<void (API::Array*, CallbackBase::Error)>);
</ins><span class="cx"> void deleteCookiesForHostname(const String& hostname);
</span><span class="cx"> void deleteAllCookies();
</span><span class="cx"> void deleteAllCookiesModifiedAfterDate(double);
</span><span class="cx">
</span><span class="cx"> void setHTTPCookieAcceptPolicy(HTTPCookieAcceptPolicy);
</span><del>- void getHTTPCookieAcceptPolicy(PassRefPtr<HTTPCookieAcceptPolicyCallback>);
</del><ins>+ void getHTTPCookieAcceptPolicy(std::function<void (HTTPCookieAcceptPolicy, CallbackBase::Error)>);
</ins><span class="cx">
</span><span class="cx"> void startObservingCookieChanges();
</span><span class="cx"> void stopObservingCookieChanges();
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebDatabaseManagerProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebDatabaseManagerProxy.cpp (169999 => 170000)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebDatabaseManagerProxy.cpp 2014-06-16 04:08:53 UTC (rev 169999)
+++ trunk/Source/WebKit2/UIProcess/WebDatabaseManagerProxy.cpp 2014-06-16 04:09:25 UTC (rev 170000)
</span><span class="lines">@@ -152,9 +152,9 @@
</span><span class="cx"> API::Object::deref();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebDatabaseManagerProxy::getDatabasesByOrigin(PassRefPtr<ArrayCallback> prpCallback)
</del><ins>+void WebDatabaseManagerProxy::getDatabasesByOrigin(std::function<void (API::Array*, CallbackBase::Error)> callbackFunction)
</ins><span class="cx"> {
</span><del>- RefPtr<ArrayCallback> callback = prpCallback;
</del><ins>+ RefPtr<ArrayCallback> callback = ArrayCallback::create(std::move(callbackFunction));
</ins><span class="cx"> uint64_t callbackID = callback->callbackID();
</span><span class="cx"> m_arrayCallbacks.set(callbackID, callback.release());
</span><span class="cx">
</span><span class="lines">@@ -205,9 +205,9 @@
</span><span class="cx"> callback->performCallbackWithReturnValue(API::Array::create(std::move(result)).get());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebDatabaseManagerProxy::getDatabaseOrigins(PassRefPtr<ArrayCallback> prpCallback)
</del><ins>+void WebDatabaseManagerProxy::getDatabaseOrigins(std::function<void (API::Array*, CallbackBase::Error)> callbackFunction)
</ins><span class="cx"> {
</span><del>- RefPtr<ArrayCallback> callback = prpCallback;
</del><ins>+ RefPtr<ArrayCallback> callback = ArrayCallback::create(std::move(callbackFunction));
</ins><span class="cx"> uint64_t callbackID = callback->callbackID();
</span><span class="cx"> m_arrayCallbacks.set(callbackID, callback.release());
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebDatabaseManagerProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebDatabaseManagerProxy.h (169999 => 170000)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebDatabaseManagerProxy.h 2014-06-16 04:08:53 UTC (rev 169999)
+++ trunk/Source/WebKit2/UIProcess/WebDatabaseManagerProxy.h 2014-06-16 04:09:25 UTC (rev 170000)
</span><span class="lines">@@ -55,8 +55,8 @@
</span><span class="cx">
</span><span class="cx"> void initializeClient(const WKDatabaseManagerClientBase*);
</span><span class="cx">
</span><del>- void getDatabasesByOrigin(PassRefPtr<ArrayCallback>);
- void getDatabaseOrigins(PassRefPtr<ArrayCallback>);
</del><ins>+ void getDatabasesByOrigin(std::function<void (API::Array*, CallbackBase::Error)>);
+ void getDatabaseOrigins(std::function<void (API::Array*, CallbackBase::Error)>);
</ins><span class="cx"> void deleteDatabaseWithNameForOrigin(const String& databaseIdentifier, WebSecurityOrigin*);
</span><span class="cx"> void deleteDatabasesForOrigin(WebSecurityOrigin*);
</span><span class="cx"> void deleteAllDatabases();
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebFrameProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebFrameProxy.cpp (169999 => 170000)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebFrameProxy.cpp 2014-06-16 04:08:53 UTC (rev 169999)
+++ trunk/Source/WebKit2/UIProcess/WebFrameProxy.cpp 2014-06-16 04:09:25 UTC (rev 170000)
</span><span class="lines">@@ -195,34 +195,34 @@
</span><span class="cx"> return static_cast<WebFormSubmissionListenerProxy*>(m_activeListener.get());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebFrameProxy::getWebArchive(PassRefPtr<DataCallback> callback)
</del><ins>+void WebFrameProxy::getWebArchive(std::function<void (API::Data*, CallbackBase::Error)> callbackFunction)
</ins><span class="cx"> {
</span><span class="cx"> if (!m_page) {
</span><del>- callback->invalidate();
</del><ins>+ callbackFunction(nullptr, CallbackBase::Error::Unknown);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- m_page->getWebArchiveOfFrame(this, callback);
</del><ins>+ m_page->getWebArchiveOfFrame(this, callbackFunction);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void WebFrameProxy::getMainResourceData(PassRefPtr<DataCallback> callback)
</del><ins>+void WebFrameProxy::getMainResourceData(std::function<void (API::Data*, CallbackBase::Error)> callbackFunction)
</ins><span class="cx"> {
</span><span class="cx"> if (!m_page) {
</span><del>- callback->invalidate();
</del><ins>+ callbackFunction(nullptr, CallbackBase::Error::Unknown);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- m_page->getMainResourceDataOfFrame(this, callback);
</del><ins>+ m_page->getMainResourceDataOfFrame(this, callbackFunction);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void WebFrameProxy::getResourceData(API::URL* resourceURL, PassRefPtr<DataCallback> callback)
</del><ins>+void WebFrameProxy::getResourceData(API::URL* resourceURL, std::function<void (API::Data*, CallbackBase::Error)> callbackFunction)
</ins><span class="cx"> {
</span><span class="cx"> if (!m_page) {
</span><del>- callback->invalidate();
</del><ins>+ callbackFunction(nullptr, CallbackBase::Error::Unknown);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- m_page->getResourceDataFromFrame(this, resourceURL, callback);
</del><ins>+ m_page->getResourceDataFromFrame(this, resourceURL, callbackFunction);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebFrameProxy::setUnreachableURL(const String& unreachableURL)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebFrameProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebFrameProxy.h (169999 => 170000)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebFrameProxy.h 2014-06-16 04:08:53 UTC (rev 169999)
+++ trunk/Source/WebKit2/UIProcess/WebFrameProxy.h 2014-06-16 04:09:25 UTC (rev 170000)
</span><span class="lines">@@ -95,9 +95,9 @@
</span><span class="cx"> bool isDisplayingMarkupDocument() const;
</span><span class="cx"> bool isDisplayingPDFDocument() const;
</span><span class="cx">
</span><del>- void getWebArchive(PassRefPtr<DataCallback>);
- void getMainResourceData(PassRefPtr<DataCallback>);
- void getResourceData(API::URL*, PassRefPtr<DataCallback>);
</del><ins>+ void getWebArchive(std::function<void (API::Data*, CallbackBase::Error)>);
+ void getMainResourceData(std::function<void (API::Data*, CallbackBase::Error)>);
+ void getResourceData(API::URL*, std::function<void (API::Data*, CallbackBase::Error)>);
</ins><span class="cx">
</span><span class="cx"> void didStartProvisionalLoad(const String& url);
</span><span class="cx"> void didReceiveServerRedirectForProvisionalLoad(const String& url);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebKeyValueStorageManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebKeyValueStorageManager.cpp (169999 => 170000)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebKeyValueStorageManager.cpp 2014-06-16 04:08:53 UTC (rev 169999)
+++ trunk/Source/WebKit2/UIProcess/WebKeyValueStorageManager.cpp 2014-06-16 04:09:25 UTC (rev 170000)
</span><span class="lines">@@ -99,9 +99,9 @@
</span><span class="cx"> callback->performCallbackWithReturnValue(API::Array::create(std::move(webSecurityOrigins)).get());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebKeyValueStorageManager::getKeyValueStorageOrigins(PassRefPtr<ArrayCallback> prpCallback)
</del><ins>+void WebKeyValueStorageManager::getKeyValueStorageOrigins(std::function<void (API::Array*, CallbackBase::Error)> callbackFunction)
</ins><span class="cx"> {
</span><del>- context()->storageManager().getOrigins(RunLoop::main(), prpCallback.leakRef(), didGetKeyValueStorageOrigins);
</del><ins>+ context()->storageManager().getOrigins(RunLoop::main(), ArrayCallback::create(std::move(callbackFunction)).leakRef(), didGetKeyValueStorageOrigins);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void didGetStorageDetailsByOrigin(const Vector<LocalStorageDetails>& storageDetails, void* context)
</span><span class="lines">@@ -128,9 +128,9 @@
</span><span class="cx"> callback->performCallbackWithReturnValue(API::Array::create(std::move(result)).get());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebKeyValueStorageManager::getStorageDetailsByOrigin(PassRefPtr<ArrayCallback> prpCallback)
</del><ins>+void WebKeyValueStorageManager::getStorageDetailsByOrigin(std::function<void (API::Array*, CallbackBase::Error)> callbackFunction)
</ins><span class="cx"> {
</span><del>- context()->storageManager().getStorageDetailsByOrigin(RunLoop::main(), prpCallback.leakRef(), didGetStorageDetailsByOrigin);
</del><ins>+ context()->storageManager().getStorageDetailsByOrigin(RunLoop::main(), ArrayCallback::create(std::move(callbackFunction)).leakRef(), didGetStorageDetailsByOrigin);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebKeyValueStorageManager::deleteEntriesForOrigin(WebSecurityOrigin* origin)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebKeyValueStorageManagerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebKeyValueStorageManager.h (169999 => 170000)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebKeyValueStorageManager.h 2014-06-16 04:08:53 UTC (rev 169999)
+++ trunk/Source/WebKit2/UIProcess/WebKeyValueStorageManager.h 2014-06-16 04:09:25 UTC (rev 170000)
</span><span class="lines">@@ -45,8 +45,8 @@
</span><span class="cx"> static PassRefPtr<WebKeyValueStorageManager> create(WebContext*);
</span><span class="cx"> virtual ~WebKeyValueStorageManager();
</span><span class="cx">
</span><del>- void getKeyValueStorageOrigins(PassRefPtr<ArrayCallback>);
- void getStorageDetailsByOrigin(PassRefPtr<ArrayCallback>);
</del><ins>+ void getKeyValueStorageOrigins(std::function<void (API::Array*, CallbackBase::Error)>);
+ void getStorageDetailsByOrigin(std::function<void (API::Array*, CallbackBase::Error)>);
</ins><span class="cx"> void deleteEntriesForOrigin(WebSecurityOrigin*);
</span><span class="cx"> void deleteAllEntries();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebMediaCacheManagerProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebMediaCacheManagerProxy.cpp (169999 => 170000)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebMediaCacheManagerProxy.cpp 2014-06-16 04:08:53 UTC (rev 169999)
+++ trunk/Source/WebKit2/UIProcess/WebMediaCacheManagerProxy.cpp 2014-06-16 04:09:25 UTC (rev 170000)
</span><span class="lines">@@ -81,9 +81,9 @@
</span><span class="cx"> API::Object::deref();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebMediaCacheManagerProxy::getHostnamesWithMediaCache(PassRefPtr<ArrayCallback> prpCallback)
</del><ins>+void WebMediaCacheManagerProxy::getHostnamesWithMediaCache(std::function<void (API::Array*, CallbackBase::Error)> callbackFunction)
</ins><span class="cx"> {
</span><del>- RefPtr<ArrayCallback> callback = prpCallback;
</del><ins>+ RefPtr<ArrayCallback> callback = ArrayCallback::create(std::move(callbackFunction));
</ins><span class="cx"> uint64_t callbackID = callback->callbackID();
</span><span class="cx"> m_arrayCallbacks.set(callbackID, callback.release());
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebMediaCacheManagerProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebMediaCacheManagerProxy.h (169999 => 170000)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebMediaCacheManagerProxy.h 2014-06-16 04:08:53 UTC (rev 169999)
+++ trunk/Source/WebKit2/UIProcess/WebMediaCacheManagerProxy.h 2014-06-16 04:09:25 UTC (rev 170000)
</span><span class="lines">@@ -48,7 +48,7 @@
</span><span class="cx"> static PassRefPtr<WebMediaCacheManagerProxy> create(WebContext*);
</span><span class="cx"> virtual ~WebMediaCacheManagerProxy();
</span><span class="cx">
</span><del>- void getHostnamesWithMediaCache(PassRefPtr<ArrayCallback>);
</del><ins>+ void getHostnamesWithMediaCache(std::function<void (API::Array*, CallbackBase::Error)>);
</ins><span class="cx"> void clearCacheForHostname(const String&);
</span><span class="cx"> void clearCacheForAllHostnames();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebOriginDataManagerProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebOriginDataManagerProxy.cpp (169999 => 170000)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebOriginDataManagerProxy.cpp 2014-06-16 04:08:53 UTC (rev 169999)
+++ trunk/Source/WebKit2/UIProcess/WebOriginDataManagerProxy.cpp 2014-06-16 04:09:25 UTC (rev 170000)
</span><span class="lines">@@ -80,13 +80,15 @@
</span><span class="cx"> API::Object::deref();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebOriginDataManagerProxy::getOrigins(WKOriginDataTypes types, PassRefPtr<ArrayCallback> prpCallback)
</del><ins>+void WebOriginDataManagerProxy::getOrigins(WKOriginDataTypes types, std::function<void (API::Array*, CallbackBase::Error)> callbackFunction)
</ins><span class="cx"> {
</span><del>- if (!context())
</del><ins>+ RefPtr<ArrayCallback> callback = ArrayCallback::create(std::move(callbackFunction));
+
+ if (!context()) {
+ callback->invalidate();
</ins><span class="cx"> return;
</span><ins>+ }
</ins><span class="cx">
</span><del>- RefPtr<ArrayCallback> callback = prpCallback;
-
</del><span class="cx"> uint64_t callbackID = callback->callbackID();
</span><span class="cx"> m_arrayCallbacks.set(callbackID, callback.release());
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebOriginDataManagerProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebOriginDataManagerProxy.h (169999 => 170000)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebOriginDataManagerProxy.h 2014-06-16 04:08:53 UTC (rev 169999)
+++ trunk/Source/WebKit2/UIProcess/WebOriginDataManagerProxy.h 2014-06-16 04:09:25 UTC (rev 170000)
</span><span class="lines">@@ -54,7 +54,7 @@
</span><span class="cx"> static PassRefPtr<WebOriginDataManagerProxy> create(WebContext*);
</span><span class="cx"> virtual ~WebOriginDataManagerProxy();
</span><span class="cx">
</span><del>- void getOrigins(WKOriginDataTypes, PassRefPtr<ArrayCallback>);
</del><ins>+ void getOrigins(WKOriginDataTypes, std::function<void (API::Array*, CallbackBase::Error)>);
</ins><span class="cx"> void deleteEntriesForOrigin(WKOriginDataTypes, WebSecurityOrigin*);
</span><span class="cx"> void deleteAllEntries(WKOriginDataTypes);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (169999 => 170000)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-06-16 04:08:53 UTC (rev 169999)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-06-16 04:09:25 UTC (rev 170000)
</span><span class="lines">@@ -2292,9 +2292,9 @@
</span><span class="cx"> m_process->send(Messages::WebPage::GetSelectionAsWebArchiveData(callbackID), m_pageID);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPageProxy::getMainResourceDataOfFrame(WebFrameProxy* frame, PassRefPtr<DataCallback> prpCallback)
</del><ins>+void WebPageProxy::getMainResourceDataOfFrame(WebFrameProxy* frame, std::function<void (API::Data*, CallbackBase::Error)> callbackFunction)
</ins><span class="cx"> {
</span><del>- RefPtr<DataCallback> callback = prpCallback;
</del><ins>+ RefPtr<DataCallback> callback = DataCallback::create(std::move(callbackFunction));
</ins><span class="cx"> if (!isValid()) {
</span><span class="cx"> callback->invalidate();
</span><span class="cx"> return;
</span><span class="lines">@@ -2305,9 +2305,9 @@
</span><span class="cx"> m_process->send(Messages::WebPage::GetMainResourceDataOfFrame(frame->frameID(), callbackID), m_pageID);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPageProxy::getResourceDataFromFrame(WebFrameProxy* frame, API::URL* resourceURL, PassRefPtr<DataCallback> prpCallback)
</del><ins>+void WebPageProxy::getResourceDataFromFrame(WebFrameProxy* frame, API::URL* resourceURL, std::function<void (API::Data*, CallbackBase::Error)> callbackFunction)
</ins><span class="cx"> {
</span><del>- RefPtr<DataCallback> callback = prpCallback;
</del><ins>+ RefPtr<DataCallback> callback = DataCallback::create(std::move(callbackFunction));
</ins><span class="cx"> if (!isValid()) {
</span><span class="cx"> callback->invalidate();
</span><span class="cx"> return;
</span><span class="lines">@@ -2318,9 +2318,9 @@
</span><span class="cx"> m_process->send(Messages::WebPage::GetResourceDataFromFrame(frame->frameID(), resourceURL->string(), callbackID), m_pageID);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPageProxy::getWebArchiveOfFrame(WebFrameProxy* frame, PassRefPtr<DataCallback> prpCallback)
</del><ins>+void WebPageProxy::getWebArchiveOfFrame(WebFrameProxy* frame, std::function<void (API::Data*, CallbackBase::Error)> callbackFunction)
</ins><span class="cx"> {
</span><del>- RefPtr<DataCallback> callback = prpCallback;
</del><ins>+ RefPtr<DataCallback> callback = DataCallback::create(std::move(callbackFunction));
</ins><span class="cx"> if (!isValid()) {
</span><span class="cx"> callback->invalidate();
</span><span class="cx"> return;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (169999 => 170000)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2014-06-16 04:08:53 UTC (rev 169999)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2014-06-16 04:09:25 UTC (rev 170000)
</span><span class="lines">@@ -397,9 +397,9 @@
</span><span class="cx"> int32_t deviceOrientation() const { return m_deviceOrientation; }
</span><span class="cx"> void didCommitLayerTree(const WebKit::RemoteLayerTreeTransaction&);
</span><span class="cx">
</span><del>- void selectWithGesture(const WebCore::IntPoint, WebCore::TextGranularity, uint32_t gestureType, uint32_t gestureState, PassRefPtr<GestureCallback>);
</del><ins>+ void selectWithGesture(const WebCore::IntPoint, WebCore::TextGranularity, uint32_t gestureType, uint32_t gestureState, std::function<void (const WebCore::IntPoint&, uint32_t, uint32_t, uint32_t, CallbackBase::Error)>);
</ins><span class="cx"> void updateSelectionWithTouches(const WebCore::IntPoint, uint32_t touches, bool baseIsStart, PassRefPtr<TouchesCallback>);
</span><del>- void selectWithTwoTouches(const WebCore::IntPoint from, const WebCore::IntPoint to, uint32_t gestureType, uint32_t gestureState, PassRefPtr<GestureCallback>);
</del><ins>+ void selectWithTwoTouches(const WebCore::IntPoint from, const WebCore::IntPoint to, uint32_t gestureType, uint32_t gestureState, std::function<void (const WebCore::IntPoint&, uint32_t, uint32_t, uint32_t, CallbackBase::Error)>);
</ins><span class="cx"> void updateBlockSelectionWithTouch(const WebCore::IntPoint, uint32_t touch, uint32_t handlePosition);
</span><span class="cx"> void extendSelection(WebCore::TextGranularity);
</span><span class="cx"> void selectWordBackward();
</span><span class="lines">@@ -480,7 +480,7 @@
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(MAC)
</span><span class="cx"> void insertDictatedTextAsync(const String& text, const EditingRange& replacementRange, const Vector<WebCore::TextAlternativeWithRange>& dictationAlternatives);
</span><del>- void attributedSubstringForCharacterRangeAsync(const EditingRange&, PassRefPtr<AttributedStringForCharacterRangeCallback>);
</del><ins>+ void attributedSubstringForCharacterRangeAsync(const EditingRange&, std::function<void (const AttributedString&, const EditingRange&, CallbackBase::Error)>);
</ins><span class="cx">
</span><span class="cx"> #if !USE(ASYNC_NSTEXTINPUTCLIENT)
</span><span class="cx"> bool insertText(const String& text, const EditingRange& replacementRange);
</span><span class="lines">@@ -657,13 +657,13 @@
</span><span class="cx"> #if ENABLE(MHTML)
</span><span class="cx"> void getContentsAsMHTMLData(PassRefPtr<DataCallback>, bool useBinaryEncoding);
</span><span class="cx"> #endif
</span><del>- void getMainResourceDataOfFrame(WebFrameProxy*, PassRefPtr<DataCallback>);
- void getResourceDataFromFrame(WebFrameProxy*, API::URL*, PassRefPtr<DataCallback>);
</del><ins>+ void getMainResourceDataOfFrame(WebFrameProxy*, std::function<void (API::Data*, CallbackBase::Error)>);
+ void getResourceDataFromFrame(WebFrameProxy*, API::URL*, std::function<void (API::Data*, CallbackBase::Error)>);
</ins><span class="cx"> void getRenderTreeExternalRepresentation(PassRefPtr<StringCallback>);
</span><span class="cx"> void getSelectionOrContentsAsString(PassRefPtr<StringCallback>);
</span><span class="cx"> void getSelectionAsWebArchiveData(PassRefPtr<DataCallback>);
</span><span class="cx"> void getSourceForFrame(WebFrameProxy*, PassRefPtr<StringCallback>);
</span><del>- void getWebArchiveOfFrame(WebFrameProxy*, PassRefPtr<DataCallback>);
</del><ins>+ void getWebArchiveOfFrame(WebFrameProxy*, std::function<void (API::Data*, CallbackBase::Error)>);
</ins><span class="cx"> void runJavaScriptInMainFrame(const String&, PassRefPtr<ScriptValueCallback>);
</span><span class="cx"> void forceRepaint(PassRefPtr<VoidCallback>);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebResourceCacheManagerProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebResourceCacheManagerProxy.cpp (169999 => 170000)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebResourceCacheManagerProxy.cpp 2014-06-16 04:08:53 UTC (rev 169999)
+++ trunk/Source/WebKit2/UIProcess/WebResourceCacheManagerProxy.cpp 2014-06-16 04:09:25 UTC (rev 170000)
</span><span class="lines">@@ -88,9 +88,9 @@
</span><span class="cx"> API::Object::deref();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebResourceCacheManagerProxy::getCacheOrigins(PassRefPtr<ArrayCallback> prpCallback)
</del><ins>+void WebResourceCacheManagerProxy::getCacheOrigins(std::function<void (API::Array*, CallbackBase::Error)> callbackFunction)
</ins><span class="cx"> {
</span><del>- RefPtr<ArrayCallback> callback = prpCallback;
</del><ins>+ RefPtr<ArrayCallback> callback = ArrayCallback::create(std::move(callbackFunction));
</ins><span class="cx"> uint64_t callbackID = callback->callbackID();
</span><span class="cx"> m_arrayCallbacks.set(callbackID, callback.release());
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebResourceCacheManagerProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebResourceCacheManagerProxy.h (169999 => 170000)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebResourceCacheManagerProxy.h 2014-06-16 04:08:53 UTC (rev 169999)
+++ trunk/Source/WebKit2/UIProcess/WebResourceCacheManagerProxy.h 2014-06-16 04:09:25 UTC (rev 170000)
</span><span class="lines">@@ -51,7 +51,7 @@
</span><span class="cx"> static PassRefPtr<WebResourceCacheManagerProxy> create(WebContext*);
</span><span class="cx"> virtual ~WebResourceCacheManagerProxy();
</span><span class="cx">
</span><del>- void getCacheOrigins(PassRefPtr<ArrayCallback>);
</del><ins>+ void getCacheOrigins(std::function<void (API::Array*, CallbackBase::Error)>);
</ins><span class="cx"> void clearCacheForOrigin(WebSecurityOrigin*, ResourceCachesToClear);
</span><span class="cx"> void clearCacheForAllOrigins(ResourceCachesToClear);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessiosWKContentViewInteractionmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm (169999 => 170000)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2014-06-16 04:08:53 UTC (rev 169999)
+++ trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2014-06-16 04:09:25 UTC (rev 170000)
</span><span class="lines">@@ -1429,11 +1429,11 @@
</span><span class="cx"> - (void)changeSelectionWithGestureAt:(CGPoint)point withGesture:(UIWKGestureType)gestureType withState:(UIGestureRecognizerState)state
</span><span class="cx"> {
</span><span class="cx"> _usingGestureForSelection = YES;
</span><del>- _page->selectWithGesture(WebCore::IntPoint(point), CharacterGranularity, static_cast<uint32_t>(toGestureType(gestureType)), static_cast<uint32_t>(toGestureRecognizerState(state)), GestureCallback::create([self, state](const WebCore::IntPoint& point, uint32_t gestureType, uint32_t gestureState, uint32_t flags, CallbackBase::Error error) {
</del><ins>+ _page->selectWithGesture(WebCore::IntPoint(point), CharacterGranularity, static_cast<uint32_t>(toGestureType(gestureType)), static_cast<uint32_t>(toGestureRecognizerState(state)), [self, state](const WebCore::IntPoint& point, uint32_t gestureType, uint32_t gestureState, uint32_t flags, CallbackBase::Error error) {
</ins><span class="cx"> selectionChangedWithGesture(self, point, gestureType, gestureState, flags, error);
</span><span class="cx"> if (state == UIGestureRecognizerStateEnded || state == UIGestureRecognizerStateCancelled)
</span><span class="cx"> _usingGestureForSelection = NO;
</span><del>- }));
</del><ins>+ });
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)changeSelectionWithTouchAt:(CGPoint)point withSelectionTouch:(UIWKSelectionTouch)touch baseIsStart:(BOOL)baseIsStart
</span><span class="lines">@@ -1449,11 +1449,11 @@
</span><span class="cx"> - (void)changeSelectionWithTouchesFrom:(CGPoint)from to:(CGPoint)to withGesture:(UIWKGestureType)gestureType withState:(UIGestureRecognizerState)gestureState
</span><span class="cx"> {
</span><span class="cx"> _usingGestureForSelection = YES;
</span><del>- _page->selectWithTwoTouches(WebCore::IntPoint(from), WebCore::IntPoint(to), static_cast<uint32_t>(toGestureType(gestureType)), static_cast<uint32_t>(toGestureRecognizerState(gestureState)), GestureCallback::create([self, gestureState](const WebCore::IntPoint& point, uint32_t gestureType, uint32_t gestureState, uint32_t flags, CallbackBase::Error error) {
</del><ins>+ _page->selectWithTwoTouches(WebCore::IntPoint(from), WebCore::IntPoint(to), static_cast<uint32_t>(toGestureType(gestureType)), static_cast<uint32_t>(toGestureRecognizerState(gestureState)), [self, gestureState](const WebCore::IntPoint& point, uint32_t gestureType, uint32_t gestureState, uint32_t flags, CallbackBase::Error error) {
</ins><span class="cx"> selectionChangedWithGesture(self, point, gestureType, gestureState, flags, error);
</span><span class="cx"> if (gestureState == UIGestureRecognizerStateEnded || gestureState == UIGestureRecognizerStateCancelled)
</span><span class="cx"> _usingGestureForSelection = NO;
</span><del>- }));
</del><ins>+ });
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)changeBlockSelectionWithTouchAt:(CGPoint)point withSelectionTouch:(UIWKSelectionTouch)touch forHandle:(UIWKHandlePosition)handle
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessiosWebPageProxyIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ios/WebPageProxyIOS.mm (169999 => 170000)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ios/WebPageProxyIOS.mm 2014-06-16 04:08:53 UTC (rev 169999)
+++ trunk/Source/WebKit2/UIProcess/ios/WebPageProxyIOS.mm 2014-06-16 04:09:25 UTC (rev 170000)
</span><span class="lines">@@ -303,8 +303,10 @@
</span><span class="cx"> m_pageClient.didCommitLayerTree(layerTreeTransaction);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPageProxy::selectWithGesture(const WebCore::IntPoint point, WebCore::TextGranularity granularity, uint32_t gestureType, uint32_t gestureState, PassRefPtr<GestureCallback> callback)
</del><ins>+void WebPageProxy::selectWithGesture(const WebCore::IntPoint point, WebCore::TextGranularity granularity, uint32_t gestureType, uint32_t gestureState, std::function<void (const WebCore::IntPoint&, uint32_t, uint32_t, uint32_t, CallbackBase::Error)> callbackFunction)
</ins><span class="cx"> {
</span><ins>+ RefPtr<GestureCallback> callback = GestureCallback::create(std::move(callbackFunction));
+
</ins><span class="cx"> if (!isValid()) {
</span><span class="cx"> callback->invalidate();
</span><span class="cx"> return;
</span><span class="lines">@@ -397,8 +399,10 @@
</span><span class="cx"> m_process->sendSync(Messages::WebPage::GetAutocorrectionContext(), Messages::WebPage::GetAutocorrectionContext::Reply(beforeContext, markedText, selectedText, afterContext, location, length), m_pageID);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPageProxy::selectWithTwoTouches(const WebCore::IntPoint from, const WebCore::IntPoint to, uint32_t gestureType, uint32_t gestureState, PassRefPtr<GestureCallback> callback)
</del><ins>+void WebPageProxy::selectWithTwoTouches(const WebCore::IntPoint from, const WebCore::IntPoint to, uint32_t gestureType, uint32_t gestureState, std::function<void (const WebCore::IntPoint&, uint32_t, uint32_t, uint32_t, CallbackBase::Error)> callbackFunction)
</ins><span class="cx"> {
</span><ins>+ RefPtr<GestureCallback> callback = GestureCallback::create(std::move(callbackFunction));
+
</ins><span class="cx"> if (!isValid()) {
</span><span class="cx"> callback->invalidate();
</span><span class="cx"> return;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacWebPageProxyMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/WebPageProxyMac.mm (169999 => 170000)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/WebPageProxyMac.mm 2014-06-16 04:08:53 UTC (rev 169999)
+++ trunk/Source/WebKit2/UIProcess/mac/WebPageProxyMac.mm 2014-06-16 04:09:25 UTC (rev 170000)
</span><span class="lines">@@ -325,8 +325,10 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPageProxy::attributedSubstringForCharacterRangeAsync(const EditingRange& range, PassRefPtr<AttributedStringForCharacterRangeCallback> callback)
</del><ins>+void WebPageProxy::attributedSubstringForCharacterRangeAsync(const EditingRange& range, std::function<void (const AttributedString&, const EditingRange&, CallbackBase::Error)> callbackFunction)
</ins><span class="cx"> {
</span><ins>+ RefPtr<AttributedStringForCharacterRangeCallback> callback = AttributedStringForCharacterRangeCallback::create(std::move(callbackFunction));
+
</ins><span class="cx"> if (!isValid()) {
</span><span class="cx"> callback->invalidate();
</span><span class="cx"> return;
</span></span></pre>
</div>
</div>
</body>
</html>