<!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>[213777] 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/213777">213777</a></dd>
<dt>Author</dt> <dd>beidson@apple.com</dd>
<dt>Date</dt> <dd>2017-03-12 18:37:36 -0700 (Sun, 12 Mar 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Transition GenericCallback from std::function to WTF::Function.
https://bugs.webkit.org/show_bug.cgi?id=169530
Reviewed by Dean Jackson.
* UIProcess/GenericCallback.h:
(WebKit::GenericCallback::create):
(WebKit::GenericCallback::performCallbackWithReturnValue):
(WebKit::GenericCallback::GenericCallback):
(WebKit::CallbackMap::put):
* UIProcess/WebCookieManagerProxy.cpp:
(WebKit::WebCookieManagerProxy::getHostnamesWithCookies):
(WebKit::WebCookieManagerProxy::getHTTPCookieAcceptPolicy):
* UIProcess/WebCookieManagerProxy.h:
* UIProcess/WebFrameProxy.cpp:
(WebKit::WebFrameProxy::getWebArchive):
(WebKit::WebFrameProxy::getMainResourceData):
(WebKit::WebFrameProxy::getResourceData):
* UIProcess/WebFrameProxy.h:
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::getSelectionAsWebArchiveData):
(WebKit::WebPageProxy::getMainResourceDataOfFrame):
(WebKit::WebPageProxy::getResourceDataFromFrame):
(WebKit::WebPageProxy::getWebArchiveOfFrame):
* UIProcess/WebPageProxy.h:
* UIProcess/WebProcessPool.cpp:
(WebKit::WebProcessPool::getStatistics):
* UIProcess/WebProcessPool.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessGenericCallbackh">trunk/Source/WebKit2/UIProcess/GenericCallback.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="#trunkSourceWebKit2UIProcessWebFrameProxycpp">trunk/Source/WebKit2/UIProcess/WebFrameProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebFrameProxyh">trunk/Source/WebKit2/UIProcess/WebFrameProxy.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="#trunkSourceWebKit2UIProcessWebProcessPoolcpp">trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebProcessPoolh">trunk/Source/WebKit2/UIProcess/WebProcessPool.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (213776 => 213777)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2017-03-13 00:34:38 UTC (rev 213776)
+++ trunk/Source/WebKit2/ChangeLog 2017-03-13 01:37:36 UTC (rev 213777)
</span><span class="lines">@@ -1,3 +1,38 @@
</span><ins>+2017-03-12 Brady Eidson <beidson@apple.com>
+
+ Transition GenericCallback from std::function to WTF::Function.
+ https://bugs.webkit.org/show_bug.cgi?id=169530
+
+ Reviewed by Dean Jackson.
+
+ * UIProcess/GenericCallback.h:
+ (WebKit::GenericCallback::create):
+ (WebKit::GenericCallback::performCallbackWithReturnValue):
+ (WebKit::GenericCallback::GenericCallback):
+ (WebKit::CallbackMap::put):
+
+ * UIProcess/WebCookieManagerProxy.cpp:
+ (WebKit::WebCookieManagerProxy::getHostnamesWithCookies):
+ (WebKit::WebCookieManagerProxy::getHTTPCookieAcceptPolicy):
+ * UIProcess/WebCookieManagerProxy.h:
+
+ * UIProcess/WebFrameProxy.cpp:
+ (WebKit::WebFrameProxy::getWebArchive):
+ (WebKit::WebFrameProxy::getMainResourceData):
+ (WebKit::WebFrameProxy::getResourceData):
+ * UIProcess/WebFrameProxy.h:
+
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::getSelectionAsWebArchiveData):
+ (WebKit::WebPageProxy::getMainResourceDataOfFrame):
+ (WebKit::WebPageProxy::getResourceDataFromFrame):
+ (WebKit::WebPageProxy::getWebArchiveOfFrame):
+ * UIProcess/WebPageProxy.h:
+
+ * UIProcess/WebProcessPool.cpp:
+ (WebKit::WebProcessPool::getStatistics):
+ * UIProcess/WebProcessPool.h:
+
</ins><span class="cx"> 2017-03-12 Adrian Perez de Castro <aperez@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Unbreak build with GTK+ >=3.20 after r213772
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessGenericCallbackh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/GenericCallback.h (213776 => 213777)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/GenericCallback.h 2017-03-13 00:34:38 UTC (rev 213776)
+++ trunk/Source/WebKit2/UIProcess/GenericCallback.h 2017-03-13 01:37:36 UTC (rev 213777)
</span><span class="lines">@@ -32,6 +32,7 @@
</span><span class="cx"> #include "ShareableBitmap.h"
</span><span class="cx"> #include "WKAPICast.h"
</span><span class="cx"> #include <functional>
</span><ins>+#include <wtf/Function.h>
</ins><span class="cx"> #include <wtf/HashMap.h>
</span><span class="cx"> #include <wtf/PassRefPtr.h>
</span><span class="cx"> #include <wtf/RefCounted.h>
</span><span class="lines">@@ -92,11 +93,11 @@
</span><span class="cx"> template<typename... T>
</span><span class="cx"> class GenericCallback : public CallbackBase {
</span><span class="cx"> public:
</span><del>- typedef std::function<void (T..., Error)> CallbackFunction;
</del><ins>+ typedef Function<void (T..., Error)> CallbackFunction;
</ins><span class="cx">
</span><del>- static PassRefPtr<GenericCallback> create(CallbackFunction callback, const ProcessThrottler::BackgroundActivityToken& activityToken = nullptr)
</del><ins>+ static PassRefPtr<GenericCallback> create(CallbackFunction&& callback, const ProcessThrottler::BackgroundActivityToken& activityToken = nullptr)
</ins><span class="cx"> {
</span><del>- return adoptRef(new GenericCallback(callback, activityToken));
</del><ins>+ return adoptRef(new GenericCallback(WTFMove(callback), activityToken));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> virtual ~GenericCallback()
</span><span class="lines">@@ -109,9 +110,9 @@
</span><span class="cx"> if (!m_callback)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- m_callback(returnValue..., Error::None);
</del><ins>+ m_callback.value()(returnValue..., Error::None);
</ins><span class="cx">
</span><del>- m_callback = nullptr;
</del><ins>+ m_callback = std::nullopt;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void performCallback()
</span><span class="lines">@@ -124,15 +125,15 @@
</span><span class="cx"> if (!m_callback)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- m_callback(typename std::remove_reference<T>::type()..., error);
</del><ins>+ m_callback.value()(typename std::remove_reference<T>::type()..., error);
</ins><span class="cx">
</span><del>- m_callback = nullptr;
</del><ins>+ m_callback = std::nullopt;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- GenericCallback(CallbackFunction callback, const ProcessThrottler::BackgroundActivityToken& activityToken)
</del><ins>+ GenericCallback(CallbackFunction&& callback, const ProcessThrottler::BackgroundActivityToken& activityToken)
</ins><span class="cx"> : CallbackBase(type(), activityToken)
</span><del>- , m_callback(callback)
</del><ins>+ , m_callback(WTFMove(callback))
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -143,7 +144,7 @@
</span><span class="cx"> return &tag;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- CallbackFunction m_callback;
</del><ins>+ std::optional<CallbackFunction> m_callback;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> template<typename APIReturnValueType, typename InternalReturnValueType = typename APITypeInfo<APIReturnValueType>::ImplType*>
</span><span class="lines">@@ -197,6 +198,13 @@
</span><span class="cx"> return put(callback);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ template<typename... T>
+ uint64_t put(Function<void (T...)>&& function, const ProcessThrottler::BackgroundActivityToken& activityToken)
+ {
+ auto callback = GenericCallbackType<sizeof...(T), T...>::type::create(WTFMove(function), activityToken);
+ return put(callback);
+ }
+
</ins><span class="cx"> template<class T>
</span><span class="cx"> RefPtr<T> take(uint64_t callbackID)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebCookieManagerProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebCookieManagerProxy.cpp (213776 => 213777)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebCookieManagerProxy.cpp 2017-03-13 00:34:38 UTC (rev 213776)
+++ trunk/Source/WebKit2/UIProcess/WebCookieManagerProxy.cpp 2017-03-13 01:37:36 UTC (rev 213777)
</span><span class="lines">@@ -94,7 +94,7 @@
</span><span class="cx"> API::Object::deref();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebCookieManagerProxy::getHostnamesWithCookies(WebCore::SessionID sessionID, std::function<void (API::Array*, CallbackBase::Error)> callbackFunction)
</del><ins>+void WebCookieManagerProxy::getHostnamesWithCookies(WebCore::SessionID sessionID, Function<void (API::Array*, CallbackBase::Error)>&& callbackFunction)
</ins><span class="cx"> {
</span><span class="cx"> auto callback = ArrayCallback::create(WTFMove(callbackFunction));
</span><span class="cx"> uint64_t callbackID = callback->callbackID();
</span><span class="lines">@@ -176,7 +176,7 @@
</span><span class="cx"> processPool()->sendToNetworkingProcess(Messages::WebCookieManager::SetHTTPCookieAcceptPolicy(policy));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebCookieManagerProxy::getHTTPCookieAcceptPolicy(std::function<void (HTTPCookieAcceptPolicy, CallbackBase::Error)> callbackFunction)
</del><ins>+void WebCookieManagerProxy::getHTTPCookieAcceptPolicy(Function<void (HTTPCookieAcceptPolicy, CallbackBase::Error)> callbackFunction)
</ins><span class="cx"> {
</span><span class="cx"> auto callback = HTTPCookieAcceptPolicyCallback::create(WTFMove(callbackFunction));
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebCookieManagerProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebCookieManagerProxy.h (213776 => 213777)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebCookieManagerProxy.h 2017-03-13 00:34:38 UTC (rev 213776)
+++ trunk/Source/WebKit2/UIProcess/WebCookieManagerProxy.h 2017-03-13 01:37:36 UTC (rev 213777)
</span><span class="lines">@@ -65,7 +65,7 @@
</span><span class="cx">
</span><span class="cx"> void initializeClient(const WKCookieManagerClientBase*);
</span><span class="cx">
</span><del>- void getHostnamesWithCookies(WebCore::SessionID, std::function<void (API::Array*, CallbackBase::Error)>);
</del><ins>+ void getHostnamesWithCookies(WebCore::SessionID, Function<void (API::Array*, CallbackBase::Error)>&&);
</ins><span class="cx"> void deleteCookiesForHostname(WebCore::SessionID, const String& hostname);
</span><span class="cx"> void deleteAllCookies(WebCore::SessionID);
</span><span class="cx"> void deleteAllCookiesModifiedSince(WebCore::SessionID, std::chrono::system_clock::time_point);
</span><span class="lines">@@ -73,7 +73,7 @@
</span><span class="cx"> void setCookies(WebCore::SessionID, const Vector<WebCore::Cookie>&, const WebCore::URL&, const WebCore::URL& mainDocumentURL);
</span><span class="cx">
</span><span class="cx"> void setHTTPCookieAcceptPolicy(HTTPCookieAcceptPolicy);
</span><del>- void getHTTPCookieAcceptPolicy(std::function<void (HTTPCookieAcceptPolicy, CallbackBase::Error)>);
</del><ins>+ void getHTTPCookieAcceptPolicy(Function<void (HTTPCookieAcceptPolicy, CallbackBase::Error)>);
</ins><span class="cx"> void setCookieStoragePartitioningEnabled(bool);
</span><span class="cx">
</span><span class="cx"> void startObservingCookieChanges(WebCore::SessionID);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebFrameProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebFrameProxy.cpp (213776 => 213777)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebFrameProxy.cpp 2017-03-13 00:34:38 UTC (rev 213776)
+++ trunk/Source/WebKit2/UIProcess/WebFrameProxy.cpp 2017-03-13 01:37:36 UTC (rev 213777)
</span><span class="lines">@@ -202,7 +202,7 @@
</span><span class="cx"> return *static_cast<WebFormSubmissionListenerProxy*>(m_activeListener.get());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebFrameProxy::getWebArchive(std::function<void (API::Data*, CallbackBase::Error)> callbackFunction)
</del><ins>+void WebFrameProxy::getWebArchive(Function<void (API::Data*, CallbackBase::Error)>&& callbackFunction)
</ins><span class="cx"> {
</span><span class="cx"> if (!m_page) {
</span><span class="cx"> callbackFunction(nullptr, CallbackBase::Error::Unknown);
</span><span class="lines">@@ -209,10 +209,10 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- m_page->getWebArchiveOfFrame(this, callbackFunction);
</del><ins>+ m_page->getWebArchiveOfFrame(this, WTFMove(callbackFunction));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void WebFrameProxy::getMainResourceData(std::function<void (API::Data*, CallbackBase::Error)> callbackFunction)
</del><ins>+void WebFrameProxy::getMainResourceData(Function<void (API::Data*, CallbackBase::Error)>&& callbackFunction)
</ins><span class="cx"> {
</span><span class="cx"> if (!m_page) {
</span><span class="cx"> callbackFunction(nullptr, CallbackBase::Error::Unknown);
</span><span class="lines">@@ -219,10 +219,10 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- m_page->getMainResourceDataOfFrame(this, callbackFunction);
</del><ins>+ m_page->getMainResourceDataOfFrame(this, WTFMove(callbackFunction));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void WebFrameProxy::getResourceData(API::URL* resourceURL, std::function<void (API::Data*, CallbackBase::Error)> callbackFunction)
</del><ins>+void WebFrameProxy::getResourceData(API::URL* resourceURL, Function<void (API::Data*, CallbackBase::Error)>&& callbackFunction)
</ins><span class="cx"> {
</span><span class="cx"> if (!m_page) {
</span><span class="cx"> callbackFunction(nullptr, CallbackBase::Error::Unknown);
</span><span class="lines">@@ -229,7 +229,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- m_page->getResourceDataFromFrame(this, resourceURL, callbackFunction);
</del><ins>+ m_page->getResourceDataFromFrame(this, resourceURL, WTFMove(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 (213776 => 213777)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebFrameProxy.h 2017-03-13 00:34:38 UTC (rev 213776)
+++ trunk/Source/WebKit2/UIProcess/WebFrameProxy.h 2017-03-13 01:37:36 UTC (rev 213777)
</span><span class="lines">@@ -101,9 +101,9 @@
</span><span class="cx"> bool isDisplayingMarkupDocument() const;
</span><span class="cx"> bool isDisplayingPDFDocument() const;
</span><span class="cx">
</span><del>- 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)>);
</del><ins>+ void getWebArchive(Function<void (API::Data*, CallbackBase::Error)>&&);
+ void getMainResourceData(Function<void (API::Data*, CallbackBase::Error)>&&);
+ void getResourceData(API::URL*, 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="trunkSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (213776 => 213777)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2017-03-13 00:34:38 UTC (rev 213776)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2017-03-13 01:37:36 UTC (rev 213777)
</span><span class="lines">@@ -2974,7 +2974,7 @@
</span><span class="cx"> m_process->send(Messages::WebPage::GetSelectionOrContentsAsString(callbackID), m_pageID);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPageProxy::getSelectionAsWebArchiveData(std::function<void (API::Data*, CallbackBase::Error)> callbackFunction)
</del><ins>+void WebPageProxy::getSelectionAsWebArchiveData(Function<void (API::Data*, CallbackBase::Error)>&& callbackFunction)
</ins><span class="cx"> {
</span><span class="cx"> if (!isValid()) {
</span><span class="cx"> callbackFunction(nullptr, CallbackBase::Error::Unknown);
</span><span class="lines">@@ -2985,7 +2985,7 @@
</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, std::function<void (API::Data*, CallbackBase::Error)> callbackFunction)
</del><ins>+void WebPageProxy::getMainResourceDataOfFrame(WebFrameProxy* frame, Function<void (API::Data*, CallbackBase::Error)>&& callbackFunction)
</ins><span class="cx"> {
</span><span class="cx"> if (!isValid() || !frame) {
</span><span class="cx"> callbackFunction(nullptr, CallbackBase::Error::Unknown);
</span><span class="lines">@@ -2996,7 +2996,7 @@
</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, std::function<void (API::Data*, CallbackBase::Error)> callbackFunction)
</del><ins>+void WebPageProxy::getResourceDataFromFrame(WebFrameProxy* frame, API::URL* resourceURL, Function<void (API::Data*, CallbackBase::Error)>&& callbackFunction)
</ins><span class="cx"> {
</span><span class="cx"> if (!isValid()) {
</span><span class="cx"> callbackFunction(nullptr, CallbackBase::Error::Unknown);
</span><span class="lines">@@ -3007,7 +3007,7 @@
</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, std::function<void (API::Data*, CallbackBase::Error)> callbackFunction)
</del><ins>+void WebPageProxy::getWebArchiveOfFrame(WebFrameProxy* frame, Function<void (API::Data*, CallbackBase::Error)>&& callbackFunction)
</ins><span class="cx"> {
</span><span class="cx"> if (!isValid()) {
</span><span class="cx"> callbackFunction(nullptr, CallbackBase::Error::Unknown);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (213776 => 213777)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2017-03-13 00:34:38 UTC (rev 213776)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2017-03-13 01:37:36 UTC (rev 213777)
</span><span class="lines">@@ -800,13 +800,13 @@
</span><span class="cx"> #if ENABLE(MHTML)
</span><span class="cx"> void getContentsAsMHTMLData(std::function<void (API::Data*, CallbackBase::Error)>);
</span><span class="cx"> #endif
</span><del>- void getMainResourceDataOfFrame(WebFrameProxy*, std::function<void (API::Data*, CallbackBase::Error)>);
- void getResourceDataFromFrame(WebFrameProxy*, API::URL*, std::function<void (API::Data*, CallbackBase::Error)>);
</del><ins>+ void getMainResourceDataOfFrame(WebFrameProxy*, Function<void (API::Data*, CallbackBase::Error)>&&);
+ void getResourceDataFromFrame(WebFrameProxy*, API::URL*, Function<void (API::Data*, CallbackBase::Error)>&&);
</ins><span class="cx"> void getRenderTreeExternalRepresentation(std::function<void (const String&, CallbackBase::Error)>);
</span><span class="cx"> void getSelectionOrContentsAsString(std::function<void (const String&, CallbackBase::Error)>);
</span><del>- void getSelectionAsWebArchiveData(std::function<void (API::Data*, CallbackBase::Error)>);
</del><ins>+ void getSelectionAsWebArchiveData(Function<void (API::Data*, CallbackBase::Error)>&&);
</ins><span class="cx"> void getSourceForFrame(WebFrameProxy*, std::function<void (const String&, CallbackBase::Error)>);
</span><del>- void getWebArchiveOfFrame(WebFrameProxy*, std::function<void (API::Data*, CallbackBase::Error)>);
</del><ins>+ void getWebArchiveOfFrame(WebFrameProxy*, Function<void (API::Data*, CallbackBase::Error)>&&);
</ins><span class="cx"> void runJavaScriptInMainFrame(const String&, std::function<void (API::SerializedScriptValue*, bool hadException, const WebCore::ExceptionDetails&, CallbackBase::Error)> callbackFunction);
</span><span class="cx"> void forceRepaint(PassRefPtr<VoidCallback>);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebProcessPoolcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp (213776 => 213777)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp 2017-03-13 00:34:38 UTC (rev 213776)
+++ trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp 2017-03-13 01:37:36 UTC (rev 213777)
</span><span class="lines">@@ -1227,7 +1227,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebProcessPool::getStatistics(uint32_t statisticsMask, std::function<void (API::Dictionary*, CallbackBase::Error)> callbackFunction)
</del><ins>+void WebProcessPool::getStatistics(uint32_t statisticsMask, Function<void (API::Dictionary*, CallbackBase::Error)>&& callbackFunction)
</ins><span class="cx"> {
</span><span class="cx"> if (!statisticsMask) {
</span><span class="cx"> callbackFunction(nullptr, CallbackBase::Error::Unknown);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebProcessPoolh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebProcessPool.h (213776 => 213777)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebProcessPool.h 2017-03-13 00:34:38 UTC (rev 213776)
+++ trunk/Source/WebKit2/UIProcess/WebProcessPool.h 2017-03-13 01:37:36 UTC (rev 213777)
</span><span class="lines">@@ -274,7 +274,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, std::function<void (API::Dictionary*, CallbackBase::Error)>);
</del><ins>+ void getStatistics(uint32_t statisticsMask, Function<void (API::Dictionary*, CallbackBase::Error)>&&);
</ins><span class="cx">
</span><span class="cx"> bool javaScriptConfigurationFileEnabled() { return m_javaScriptConfigurationFileEnabled; }
</span><span class="cx"> void setJavaScriptConfigurationFileEnabled(bool flag);
</span></span></pre>
</div>
</div>
</body>
</html>