<!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>[183459] 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/183459">183459</a></dd>
<dt>Author</dt> <dd>zandobersek@gmail.com</dd>
<dt>Date</dt> <dd>2015-04-27 23:31:29 -0700 (Mon, 27 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[WK2] API::Error creation functions should return Ref<>
https://bugs.webkit.org/show_bug.cgi?id=144222
Reviewed by Darin Adler.
Have API::Error creation functions return Ref<>.
The call-sites are also updated, using and operating
on the returned Ref<> object where possible.
* Shared/API/APIError.h:
(API::Error::create):
* Shared/API/c/cf/WKErrorCF.cpp:
(WKErrorCreateWithCFError):
* UIProcess/API/C/WKOriginDataManager.cpp:
(WKOriginDataManagerDeleteEntriesForOrigin):
(WKOriginDataManagerDeleteEntriesModifiedBetweenDates):
(WKOriginDataManagerDeleteAllEntries):
* UIProcess/API/C/WKPage.cpp:
(toGenericCallbackFunction):
(WKPageForceRepaint):
(WKPageValidateCommand):
(WKPageComputePagesForPrinting):
* UIProcess/API/C/WKPluginSiteDataManager.cpp:
(WKPluginSiteDataManagerClearSiteData):
(WKPluginSiteDataManagerClearAllSiteData):
* UIProcess/GenericCallback.h:
(WebKit::toGenericCallbackFunction):
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::printFinishedCallback):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedAPIAPIErrorh">trunk/Source/WebKit2/Shared/API/APIError.h</a></li>
<li><a href="#trunkSourceWebKit2SharedAPIccfWKErrorCFcpp">trunk/Source/WebKit2/Shared/API/c/cf/WKErrorCF.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKOriginDataManagercpp">trunk/Source/WebKit2/UIProcess/API/C/WKOriginDataManager.cpp</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="#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 (183458 => 183459)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-04-28 05:54:02 UTC (rev 183458)
+++ trunk/Source/WebKit2/ChangeLog 2015-04-28 06:31:29 UTC (rev 183459)
</span><span class="lines">@@ -1,3 +1,35 @@
</span><ins>+2015-04-27 Zan Dobersek <zdobersek@igalia.com>
+
+ [WK2] API::Error creation functions should return Ref<>
+ https://bugs.webkit.org/show_bug.cgi?id=144222
+
+ Reviewed by Darin Adler.
+
+ Have API::Error creation functions return Ref<>.
+ The call-sites are also updated, using and operating
+ on the returned Ref<> object where possible.
+
+ * Shared/API/APIError.h:
+ (API::Error::create):
+ * Shared/API/c/cf/WKErrorCF.cpp:
+ (WKErrorCreateWithCFError):
+ * UIProcess/API/C/WKOriginDataManager.cpp:
+ (WKOriginDataManagerDeleteEntriesForOrigin):
+ (WKOriginDataManagerDeleteEntriesModifiedBetweenDates):
+ (WKOriginDataManagerDeleteAllEntries):
+ * UIProcess/API/C/WKPage.cpp:
+ (toGenericCallbackFunction):
+ (WKPageForceRepaint):
+ (WKPageValidateCommand):
+ (WKPageComputePagesForPrinting):
+ * UIProcess/API/C/WKPluginSiteDataManager.cpp:
+ (WKPluginSiteDataManagerClearSiteData):
+ (WKPluginSiteDataManagerClearAllSiteData):
+ * UIProcess/GenericCallback.h:
+ (WebKit::toGenericCallbackFunction):
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::printFinishedCallback):
+
</ins><span class="cx"> 2015-04-27 Sungmann Cho <sungmann.cho@navercorp.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Remove unnecessary semicolon from WebKitNotificationProvider.h.
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIAPIErrorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/API/APIError.h (183458 => 183459)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/API/APIError.h 2015-04-28 05:54:02 UTC (rev 183458)
+++ trunk/Source/WebKit2/Shared/API/APIError.h 2015-04-28 06:31:29 UTC (rev 183459)
</span><span class="lines">@@ -28,7 +28,6 @@
</span><span class="cx">
</span><span class="cx"> #include "APIObject.h"
</span><span class="cx"> #include <WebCore/ResourceError.h>
</span><del>-#include <wtf/PassRefPtr.h>
</del><span class="cx">
</span><span class="cx"> namespace IPC {
</span><span class="cx"> class ArgumentDecoder;
</span><span class="lines">@@ -39,14 +38,14 @@
</span><span class="cx">
</span><span class="cx"> class Error : public ObjectImpl<Object::Type::Error> {
</span><span class="cx"> public:
</span><del>- static PassRefPtr<Error> create()
</del><ins>+ static Ref<Error> create()
</ins><span class="cx"> {
</span><del>- return adoptRef(new Error);
</del><ins>+ return adoptRef(*new Error);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- static PassRefPtr<Error> create(const WebCore::ResourceError& error)
</del><ins>+ static Ref<Error> create(const WebCore::ResourceError& error)
</ins><span class="cx"> {
</span><del>- return adoptRef(new Error(error));
</del><ins>+ return adoptRef(*new Error(error));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static const WTF::String& webKitErrorDomain();
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIccfWKErrorCFcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/API/c/cf/WKErrorCF.cpp (183458 => 183459)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/API/c/cf/WKErrorCF.cpp 2015-04-28 05:54:02 UTC (rev 183458)
+++ trunk/Source/WebKit2/Shared/API/c/cf/WKErrorCF.cpp 2015-04-28 06:31:29 UTC (rev 183459)
</span><span class="lines">@@ -34,8 +34,7 @@
</span><span class="cx">
</span><span class="cx"> WKErrorRef WKErrorCreateWithCFError(CFErrorRef cfError)
</span><span class="cx"> {
</span><del>- RefPtr<API::Error> error = API::Error::create(ResourceError(cfError));
- return toAPI(error.release().leakRef());
</del><ins>+ return toAPI(&API::Error::create(ResourceError(cfError)).leakRef());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> CFErrorRef WKErrorCopyCFError(CFAllocatorRef alloc, WKErrorRef error)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKOriginDataManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKOriginDataManager.cpp (183458 => 183459)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKOriginDataManager.cpp 2015-04-28 05:54:02 UTC (rev 183458)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKOriginDataManager.cpp 2015-04-28 06:31:29 UTC (rev 183459)
</span><span class="lines">@@ -44,20 +44,20 @@
</span><span class="cx"> void WKOriginDataManagerDeleteEntriesForOrigin(WKOriginDataManagerRef originDataManagerRef, WKOriginDataTypes types, WKSecurityOriginRef originRef, void* context, WKOriginDataManagerDeleteEntriesCallbackFunction callback)
</span><span class="cx"> {
</span><span class="cx"> toImpl(originDataManagerRef)->deleteEntriesForOrigin(types, toImpl(originRef), [context, callback](CallbackBase::Error error) {
</span><del>- callback(error != CallbackBase::Error::None ? toAPI(API::Error::create().get()) : 0, context);
</del><ins>+ callback(error != CallbackBase::Error::None ? toAPI(API::Error::create().ptr()) : 0, context);
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WKOriginDataManagerDeleteEntriesModifiedBetweenDates(WKOriginDataManagerRef originDataManagerRef, WKOriginDataTypes types, double startDate, double endDate, void* context, WKOriginDataManagerDeleteEntriesCallbackFunction callback)
</span><span class="cx"> {
</span><span class="cx"> toImpl(originDataManagerRef)->deleteEntriesModifiedBetweenDates(types, startDate, endDate, [context, callback](CallbackBase::Error error) {
</span><del>- callback(error != CallbackBase::Error::None ? toAPI(API::Error::create().get()) : 0, context);
</del><ins>+ callback(error != CallbackBase::Error::None ? toAPI(API::Error::create().ptr()) : 0, context);
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WKOriginDataManagerDeleteAllEntries(WKOriginDataManagerRef originDataManagerRef, WKOriginDataTypes types, void* context, WKOriginDataManagerDeleteEntriesCallbackFunction callback)
</span><span class="cx"> {
</span><span class="cx"> toImpl(originDataManagerRef)->deleteAllEntries(types, [context, callback](CallbackBase::Error error) {
</span><del>- callback(error != CallbackBase::Error::None ? toAPI(API::Error::create().get()) : 0, context);
</del><ins>+ callback(error != CallbackBase::Error::None ? toAPI(API::Error::create().ptr()) : 0, context);
</ins><span class="cx"> });
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp (183458 => 183459)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2015-04-28 05:54:02 UTC (rev 183458)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2015-04-28 06:31:29 UTC (rev 183459)
</span><span class="lines">@@ -1954,7 +1954,7 @@
</span><span class="cx"> static std::function<void (const String&, WebKit::CallbackBase::Error)> toGenericCallbackFunction(void* context, void (*callback)(WKStringRef, WKErrorRef, void*))
</span><span class="cx"> {
</span><span class="cx"> return [context, callback](const String& returnValue, WebKit::CallbackBase::Error error) {
</span><del>- callback(toAPI(API::String::create(returnValue).ptr()), error != WebKit::CallbackBase::Error::None ? toAPI(API::Error::create().get()) : 0, context);
</del><ins>+ callback(toAPI(API::String::create(returnValue).ptr()), error != WebKit::CallbackBase::Error::None ? toAPI(API::Error::create().ptr()) : 0, context);
</ins><span class="cx"> };
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1998,7 +1998,7 @@
</span><span class="cx"> void WKPageForceRepaint(WKPageRef pageRef, void* context, WKPageForceRepaintFunction callback)
</span><span class="cx"> {
</span><span class="cx"> toImpl(pageRef)->forceRepaint(VoidCallback::create([context, callback](WebKit::CallbackBase::Error error) {
</span><del>- callback(error == WebKit::CallbackBase::Error::None ? nullptr : toAPI(API::Error::create().get()), context);
</del><ins>+ callback(error == WebKit::CallbackBase::Error::None ? nullptr : toAPI(API::Error::create().ptr()), context);
</ins><span class="cx"> }));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2035,7 +2035,7 @@
</span><span class="cx"> void WKPageValidateCommand(WKPageRef pageRef, WKStringRef command, void* context, WKPageValidateCommandCallback callback)
</span><span class="cx"> {
</span><span class="cx"> toImpl(pageRef)->validateCommand(toImpl(command)->string(), [context, callback](const String& commandName, bool isEnabled, int32_t state, WebKit::CallbackBase::Error error) {
</span><del>- callback(toAPI(API::String::create(commandName).ptr()), isEnabled, state, error != WebKit::CallbackBase::Error::None ? toAPI(API::Error::create().get()) : 0, context);
</del><ins>+ callback(toAPI(API::String::create(commandName).ptr()), isEnabled, state, error != WebKit::CallbackBase::Error::None ? toAPI(API::Error::create().ptr()) : 0, context);
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2060,7 +2060,7 @@
</span><span class="cx"> Vector<WKRect> wkRects(rects.size());
</span><span class="cx"> for (size_t i = 0; i < rects.size(); ++i)
</span><span class="cx"> wkRects[i] = toAPI(rects[i]);
</span><del>- callback(wkRects.data(), wkRects.size(), scaleFactor, error != WebKit::CallbackBase::Error::None ? toAPI(API::Error::create().get()) : 0, context);
</del><ins>+ callback(wkRects.data(), wkRects.size(), scaleFactor, error != WebKit::CallbackBase::Error::None ? toAPI(API::Error::create().ptr()) : 0, context);
</ins><span class="cx"> }));
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKPluginSiteDataManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPluginSiteDataManager.cpp (183458 => 183459)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKPluginSiteDataManager.cpp 2015-04-28 05:54:02 UTC (rev 183458)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPluginSiteDataManager.cpp 2015-04-28 06:31:29 UTC (rev 183459)
</span><span class="lines">@@ -76,7 +76,7 @@
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API)
</span><span class="cx"> toImpl(managerRef)->clearSiteData(toImpl(sitesRef), toNPClearSiteDataFlags(flags), maxAgeInSeconds, [context, function](CallbackBase::Error error) {
</span><del>- function(error == CallbackBase::Error::None ? nullptr : toAPI(API::Error::create().get()), context);
</del><ins>+ function(error == CallbackBase::Error::None ? nullptr : toAPI(API::Error::create().ptr()), context);
</ins><span class="cx"> });
</span><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(managerRef);
</span><span class="lines">@@ -92,7 +92,7 @@
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API)
</span><span class="cx"> toImpl(managerRef)->clearSiteData(0, NP_CLEAR_ALL, std::numeric_limits<uint64_t>::max(), [context, function](CallbackBase::Error error) {
</span><del>- function(error == CallbackBase::Error::None ? nullptr : toAPI(API::Error::create().get()), context);
</del><ins>+ function(error == CallbackBase::Error::None ? nullptr : toAPI(API::Error::create().ptr()), context);
</ins><span class="cx"> });
</span><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(managerRef);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessGenericCallbackh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/GenericCallback.h (183458 => 183459)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/GenericCallback.h 2015-04-28 05:54:02 UTC (rev 183458)
+++ trunk/Source/WebKit2/UIProcess/GenericCallback.h 2015-04-28 06:31:29 UTC (rev 183459)
</span><span class="lines">@@ -150,7 +150,7 @@
</span><span class="cx"> static typename GenericCallback<InternalReturnValueType>::CallbackFunction toGenericCallbackFunction(void* context, void (*callback)(APIReturnValueType, WKErrorRef, void*))
</span><span class="cx"> {
</span><span class="cx"> return [context, callback](InternalReturnValueType returnValue, CallbackBase::Error error) {
</span><del>- callback(toAPI(returnValue), error != CallbackBase::Error::None ? toAPI(API::Error::create().get()) : 0, context);
</del><ins>+ callback(toAPI(returnValue), error != CallbackBase::Error::None ? toAPI(API::Error::create().ptr()) : 0, context);
</ins><span class="cx"> };
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (183458 => 183459)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2015-04-28 05:54:02 UTC (rev 183458)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2015-04-28 06:31:29 UTC (rev 183459)
</span><span class="lines">@@ -4681,8 +4681,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- RefPtr<API::Error> error = API::Error::create(printError);
- callback->performCallbackWithReturnValue(error.get());
</del><ins>+ callback->performCallbackWithReturnValue(API::Error::create(printError).ptr());
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>