<!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>[183410] 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/183410">183410</a></dd>
<dt>Author</dt> <dd>zandobersek@gmail.com</dd>
<dt>Date</dt> <dd>2015-04-27 13:09:41 -0700 (Mon, 27 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[WK2] API::URL creation functions should return Ref<>
https://bugs.webkit.org/show_bug.cgi?id=144219
Reviewed by Darin Adler.
Have API::URL creation functions return Ref<>.
The call-sites are also updated, using and operating in the
returned Ref<> object, where possible.
* Shared/API/APIURL.h:
(API::URL::create):
* Shared/API/c/WKSharedAPICast.h:
(WebKit::toCopiedURLAPI):
* Shared/API/c/WKURL.cpp:
(WKURLCreateWithUTF8CString):
(WKURLCreateWithBaseURL):
* UIProcess/API/gtk/WebKitWebResource.cpp:
(webkit_web_resource_get_data):
* UIProcess/WebIconDatabase.cpp:
(WebKit::WebIconDatabase::didChangeIconForPageURL):
(WebKit::WebIconDatabase::notifyIconDataReadyForPageURL):
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::userAgent):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedAPIAPIURLh">trunk/Source/WebKit2/Shared/API/APIURL.h</a></li>
<li><a href="#trunkSourceWebKit2SharedAPIcWKSharedAPICasth">trunk/Source/WebKit2/Shared/API/c/WKSharedAPICast.h</a></li>
<li><a href="#trunkSourceWebKit2SharedAPIcWKURLcpp">trunk/Source/WebKit2/Shared/API/c/WKURL.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitWebResourcecpp">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebResource.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebIconDatabasecpp">trunk/Source/WebKit2/UIProcess/WebIconDatabase.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagecpp">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (183409 => 183410)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-04-27 20:05:14 UTC (rev 183409)
+++ trunk/Source/WebKit2/ChangeLog 2015-04-27 20:09:41 UTC (rev 183410)
</span><span class="lines">@@ -1,5 +1,31 @@
</span><span class="cx"> 2015-04-27 Zan Dobersek <zdobersek@igalia.com>
</span><span class="cx">
</span><ins>+ [WK2] API::URL creation functions should return Ref<>
+ https://bugs.webkit.org/show_bug.cgi?id=144219
+
+ Reviewed by Darin Adler.
+
+ Have API::URL creation functions return Ref<>.
+ The call-sites are also updated, using and operating in the
+ returned Ref<> object, where possible.
+
+ * Shared/API/APIURL.h:
+ (API::URL::create):
+ * Shared/API/c/WKSharedAPICast.h:
+ (WebKit::toCopiedURLAPI):
+ * Shared/API/c/WKURL.cpp:
+ (WKURLCreateWithUTF8CString):
+ (WKURLCreateWithBaseURL):
+ * UIProcess/API/gtk/WebKitWebResource.cpp:
+ (webkit_web_resource_get_data):
+ * UIProcess/WebIconDatabase.cpp:
+ (WebKit::WebIconDatabase::didChangeIconForPageURL):
+ (WebKit::WebIconDatabase::notifyIconDataReadyForPageURL):
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::userAgent):
+
+2015-04-27 Zan Dobersek <zdobersek@igalia.com>
+
</ins><span class="cx"> [WK2] API::String creation functions should return Ref<>
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=144218
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIAPIURLh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/API/APIURL.h (183409 => 183410)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/API/APIURL.h 2015-04-27 20:05:14 UTC (rev 183409)
+++ trunk/Source/WebKit2/Shared/API/APIURL.h 2015-04-27 20:09:41 UTC (rev 183410)
</span><span class="lines">@@ -29,26 +29,26 @@
</span><span class="cx"> #include "APIObject.h"
</span><span class="cx"> #include "WebCoreArgumentCoders.h"
</span><span class="cx"> #include <WebCore/URL.h>
</span><del>-#include <wtf/PassRefPtr.h>
</del><ins>+#include <wtf/Forward.h>
</ins><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="cx"> namespace API {
</span><span class="cx">
</span><span class="cx"> class URL : public ObjectImpl<Object::Type::URL> {
</span><span class="cx"> public:
</span><del>- static PassRefPtr<URL> create(const WTF::String& string)
</del><ins>+ static Ref<URL> create(const WTF::String& string)
</ins><span class="cx"> {
</span><del>- return adoptRef(new URL(string));
</del><ins>+ return adoptRef(*new URL(string));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- static PassRefPtr<URL> create(const URL* baseURL, const WTF::String& relativeURL)
</del><ins>+ static Ref<URL> create(const URL* baseURL, const WTF::String& relativeURL)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(baseURL);
</span><span class="cx"> baseURL->parseURLIfNecessary();
</span><span class="cx"> auto absoluteURL = std::make_unique<WebCore::URL>(*baseURL->m_parsedURL.get(), relativeURL);
</span><span class="cx"> const WTF::String& absoluteURLString = absoluteURL->string();
</span><span class="cx">
</span><del>- return adoptRef(new URL(WTF::move(absoluteURL), absoluteURLString));
</del><ins>+ return adoptRef(*new URL(WTF::move(absoluteURL), absoluteURLString));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool isNull() const { return m_string.isNull(); }
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIcWKSharedAPICasth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/API/c/WKSharedAPICast.h (183409 => 183410)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/API/c/WKSharedAPICast.h 2015-04-27 20:05:14 UTC (rev 183409)
+++ trunk/Source/WebKit2/Shared/API/c/WKSharedAPICast.h 2015-04-27 20:09:41 UTC (rev 183410)
</span><span class="lines">@@ -178,9 +178,8 @@
</span><span class="cx"> inline WKURLRef toCopiedURLAPI(const String& string)
</span><span class="cx"> {
</span><span class="cx"> if (!string)
</span><del>- return 0;
- RefPtr<API::URL> url = API::URL::create(string);
- return toAPI(url.release().leakRef());
</del><ins>+ return nullptr;
+ return toAPI(&API::URL::create(string).leakRef());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline String toWTFString(WKStringRef stringRef)
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIcWKURLcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/API/c/WKURL.cpp (183409 => 183410)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/API/c/WKURL.cpp 2015-04-27 20:05:14 UTC (rev 183409)
+++ trunk/Source/WebKit2/Shared/API/c/WKURL.cpp 2015-04-27 20:09:41 UTC (rev 183410)
</span><span class="lines">@@ -37,12 +37,12 @@
</span><span class="cx">
</span><span class="cx"> WKURLRef WKURLCreateWithUTF8CString(const char* string)
</span><span class="cx"> {
</span><del>- return toAPI(API::URL::create(String::fromUTF8(string)).leakRef());
</del><ins>+ return toAPI(&API::URL::create(String::fromUTF8(string)).leakRef());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WKURLRef WKURLCreateWithBaseURL(WKURLRef baseURL, const char* relative)
</span><span class="cx"> {
</span><del>- return toAPI(API::URL::create(toImpl(baseURL), String::fromUTF8(relative)).leakRef());
</del><ins>+ return toAPI(&API::URL::create(toImpl(baseURL), String::fromUTF8(relative)).leakRef());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WKStringRef WKURLCopyString(WKURLRef url)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitWebResourcecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebResource.cpp (183409 => 183410)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebResource.cpp 2015-04-27 20:05:14 UTC (rev 183409)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebResource.cpp 2015-04-27 20:09:41 UTC (rev 183410)
</span><span class="lines">@@ -372,7 +372,7 @@
</span><span class="cx"> });
</span><span class="cx"> else {
</span><span class="cx"> String url = String::fromUTF8(resource->priv->uri.data());
</span><del>- resource->priv->frame->getResourceData(API::URL::create(url).get(), [task](API::Data* data, CallbackBase::Error) {
</del><ins>+ resource->priv->frame->getResourceData(API::URL::create(url).ptr(), [task](API::Data* data, CallbackBase::Error) {
</ins><span class="cx"> resourceDataCallback(data, adoptGRef(task).get());
</span><span class="cx"> });
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebIconDatabasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebIconDatabase.cpp (183409 => 183410)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebIconDatabase.cpp 2015-04-27 20:05:14 UTC (rev 183409)
+++ trunk/Source/WebKit2/UIProcess/WebIconDatabase.cpp 2015-04-27 20:09:41 UTC (rev 183410)
</span><span class="lines">@@ -252,7 +252,7 @@
</span><span class="cx">
</span><span class="cx"> void WebIconDatabase::didChangeIconForPageURL(const String& pageURL)
</span><span class="cx"> {
</span><del>- m_iconDatabaseClient.didChangeIconForPageURL(this, API::URL::create(pageURL).get());
</del><ins>+ m_iconDatabaseClient.didChangeIconForPageURL(this, API::URL::create(pageURL).ptr());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebIconDatabase::didRemoveAllIcons()
</span><span class="lines">@@ -305,7 +305,7 @@
</span><span class="cx">
</span><span class="cx"> void WebIconDatabase::notifyIconDataReadyForPageURL(const String& pageURL)
</span><span class="cx"> {
</span><del>- m_iconDatabaseClient.iconDataReadyForPageURL(this, API::URL::create(pageURL).get());
</del><ins>+ m_iconDatabaseClient.iconDataReadyForPageURL(this, API::URL::create(pageURL).ptr());
</ins><span class="cx"> didChangeIconForPageURL(pageURL);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (183409 => 183410)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2015-04-27 20:05:14 UTC (rev 183409)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2015-04-27 20:09:41 UTC (rev 183410)
</span><span class="lines">@@ -2398,9 +2398,7 @@
</span><span class="cx"> String WebPage::userAgent(WebFrame* frame, const URL& webcoreURL) const
</span><span class="cx"> {
</span><span class="cx"> if (frame && m_loaderClient.client().userAgentForURL) {
</span><del>- RefPtr<API::URL> url = API::URL::create(webcoreURL);
-
- API::String* apiString = m_loaderClient.userAgentForURL(frame, url.get());
</del><ins>+ API::String* apiString = m_loaderClient.userAgentForURL(frame, API::URL::create(webcoreURL).ptr());
</ins><span class="cx"> if (apiString)
</span><span class="cx"> return apiString->string();
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>