<!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>[170254] 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/170254">170254</a></dd>
<dt>Author</dt> <dd>mitz@apple.com</dd>
<dt>Date</dt> <dd>2014-06-21 15:25:34 -0700 (Sat, 21 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>CallbackMap::put should be able to take an unwrapped function
https://bugs.webkit.org/show_bug.cgi?id=134104
Reviewed by Anders Carlsson.
* UIProcess/GenericCallback.h:
(WebKit::CallbackMap::put): Added an overload that takes a function and creates and puts a
callback. Changed both overloads of put() to return the callback ID.
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::validateCommand):
(WebKit::WebPageProxy::runJavaScriptInMainFrame):
(WebKit::WebPageProxy::getRenderTreeExternalRepresentation):
(WebKit::WebPageProxy::getSourceForFrame):
(WebKit::WebPageProxy::getContentsAsString):
(WebKit::WebPageProxy::getBytecodeProfile):
(WebKit::WebPageProxy::getContentsAsMHTMLData):
(WebKit::WebPageProxy::getSelectionOrContentsAsString):
(WebKit::WebPageProxy::getSelectionAsWebArchiveData):
(WebKit::WebPageProxy::getMainResourceDataOfFrame):
(WebKit::WebPageProxy::getResourceDataFromFrame):
(WebKit::WebPageProxy::getWebArchiveOfFrame):
(WebKit::WebPageProxy::getMarkedRangeAsync):
(WebKit::WebPageProxy::getSelectedRangeAsync):
(WebKit::WebPageProxy::characterIndexForPointAsync):
(WebKit::WebPageProxy::firstRectForCharacterRangeAsync):
(WebKit::WebPageProxy::takeSnapshot):</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="#trunkSourceWebKit2UIProcessWebPageProxycpp">trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (170253 => 170254)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-06-21 22:02:26 UTC (rev 170253)
+++ trunk/Source/WebKit2/ChangeLog 2014-06-21 22:25:34 UTC (rev 170254)
</span><span class="lines">@@ -1,3 +1,33 @@
</span><ins>+2014-06-21 Dan Bernstein <mitz@apple.com>
+
+ CallbackMap::put should be able to take an unwrapped function
+ https://bugs.webkit.org/show_bug.cgi?id=134104
+
+ Reviewed by Anders Carlsson.
+
+ * UIProcess/GenericCallback.h:
+ (WebKit::CallbackMap::put): Added an overload that takes a function and creates and puts a
+ callback. Changed both overloads of put() to return the callback ID.
+
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::validateCommand):
+ (WebKit::WebPageProxy::runJavaScriptInMainFrame):
+ (WebKit::WebPageProxy::getRenderTreeExternalRepresentation):
+ (WebKit::WebPageProxy::getSourceForFrame):
+ (WebKit::WebPageProxy::getContentsAsString):
+ (WebKit::WebPageProxy::getBytecodeProfile):
+ (WebKit::WebPageProxy::getContentsAsMHTMLData):
+ (WebKit::WebPageProxy::getSelectionOrContentsAsString):
+ (WebKit::WebPageProxy::getSelectionAsWebArchiveData):
+ (WebKit::WebPageProxy::getMainResourceDataOfFrame):
+ (WebKit::WebPageProxy::getResourceDataFromFrame):
+ (WebKit::WebPageProxy::getWebArchiveOfFrame):
+ (WebKit::WebPageProxy::getMarkedRangeAsync):
+ (WebKit::WebPageProxy::getSelectedRangeAsync):
+ (WebKit::WebPageProxy::characterIndexForPointAsync):
+ (WebKit::WebPageProxy::firstRectForCharacterRangeAsync):
+ (WebKit::WebPageProxy::takeSnapshot):
+
</ins><span class="cx"> 2014-06-21 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Make it possible to override debug preferences on a per-identifier basis as well as globally
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessGenericCallbackh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/GenericCallback.h (170253 => 170254)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/GenericCallback.h 2014-06-21 22:02:26 UTC (rev 170253)
+++ trunk/Source/WebKit2/UIProcess/GenericCallback.h 2014-06-21 22:25:34 UTC (rev 170254)
</span><span class="lines">@@ -167,12 +167,32 @@
</span><span class="cx">
</span><span class="cx"> class CallbackMap {
</span><span class="cx"> public:
</span><del>- void put(PassRefPtr<CallbackBase> callback)
</del><ins>+ uint64_t put(PassRefPtr<CallbackBase> callback)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(!m_map.contains(callback->callbackID()));
</span><del>- m_map.set(callback->callbackID(), callback);
</del><ins>+
+ uint64_t callbackID = callback->callbackID();
+ m_map.set(callbackID, callback);
+ return callbackID;
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+ template<unsigned I, typename T, typename... U>
+ struct GenericCallbackType {
+ typedef typename GenericCallbackType<I - 1, U..., T>::type type;
+ };
+
+ template<typename... U>
+ struct GenericCallbackType<1, CallbackBase::Error, U...> {
+ typedef GenericCallback<U...> type;
+ };
+
+ template<typename... T>
+ uint64_t put(std::function<void (T...)> function)
+ {
+ auto callback = GenericCallbackType<sizeof...(T), T...>::type::create(std::move(function));
+ 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="trunkSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (170253 => 170254)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-06-21 22:02:26 UTC (rev 170253)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-06-21 22:25:34 UTC (rev 170254)
</span><span class="lines">@@ -1241,15 +1241,12 @@
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::validateCommand(const String& commandName, std::function<void (const String&, bool, int32_t, CallbackBase::Error)> callbackFunction)
</span><span class="cx"> {
</span><del>- RefPtr<ValidateCommandCallback> callback = ValidateCommandCallback::create(std::move(callbackFunction));
-
</del><span class="cx"> if (!isValid()) {
</span><del>- callback->invalidate();
</del><ins>+ callbackFunction(String(), false, 0, CallbackBase::Error::Unknown);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- uint64_t callbackID = callback->callbackID();
- m_callbacks.put(callback);
</del><ins>+ uint64_t callbackID = m_callbacks.put(std::move(callbackFunction));
</ins><span class="cx"> m_process->send(Messages::WebPage::ValidateCommand(commandName, callbackID), m_pageID);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2187,149 +2184,127 @@
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::runJavaScriptInMainFrame(const String& script, std::function<void (WebSerializedScriptValue*, CallbackBase::Error)> callbackFunction)
</span><span class="cx"> {
</span><del>- RefPtr<ScriptValueCallback> callback = ScriptValueCallback::create(std::move(callbackFunction));
</del><span class="cx"> if (!isValid()) {
</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>- uint64_t callbackID = callback->callbackID();
- m_callbacks.put(callback);
</del><ins>+ uint64_t callbackID = m_callbacks.put(std::move(callbackFunction));
</ins><span class="cx"> m_process->send(Messages::WebPage::RunJavaScriptInMainFrame(script, callbackID), m_pageID);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::getRenderTreeExternalRepresentation(std::function<void (const String&, CallbackBase::Error)> callbackFunction)
</span><span class="cx"> {
</span><del>- RefPtr<StringCallback> callback = StringCallback::create(std::move(callbackFunction));
</del><span class="cx"> if (!isValid()) {
</span><del>- callback->invalidate();
</del><ins>+ callbackFunction(String(), CallbackBase::Error::Unknown);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- uint64_t callbackID = callback->callbackID();
- m_callbacks.put(callback);
</del><ins>+ uint64_t callbackID = m_callbacks.put(std::move(callbackFunction));
</ins><span class="cx"> m_process->send(Messages::WebPage::GetRenderTreeExternalRepresentation(callbackID), m_pageID);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::getSourceForFrame(WebFrameProxy* frame, std::function<void (const String&, CallbackBase::Error)> callbackFunction)
</span><span class="cx"> {
</span><del>- RefPtr<StringCallback> callback = StringCallback::create(std::move(callbackFunction));
</del><span class="cx"> if (!isValid()) {
</span><del>- callback->invalidate();
</del><ins>+ callbackFunction(String(), CallbackBase::Error::Unknown);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- uint64_t callbackID = callback->callbackID();
</del><ins>+ uint64_t callbackID = m_callbacks.put(std::move(callbackFunction));
</ins><span class="cx"> m_loadDependentStringCallbackIDs.add(callbackID);
</span><del>- m_callbacks.put(callback);
</del><span class="cx"> m_process->send(Messages::WebPage::GetSourceForFrame(frame->frameID(), callbackID), m_pageID);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::getContentsAsString(std::function<void (const String&, CallbackBase::Error)> callbackFunction)
</span><span class="cx"> {
</span><del>- RefPtr<StringCallback> callback = StringCallback::create(std::move(callbackFunction));
</del><span class="cx"> if (!isValid()) {
</span><del>- callback->invalidate();
</del><ins>+ callbackFunction(String(), CallbackBase::Error::Unknown);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- uint64_t callbackID = callback->callbackID();
</del><ins>+ uint64_t callbackID = m_callbacks.put(std::move(callbackFunction));
</ins><span class="cx"> m_loadDependentStringCallbackIDs.add(callbackID);
</span><del>- m_callbacks.put(callback);
</del><span class="cx"> m_process->send(Messages::WebPage::GetContentsAsString(callbackID), m_pageID);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::getBytecodeProfile(std::function<void (const String&, CallbackBase::Error)> callbackFunction)
</span><span class="cx"> {
</span><del>- RefPtr<StringCallback> callback = StringCallback::create(std::move(callbackFunction));
</del><span class="cx"> if (!isValid()) {
</span><del>- callback->invalidate();
</del><ins>+ callbackFunction(String(), CallbackBase::Error::Unknown);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- uint64_t callbackID = callback->callbackID();
</del><ins>+ uint64_t callbackID = m_callbacks.put(std::move(callbackFunction));
</ins><span class="cx"> m_loadDependentStringCallbackIDs.add(callbackID);
</span><del>- m_callbacks.put(callback);
</del><span class="cx"> m_process->send(Messages::WebPage::GetBytecodeProfile(callbackID), m_pageID);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(MHTML)
</span><span class="cx"> void WebPageProxy::getContentsAsMHTMLData(std::function<void (API::Data*, CallbackBase::Error)> callbackFunction, bool useBinaryEncoding)
</span><span class="cx"> {
</span><del>- RefPtr<DataCallback> callback = DataCallback::create(std::move(callbackFunction));
</del><span class="cx"> if (!isValid()) {
</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>- uint64_t callbackID = callback->callbackID();
- m_callbacks.put(callback);
</del><ins>+ uint64_t callbackID = m_callbacks.put(std::move(callbackFunction));
</ins><span class="cx"> m_process->send(Messages::WebPage::GetContentsAsMHTMLData(callbackID, useBinaryEncoding), m_pageID);
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::getSelectionOrContentsAsString(std::function<void (const String&, CallbackBase::Error)> callbackFunction)
</span><span class="cx"> {
</span><del>- RefPtr<StringCallback> callback = StringCallback::create(std::move(callbackFunction));
</del><span class="cx"> if (!isValid()) {
</span><del>- callback->invalidate();
</del><ins>+ callbackFunction(String(), CallbackBase::Error::Unknown);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- uint64_t callbackID = callback->callbackID();
- m_callbacks.put(callback);
</del><ins>+ uint64_t callbackID = m_callbacks.put(std::move(callbackFunction));
</ins><span class="cx"> m_process->send(Messages::WebPage::GetSelectionOrContentsAsString(callbackID), m_pageID);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::getSelectionAsWebArchiveData(std::function<void (API::Data*, CallbackBase::Error)> callbackFunction)
</span><span class="cx"> {
</span><del>- RefPtr<DataCallback> callback = DataCallback::create(std::move(callbackFunction));
</del><span class="cx"> if (!isValid()) {
</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>- uint64_t callbackID = callback->callbackID();
- m_callbacks.put(callback);
</del><ins>+ uint64_t callbackID = m_callbacks.put(std::move(callbackFunction));
</ins><span class="cx"> m_process->send(Messages::WebPage::GetSelectionAsWebArchiveData(callbackID), m_pageID);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::getMainResourceDataOfFrame(WebFrameProxy* frame, std::function<void (API::Data*, CallbackBase::Error)> callbackFunction)
</span><span class="cx"> {
</span><del>- RefPtr<DataCallback> callback = DataCallback::create(std::move(callbackFunction));
</del><span class="cx"> if (!isValid() || !frame) {
</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>- uint64_t callbackID = callback->callbackID();
- m_callbacks.put(callback);
</del><ins>+ uint64_t callbackID = m_callbacks.put(std::move(callbackFunction));
</ins><span class="cx"> m_process->send(Messages::WebPage::GetMainResourceDataOfFrame(frame->frameID(), callbackID), m_pageID);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::getResourceDataFromFrame(WebFrameProxy* frame, API::URL* resourceURL, std::function<void (API::Data*, CallbackBase::Error)> callbackFunction)
</span><span class="cx"> {
</span><del>- RefPtr<DataCallback> callback = DataCallback::create(std::move(callbackFunction));
</del><span class="cx"> if (!isValid()) {
</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>- uint64_t callbackID = callback->callbackID();
- m_callbacks.put(callback);
</del><ins>+ uint64_t callbackID = m_callbacks.put(std::move(callbackFunction));
</ins><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><span class="cx"> void WebPageProxy::getWebArchiveOfFrame(WebFrameProxy* frame, std::function<void (API::Data*, CallbackBase::Error)> callbackFunction)
</span><span class="cx"> {
</span><del>- RefPtr<DataCallback> callback = DataCallback::create(std::move(callbackFunction));
</del><span class="cx"> if (!isValid()) {
</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>- uint64_t callbackID = callback->callbackID();
- m_callbacks.put(callback);
</del><ins>+ uint64_t callbackID = m_callbacks.put(std::move(callbackFunction));
</ins><span class="cx"> m_process->send(Messages::WebPage::GetWebArchiveOfFrame(frame->frameID(), callbackID), m_pageID);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -4968,16 +4943,12 @@
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::getMarkedRangeAsync(std::function<void (EditingRange, CallbackBase::Error)> callbackFunction)
</span><span class="cx"> {
</span><del>- RefPtr<EditingRangeCallback> callback = EditingRangeCallback::create(std::move(callbackFunction));
-
</del><span class="cx"> if (!isValid()) {
</span><del>- callback->invalidate();
</del><ins>+ callbackFunction(EditingRange(), CallbackBase::Error::Unknown);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- uint64_t callbackID = callback->callbackID();
- m_callbacks.put(callback);
-
</del><ins>+ uint64_t callbackID = m_callbacks.put(std::move(callbackFunction));
</ins><span class="cx"> process().send(Messages::WebPage::GetMarkedRangeAsync(callbackID), m_pageID);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -4990,39 +4961,29 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- uint64_t callbackID = callback->callbackID();
- m_callbacks.put(callback);
-
</del><ins>+ uint64_t callbackID = m_callbacks.put(std::move(callbackFunction));
</ins><span class="cx"> process().send(Messages::WebPage::GetSelectedRangeAsync(callbackID), m_pageID);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::characterIndexForPointAsync(const WebCore::IntPoint& point, std::function<void (uint64_t, CallbackBase::Error)> callbackFunction)
</span><span class="cx"> {
</span><del>- RefPtr<UnsignedCallback> callback = UnsignedCallback::create(std::move(callbackFunction));
-
</del><span class="cx"> if (!isValid()) {
</span><del>- callback->invalidate();
</del><ins>+ callbackFunction(0, CallbackBase::Error::Unknown);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- uint64_t callbackID = callback->callbackID();
- m_callbacks.put(callback);
-
</del><ins>+ uint64_t callbackID = m_callbacks.put(std::move(callbackFunction));
</ins><span class="cx"> process().send(Messages::WebPage::CharacterIndexForPointAsync(point, callbackID), m_pageID);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::firstRectForCharacterRangeAsync(const EditingRange& range, std::function<void (const WebCore::IntRect&, const EditingRange&, CallbackBase::Error)> callbackFunction)
</span><span class="cx"> {
</span><del>- RefPtr<RectForCharacterRangeCallback> callback = RectForCharacterRangeCallback::create(std::move(callbackFunction));
-
</del><span class="cx"> if (!isValid()) {
</span><del>- callback->invalidate();
</del><ins>+ callbackFunction(WebCore::IntRect(), EditingRange(), CallbackBase::Error::Unknown);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- uint64_t callbackID = callback->callbackID();
- m_callbacks.put(callback);
-
</del><ins>+ uint64_t callbackID = m_callbacks.put(std::move(callbackFunction));
</ins><span class="cx"> process().send(Messages::WebPage::FirstRectForCharacterRangeAsync(range, callbackID), m_pageID);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -5049,16 +5010,12 @@
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::takeSnapshot(IntRect rect, IntSize bitmapSize, SnapshotOptions options, std::function<void (const ShareableBitmap::Handle&, CallbackBase::Error)> callbackFunction)
</span><span class="cx"> {
</span><del>- RefPtr<ImageCallback> callback = ImageCallback::create(std::move(callbackFunction));
-
</del><span class="cx"> if (!isValid()) {
</span><del>- callback->invalidate();
</del><ins>+ callbackFunction(ShareableBitmap::Handle(), CallbackBase::Error::Unknown);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- uint64_t callbackID = callback->callbackID();
- m_callbacks.put(callback);
-
</del><ins>+ uint64_t callbackID = m_callbacks.put(std::move(callbackFunction));
</ins><span class="cx"> m_process->send(Messages::WebPage::TakeSnapshot(rect, bitmapSize, options, callbackID), m_pageID);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>