<!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>[169994] 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/169994">169994</a></dd>
<dt>Author</dt> <dd>mitz@apple.com</dd>
<dt>Date</dt> <dd>2014-06-15 13:50:43 -0700 (Sun, 15 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Get rid of VoidAPICallback
https://bugs.webkit.org/show_bug.cgi?id=133928
Reviewed by Sam Weinig.
* UIProcess/API/C/WKPage.cpp:
(WKPageForceRepaint): Wrap the API callback in a generic callback here.
* UIProcess/API/C/WKPluginSiteDataManager.cpp:
(WKPluginSiteDataManagerClearSiteData): Ditto.
(WKPluginSiteDataManagerClearAllSiteData): Ditto.
* UIProcess/GenericCallback.h:
(WebKit::GenericCallback::performCallback): Added this helper for 0-argument callbacks.
(WebKit::VoidCallback::create): Deleted.
(WebKit::VoidCallback::~VoidCallback): Deleted.
(WebKit::VoidCallback::performCallback): Deleted.
(WebKit::VoidCallback::invalidate): Deleted.
(WebKit::VoidCallback::VoidCallback): Deleted.
(WebKit::VoidAPICallback::create): Deleted.
* UIProcess/mac/WKFullScreenWindowController.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKPagecpp">trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKPluginSiteDataManagercpp">trunk/Source/WebKit2/UIProcess/API/C/WKPluginSiteDataManager.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessGenericCallbackh">trunk/Source/WebKit2/UIProcess/GenericCallback.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacWKFullScreenWindowControllerh">trunk/Source/WebKit2/UIProcess/mac/WKFullScreenWindowController.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (169993 => 169994)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-06-15 19:35:34 UTC (rev 169993)
+++ trunk/Source/WebKit2/ChangeLog 2014-06-15 20:50:43 UTC (rev 169994)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2014-06-15 Dan Bernstein <mitz@apple.com>
+
+ Get rid of VoidAPICallback
+ https://bugs.webkit.org/show_bug.cgi?id=133928
+
+ Reviewed by Sam Weinig.
+
+ * UIProcess/API/C/WKPage.cpp:
+ (WKPageForceRepaint): Wrap the API callback in a generic callback here.
+
+ * UIProcess/API/C/WKPluginSiteDataManager.cpp:
+ (WKPluginSiteDataManagerClearSiteData): Ditto.
+ (WKPluginSiteDataManagerClearAllSiteData): Ditto.
+
+ * UIProcess/GenericCallback.h:
+ (WebKit::GenericCallback::performCallback): Added this helper for 0-argument callbacks.
+ (WebKit::VoidCallback::create): Deleted.
+ (WebKit::VoidCallback::~VoidCallback): Deleted.
+ (WebKit::VoidCallback::performCallback): Deleted.
+ (WebKit::VoidCallback::invalidate): Deleted.
+ (WebKit::VoidCallback::VoidCallback): Deleted.
+ (WebKit::VoidAPICallback::create): Deleted.
+
+ * UIProcess/mac/WKFullScreenWindowController.h:
+
</ins><span class="cx"> 2014-06-15 Zan Dobersek <zdobersek@igalia.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed build fix for the GTK+ port after r169990.
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp (169993 => 169994)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2014-06-15 19:35:34 UTC (rev 169993)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2014-06-15 20:50:43 UTC (rev 169994)
</span><span class="lines">@@ -1611,7 +1611,9 @@
</span><span class="cx">
</span><span class="cx"> void WKPageForceRepaint(WKPageRef pageRef, void* context, WKPageForceRepaintFunction callback)
</span><span class="cx"> {
</span><del>- toImpl(pageRef)->forceRepaint(VoidAPICallback::create(context, callback));
</del><ins>+ toImpl(pageRef)->forceRepaint(VoidCallback::create([context, callback](CallbackBase::Error error) {
+ callback(error == CallbackBase::Error::None ? nullptr : toAPI(API::Error::create().get()), context);
+ }));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WK_EXPORT WKURLRef WKPageCopyPendingAPIRequestURL(WKPageRef pageRef)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKPluginSiteDataManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPluginSiteDataManager.cpp (169993 => 169994)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKPluginSiteDataManager.cpp 2014-06-15 19:35:34 UTC (rev 169993)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPluginSiteDataManager.cpp 2014-06-15 20:50:43 UTC (rev 169994)
</span><span class="lines">@@ -72,7 +72,9 @@
</span><span class="cx"> void WKPluginSiteDataManagerClearSiteData(WKPluginSiteDataManagerRef managerRef, WKArrayRef sitesRef, WKClearSiteDataFlags flags, uint64_t maxAgeInSeconds, void* context, WKPluginSiteDataManagerClearSiteDataFunction function)
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API)
</span><del>- toImpl(managerRef)->clearSiteData(toImpl(sitesRef), toNPClearSiteDataFlags(flags), maxAgeInSeconds, VoidAPICallback::create(context, function));
</del><ins>+ toImpl(managerRef)->clearSiteData(toImpl(sitesRef), toNPClearSiteDataFlags(flags), maxAgeInSeconds, VoidCallback::create([context, function](CallbackBase::Error error) {
+ function(error == CallbackBase::Error::None ? nullptr : toAPI(API::Error::create().get()), context);
+ }));
</ins><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(managerRef);
</span><span class="cx"> UNUSED_PARAM(sitesRef);
</span><span class="lines">@@ -86,7 +88,9 @@
</span><span class="cx"> void WKPluginSiteDataManagerClearAllSiteData(WKPluginSiteDataManagerRef managerRef, void* context, WKPluginSiteDataManagerClearSiteDataFunction function)
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API)
</span><del>- toImpl(managerRef)->clearSiteData(0, NP_CLEAR_ALL, std::numeric_limits<uint64_t>::max(), VoidAPICallback::create(context, function));
</del><ins>+ toImpl(managerRef)->clearSiteData(0, NP_CLEAR_ALL, std::numeric_limits<uint64_t>::max(), VoidCallback::create([context, function](CallbackBase::Error error) {
+ function(error == CallbackBase::Error::None ? nullptr : toAPI(API::Error::create().get()), context);
+ }));
</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="trunkSourceWebKit2UIProcessGenericCallbackh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/GenericCallback.h (169993 => 169994)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/GenericCallback.h 2014-06-15 19:35:34 UTC (rev 169993)
+++ trunk/Source/WebKit2/UIProcess/GenericCallback.h 2014-06-15 20:50:43 UTC (rev 169994)
</span><span class="lines">@@ -69,61 +69,6 @@
</span><span class="cx"> uint64_t m_callbackID;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-class VoidCallback : public CallbackBase {
-public:
- typedef std::function<void (Error)> CallbackFunction;
-
- static PassRefPtr<VoidCallback> create(CallbackFunction callback)
- {
- return adoptRef(new VoidCallback(callback));
- }
-
- virtual ~VoidCallback()
- {
- ASSERT(!m_callback);
- }
-
- void performCallback()
- {
- if (!m_callback)
- return;
-
- m_callback(Error::None);
-
- m_callback = nullptr;
- }
-
- void invalidate(Error error)
- {
- if (!m_callback)
- return;
-
- m_callback(error);
-
- m_callback = nullptr;
- }
-
-private:
- VoidCallback(CallbackFunction callback)
- : m_callback(callback)
- {
- }
-
- CallbackFunction m_callback;
-};
-
-class VoidAPICallback : public CallbackBase {
-public:
- typedef void (*CallbackFunction)(WKErrorRef, void*);
-
- static PassRefPtr<VoidCallback> create(void* context, CallbackFunction callback)
- {
- return VoidCallback::create([context, callback](Error error) {
- callback(error != Error::None ? toAPI(API::Error::create().get()) : 0, context);
- });
- }
-};
-
</del><span class="cx"> template<typename... T>
</span><span class="cx"> class GenericCallback : public CallbackBase {
</span><span class="cx"> public:
</span><span class="lines">@@ -148,7 +93,12 @@
</span><span class="cx">
</span><span class="cx"> m_callback = nullptr;
</span><span class="cx"> }
</span><del>-
</del><ins>+
+ void performCallback()
+ {
+ performCallbackWithReturnValue();
+ }
+
</ins><span class="cx"> void invalidate(Error error = Error::Unknown)
</span><span class="cx"> {
</span><span class="cx"> if (!m_callback)
</span><span class="lines">@@ -176,6 +126,7 @@
</span><span class="cx"> };
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+typedef GenericCallback<> VoidCallback;
</ins><span class="cx"> typedef GenericCallback<const Vector<WebCore::IntRect>&, double> ComputedPagesCallback;
</span><span class="cx"> typedef GenericCallback<const ShareableBitmap::Handle&> ImageCallback;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacWKFullScreenWindowControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/WKFullScreenWindowController.h (169993 => 169994)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/WKFullScreenWindowController.h 2014-06-15 19:35:34 UTC (rev 169993)
+++ trunk/Source/WebKit2/UIProcess/mac/WKFullScreenWindowController.h 2014-06-15 20:50:43 UTC (rev 169994)
</span><span class="lines">@@ -25,12 +25,12 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(FULLSCREEN_API)
</span><span class="cx">
</span><ins>+#import "GenericCallback.h"
</ins><span class="cx"> #import <wtf/OwnPtr.h>
</span><span class="cx"> #import <wtf/RetainPtr.h>
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx"> class LayerTreeContext;
</span><del>-class VoidCallback;
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span></span></pre>
</div>
</div>
</body>
</html>