<!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>[183409] 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/183409">183409</a></dd>
<dt>Author</dt> <dd>zandobersek@gmail.com</dd>
<dt>Date</dt> <dd>2015-04-27 13:05:14 -0700 (Mon, 27 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[WK2] API::String creation functions should return Ref<>
https://bugs.webkit.org/show_bug.cgi?id=144218
Reviewed by Darin Adler.
Have API::String creation functions return Ref<>.
The call-sites are also updated, using and operating on the returned
Ref<> object, where possible.
* Shared/API/APIString.h:
* Shared/API/c/WKPluginInformation.cpp:
(WKPluginInformationBundleIdentifierKey):
(WKPluginInformationBundleVersionKey):
(WKPluginInformationBundleShortVersionKey):
(WKPluginInformationPathKey):
(WKPluginInformationDisplayNameKey):
(WKPluginInformationDefaultLoadPolicyKey):
(WKPluginInformationUpdatePastLastBlockedVersionIsKnownAvailableKey):
(WKPluginInformationHasSandboxProfileKey):
(WKPluginInformationFrameURLKey):
(WKPluginInformationMIMETypeKey):
(WKPluginInformationPageURLKey):
(WKPluginInformationPluginspageAttributeURLKey):
(WKPluginInformationPluginURLKey):
(WKPlugInInformationReplacementObscuredKey):
* Shared/API/c/WKSharedAPICast.h:
(WebKit::ProxyingRefPtr::ProxyingRefPtr):
(WebKit::toCopiedAPI):
* Shared/API/c/WKString.cpp:
(WKStringCreateWithUTF8CString):
(WKStringCreateWithJSString):
* UIProcess/API/C/WKDatabaseManager.cpp:
(WKDatabaseManagerGetOriginKey):
(WKDatabaseManagerGetOriginQuotaKey):
(WKDatabaseManagerGetOriginUsageKey):
(WKDatabaseManagerGetDatabaseDetailsKey):
(WKDatabaseManagerGetDatabaseDetailsNameKey):
(WKDatabaseManagerGetDatabaseDetailsDisplayNameKey):
(WKDatabaseManagerGetDatabaseDetailsExpectedUsageKey):
(WKDatabaseManagerGetDatabaseDetailsCurrentUsageKey):
(WKDatabaseManagerGetDatabaseDetailsCreationTimeKey):
(WKDatabaseManagerGetDatabaseDetailsModificationTimeKey):
* UIProcess/API/C/WKKeyValueStorageManager.cpp:
(WKKeyValueStorageManagerGetOriginKey):
(WKKeyValueStorageManagerGetCreationTimeKey):
(WKKeyValueStorageManagerGetModificationTimeKey):
* UIProcess/API/C/WKPage.cpp:
(WKPageGetSessionHistoryURLValueType):
(WKPageGetSessionBackForwardListItemValueType):
(toGenericCallbackFunction):
(WKPageValidateCommand):
* UIProcess/WebProcessPool.cpp:
(WebKit::WebProcessPool::didReceiveInvalidMessage):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedAPIAPIStringh">trunk/Source/WebKit2/Shared/API/APIString.h</a></li>
<li><a href="#trunkSourceWebKit2SharedAPIcWKPluginInformationcpp">trunk/Source/WebKit2/Shared/API/c/WKPluginInformation.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedAPIcWKSharedAPICasth">trunk/Source/WebKit2/Shared/API/c/WKSharedAPICast.h</a></li>
<li><a href="#trunkSourceWebKit2SharedAPIcWKStringcpp">trunk/Source/WebKit2/Shared/API/c/WKString.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKDatabaseManagercpp">trunk/Source/WebKit2/UIProcess/API/C/WKDatabaseManager.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKKeyValueStorageManagercpp">trunk/Source/WebKit2/UIProcess/API/C/WKKeyValueStorageManager.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKPagecpp">trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebProcessPoolcpp">trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (183408 => 183409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-04-27 19:36:25 UTC (rev 183408)
+++ trunk/Source/WebKit2/ChangeLog 2015-04-27 20:05:14 UTC (rev 183409)
</span><span class="lines">@@ -1,3 +1,59 @@
</span><ins>+2015-04-27 Zan Dobersek <zdobersek@igalia.com>
+
+ [WK2] API::String creation functions should return Ref<>
+ https://bugs.webkit.org/show_bug.cgi?id=144218
+
+ Reviewed by Darin Adler.
+
+ Have API::String creation functions return Ref<>.
+ The call-sites are also updated, using and operating on the returned
+ Ref<> object, where possible.
+
+ * Shared/API/APIString.h:
+ * Shared/API/c/WKPluginInformation.cpp:
+ (WKPluginInformationBundleIdentifierKey):
+ (WKPluginInformationBundleVersionKey):
+ (WKPluginInformationBundleShortVersionKey):
+ (WKPluginInformationPathKey):
+ (WKPluginInformationDisplayNameKey):
+ (WKPluginInformationDefaultLoadPolicyKey):
+ (WKPluginInformationUpdatePastLastBlockedVersionIsKnownAvailableKey):
+ (WKPluginInformationHasSandboxProfileKey):
+ (WKPluginInformationFrameURLKey):
+ (WKPluginInformationMIMETypeKey):
+ (WKPluginInformationPageURLKey):
+ (WKPluginInformationPluginspageAttributeURLKey):
+ (WKPluginInformationPluginURLKey):
+ (WKPlugInInformationReplacementObscuredKey):
+ * Shared/API/c/WKSharedAPICast.h:
+ (WebKit::ProxyingRefPtr::ProxyingRefPtr):
+ (WebKit::toCopiedAPI):
+ * Shared/API/c/WKString.cpp:
+ (WKStringCreateWithUTF8CString):
+ (WKStringCreateWithJSString):
+ * UIProcess/API/C/WKDatabaseManager.cpp:
+ (WKDatabaseManagerGetOriginKey):
+ (WKDatabaseManagerGetOriginQuotaKey):
+ (WKDatabaseManagerGetOriginUsageKey):
+ (WKDatabaseManagerGetDatabaseDetailsKey):
+ (WKDatabaseManagerGetDatabaseDetailsNameKey):
+ (WKDatabaseManagerGetDatabaseDetailsDisplayNameKey):
+ (WKDatabaseManagerGetDatabaseDetailsExpectedUsageKey):
+ (WKDatabaseManagerGetDatabaseDetailsCurrentUsageKey):
+ (WKDatabaseManagerGetDatabaseDetailsCreationTimeKey):
+ (WKDatabaseManagerGetDatabaseDetailsModificationTimeKey):
+ * UIProcess/API/C/WKKeyValueStorageManager.cpp:
+ (WKKeyValueStorageManagerGetOriginKey):
+ (WKKeyValueStorageManagerGetCreationTimeKey):
+ (WKKeyValueStorageManagerGetModificationTimeKey):
+ * UIProcess/API/C/WKPage.cpp:
+ (WKPageGetSessionHistoryURLValueType):
+ (WKPageGetSessionBackForwardListItemValueType):
+ (toGenericCallbackFunction):
+ (WKPageValidateCommand):
+ * UIProcess/WebProcessPool.cpp:
+ (WebKit::WebProcessPool::didReceiveInvalidMessage):
+
</ins><span class="cx"> 2015-04-27 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> Make 'enum NavigationType' be an enum class
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIAPIStringh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/API/APIString.h (183408 => 183409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/API/APIString.h 2015-04-27 19:36:25 UTC (rev 183408)
+++ trunk/Source/WebKit2/Shared/API/APIString.h 2015-04-27 20:05:14 UTC (rev 183409)
</span><span class="lines">@@ -27,7 +27,7 @@
</span><span class="cx"> #define APIString_h
</span><span class="cx">
</span><span class="cx"> #include "APIObject.h"
</span><del>-#include <wtf/PassRefPtr.h>
</del><ins>+#include <wtf/Ref.h>
</ins><span class="cx"> #include <wtf/text/StringView.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx"> #include <wtf/unicode/UTF8.h>
</span><span class="lines">@@ -36,17 +36,17 @@
</span><span class="cx">
</span><span class="cx"> class String final : public ObjectImpl<Object::Type::String> {
</span><span class="cx"> public:
</span><del>- static RefPtr<String> createNull()
</del><ins>+ static Ref<String> createNull()
</ins><span class="cx"> {
</span><del>- return adoptRef(new String);
</del><ins>+ return adoptRef(*new String);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- static RefPtr<String> create(WTF::String&& string)
</del><ins>+ static Ref<String> create(WTF::String&& string)
</ins><span class="cx"> {
</span><del>- return adoptRef(new String(string.isNull() ? WTF::String(StringImpl::empty()) : string.isolatedCopy()));
</del><ins>+ return adoptRef(*new String(string.isNull() ? WTF::String(StringImpl::empty()) : string.isolatedCopy()));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- static RefPtr<String> create(const WTF::String& string)
</del><ins>+ static Ref<String> create(const WTF::String& string)
</ins><span class="cx"> {
</span><span class="cx"> return create(string.isolatedCopy());
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIcWKPluginInformationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/API/c/WKPluginInformation.cpp (183408 => 183409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/API/c/WKPluginInformation.cpp 2015-04-27 19:36:25 UTC (rev 183408)
+++ trunk/Source/WebKit2/Shared/API/c/WKPluginInformation.cpp 2015-04-27 20:05:14 UTC (rev 183409)
</span><span class="lines">@@ -35,8 +35,8 @@
</span><span class="cx"> WKStringRef WKPluginInformationBundleIdentifierKey()
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API)
</span><del>- static API::String* key = API::String::create(pluginInformationBundleIdentifierKey()).leakRef();
- return toAPI(key);
</del><ins>+ static API::String& key = API::String::create(pluginInformationBundleIdentifierKey()).leakRef();
+ return toAPI(&key);
</ins><span class="cx"> #else
</span><span class="cx"> return 0;
</span><span class="cx"> #endif
</span><span class="lines">@@ -45,8 +45,8 @@
</span><span class="cx"> WKStringRef WKPluginInformationBundleVersionKey()
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API)
</span><del>- static API::String* key = API::String::create(pluginInformationBundleVersionKey()).leakRef();
- return toAPI(key);
</del><ins>+ static API::String& key = API::String::create(pluginInformationBundleVersionKey()).leakRef();
+ return toAPI(&key);
</ins><span class="cx"> #else
</span><span class="cx"> return 0;
</span><span class="cx"> #endif
</span><span class="lines">@@ -55,8 +55,8 @@
</span><span class="cx"> WKStringRef WKPluginInformationBundleShortVersionKey()
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API)
</span><del>- static API::String* key = API::String::create(pluginInformationBundleShortVersionKey()).leakRef();
- return toAPI(key);
</del><ins>+ static API::String& key = API::String::create(pluginInformationBundleShortVersionKey()).leakRef();
+ return toAPI(&key);
</ins><span class="cx"> #else
</span><span class="cx"> return 0;
</span><span class="cx"> #endif
</span><span class="lines">@@ -65,8 +65,8 @@
</span><span class="cx"> WKStringRef WKPluginInformationPathKey()
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API)
</span><del>- static API::String* key = API::String::create(pluginInformationPathKey()).leakRef();
- return toAPI(key);
</del><ins>+ static API::String& key = API::String::create(pluginInformationPathKey()).leakRef();
+ return toAPI(&key);
</ins><span class="cx"> #else
</span><span class="cx"> return 0;
</span><span class="cx"> #endif
</span><span class="lines">@@ -75,8 +75,8 @@
</span><span class="cx"> WKStringRef WKPluginInformationDisplayNameKey()
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API)
</span><del>- static API::String* key = API::String::create(pluginInformationDisplayNameKey()).leakRef();
- return toAPI(key);
</del><ins>+ static API::String& key = API::String::create(pluginInformationDisplayNameKey()).leakRef();
+ return toAPI(&key);
</ins><span class="cx"> #else
</span><span class="cx"> return 0;
</span><span class="cx"> #endif
</span><span class="lines">@@ -85,8 +85,8 @@
</span><span class="cx"> WKStringRef WKPluginInformationDefaultLoadPolicyKey()
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API)
</span><del>- static API::String* key = API::String::create(pluginInformationDefaultLoadPolicyKey()).leakRef();
- return toAPI(key);
</del><ins>+ static API::String& key = API::String::create(pluginInformationDefaultLoadPolicyKey()).leakRef();
+ return toAPI(&key);
</ins><span class="cx"> #else
</span><span class="cx"> return 0;
</span><span class="cx"> #endif
</span><span class="lines">@@ -95,8 +95,8 @@
</span><span class="cx"> WKStringRef WKPluginInformationUpdatePastLastBlockedVersionIsKnownAvailableKey()
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API)
</span><del>- static API::String* key = API::String::create(pluginInformationUpdatePastLastBlockedVersionIsKnownAvailableKey()).leakRef();
- return toAPI(key);
</del><ins>+ static API::String& key = API::String::create(pluginInformationUpdatePastLastBlockedVersionIsKnownAvailableKey()).leakRef();
+ return toAPI(&key);
</ins><span class="cx"> #else
</span><span class="cx"> return 0;
</span><span class="cx"> #endif
</span><span class="lines">@@ -105,8 +105,8 @@
</span><span class="cx"> WKStringRef WKPluginInformationHasSandboxProfileKey()
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API)
</span><del>- static API::String* key = API::String::create(pluginInformationHasSandboxProfileKey()).leakRef();
- return toAPI(key);
</del><ins>+ static API::String& key = API::String::create(pluginInformationHasSandboxProfileKey()).leakRef();
+ return toAPI(&key);
</ins><span class="cx"> #else
</span><span class="cx"> return 0;
</span><span class="cx"> #endif
</span><span class="lines">@@ -115,8 +115,8 @@
</span><span class="cx"> WKStringRef WKPluginInformationFrameURLKey()
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API)
</span><del>- static API::String* key = API::String::create(pluginInformationFrameURLKey()).leakRef();
- return toAPI(key);
</del><ins>+ static API::String& key = API::String::create(pluginInformationFrameURLKey()).leakRef();
+ return toAPI(&key);
</ins><span class="cx"> #else
</span><span class="cx"> return 0;
</span><span class="cx"> #endif
</span><span class="lines">@@ -125,8 +125,8 @@
</span><span class="cx"> WKStringRef WKPluginInformationMIMETypeKey()
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API)
</span><del>- static API::String* key = API::String::create(pluginInformationMIMETypeKey()).leakRef();
- return toAPI(key);
</del><ins>+ static API::String& key = API::String::create(pluginInformationMIMETypeKey()).leakRef();
+ return toAPI(&key);
</ins><span class="cx"> #else
</span><span class="cx"> return 0;
</span><span class="cx"> #endif
</span><span class="lines">@@ -135,8 +135,8 @@
</span><span class="cx"> WKStringRef WKPluginInformationPageURLKey()
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API)
</span><del>- static API::String* key = API::String::create(pluginInformationPageURLKey()).leakRef();
- return toAPI(key);
</del><ins>+ static API::String& key = API::String::create(pluginInformationPageURLKey()).leakRef();
+ return toAPI(&key);
</ins><span class="cx"> #else
</span><span class="cx"> return 0;
</span><span class="cx"> #endif
</span><span class="lines">@@ -145,8 +145,8 @@
</span><span class="cx"> WKStringRef WKPluginInformationPluginspageAttributeURLKey()
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API)
</span><del>- static API::String* key = API::String::create(pluginInformationPluginspageAttributeURLKey()).leakRef();
- return toAPI(key);
</del><ins>+ static API::String& key = API::String::create(pluginInformationPluginspageAttributeURLKey()).leakRef();
+ return toAPI(&key);
</ins><span class="cx"> #else
</span><span class="cx"> return 0;
</span><span class="cx"> #endif
</span><span class="lines">@@ -155,8 +155,8 @@
</span><span class="cx"> WKStringRef WKPluginInformationPluginURLKey()
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API)
</span><del>- static API::String* key = API::String::create(pluginInformationPluginURLKey()).leakRef();
- return toAPI(key);
</del><ins>+ static API::String& key = API::String::create(pluginInformationPluginURLKey()).leakRef();
+ return toAPI(&key);
</ins><span class="cx"> #else
</span><span class="cx"> return 0;
</span><span class="cx"> #endif
</span><span class="lines">@@ -165,8 +165,8 @@
</span><span class="cx"> WKStringRef WKPlugInInformationReplacementObscuredKey()
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API)
</span><del>- static API::String* key = API::String::create(plugInInformationReplacementObscuredKey()).leakRef();
- return toAPI(key);
</del><ins>+ static API::String& key = API::String::create(plugInInformationReplacementObscuredKey()).leakRef();
+ return toAPI(&key);
</ins><span class="cx"> #else
</span><span class="cx"> return 0;
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIcWKSharedAPICasth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/API/c/WKSharedAPICast.h (183408 => 183409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/API/c/WKSharedAPICast.h 2015-04-27 19:36:25 UTC (rev 183408)
+++ trunk/Source/WebKit2/Shared/API/c/WKSharedAPICast.h 2015-04-27 20:05:14 UTC (rev 183409)
</span><span class="lines">@@ -145,6 +145,11 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ ProxyingRefPtr(Ref<ImplType>&& impl)
+ : m_impl(WTF::move(impl))
+ {
+ }
+
</ins><span class="cx"> operator APIType() { return toAPI(m_impl.get()); }
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="lines">@@ -160,8 +165,7 @@
</span><span class="cx">
</span><span class="cx"> inline WKStringRef toCopiedAPI(const String& string)
</span><span class="cx"> {
</span><del>- RefPtr<API::String> apiString = API::String::create(string);
- return toAPI(apiString.release().leakRef());
</del><ins>+ return toAPI(&API::String::create(string).leakRef());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline ProxyingRefPtr<API::URL> toURLRef(StringImpl* string)
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIcWKStringcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/API/c/WKString.cpp (183408 => 183409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/API/c/WKString.cpp 2015-04-27 19:36:25 UTC (rev 183408)
+++ trunk/Source/WebKit2/Shared/API/c/WKString.cpp 2015-04-27 20:05:14 UTC (rev 183409)
</span><span class="lines">@@ -41,8 +41,7 @@
</span><span class="cx">
</span><span class="cx"> WKStringRef WKStringCreateWithUTF8CString(const char* string)
</span><span class="cx"> {
</span><del>- auto apiString = API::String::create(WTF::String::fromUTF8(string));
- return toAPI(apiString.release().leakRef());
</del><ins>+ return toAPI(&API::String::create(WTF::String::fromUTF8(string)).leakRef());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool WKStringIsEmpty(WKStringRef stringRef)
</span><span class="lines">@@ -116,7 +115,7 @@
</span><span class="cx"> {
</span><span class="cx"> auto apiString = jsStringRef ? API::String::create(jsStringRef->string()) : API::String::createNull();
</span><span class="cx">
</span><del>- return toAPI(apiString.release().leakRef());
</del><ins>+ return toAPI(&apiString.leakRef());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> JSStringRef WKStringCopyJSString(WKStringRef stringRef)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKDatabaseManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKDatabaseManager.cpp (183408 => 183409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKDatabaseManager.cpp 2015-04-27 19:36:25 UTC (rev 183408)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKDatabaseManager.cpp 2015-04-27 20:05:14 UTC (rev 183409)
</span><span class="lines">@@ -38,62 +38,62 @@
</span><span class="cx">
</span><span class="cx"> WKStringRef WKDatabaseManagerGetOriginKey()
</span><span class="cx"> {
</span><del>- static API::String* key = API::String::create(WebDatabaseManagerProxy::originKey()).leakRef();
- return toAPI(key);
</del><ins>+ static API::String& key = API::String::create(WebDatabaseManagerProxy::originKey()).leakRef();
+ return toAPI(&key);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WKStringRef WKDatabaseManagerGetOriginQuotaKey()
</span><span class="cx"> {
</span><del>- static API::String* key = API::String::create(WebDatabaseManagerProxy::originQuotaKey()).leakRef();
- return toAPI(key);
</del><ins>+ static API::String& key = API::String::create(WebDatabaseManagerProxy::originQuotaKey()).leakRef();
+ return toAPI(&key);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WKStringRef WKDatabaseManagerGetOriginUsageKey()
</span><span class="cx"> {
</span><del>- static API::String* key = API::String::create(WebDatabaseManagerProxy::originUsageKey()).leakRef();
- return toAPI(key);
</del><ins>+ static API::String& key = API::String::create(WebDatabaseManagerProxy::originUsageKey()).leakRef();
+ return toAPI(&key);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WKStringRef WKDatabaseManagerGetDatabaseDetailsKey()
</span><span class="cx"> {
</span><del>- static API::String* key = API::String::create(WebDatabaseManagerProxy::databaseDetailsKey()).leakRef();
- return toAPI(key);
</del><ins>+ static API::String& key = API::String::create(WebDatabaseManagerProxy::databaseDetailsKey()).leakRef();
+ return toAPI(&key);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WKStringRef WKDatabaseManagerGetDatabaseDetailsNameKey()
</span><span class="cx"> {
</span><del>- static API::String* key = API::String::create(WebDatabaseManagerProxy::databaseDetailsNameKey()).leakRef();
- return toAPI(key);
</del><ins>+ static API::String& key = API::String::create(WebDatabaseManagerProxy::databaseDetailsNameKey()).leakRef();
+ return toAPI(&key);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WKStringRef WKDatabaseManagerGetDatabaseDetailsDisplayNameKey()
</span><span class="cx"> {
</span><del>- static API::String* key = API::String::create(WebDatabaseManagerProxy::databaseDetailsDisplayNameKey()).leakRef();
- return toAPI(key);
</del><ins>+ static API::String& key = API::String::create(WebDatabaseManagerProxy::databaseDetailsDisplayNameKey()).leakRef();
+ return toAPI(&key);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WKStringRef WKDatabaseManagerGetDatabaseDetailsExpectedUsageKey()
</span><span class="cx"> {
</span><del>- static API::String* key = API::String::create(WebDatabaseManagerProxy::databaseDetailsExpectedUsageKey()).leakRef();
- return toAPI(key);
</del><ins>+ static API::String& key = API::String::create(WebDatabaseManagerProxy::databaseDetailsExpectedUsageKey()).leakRef();
+ return toAPI(&key);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WKStringRef WKDatabaseManagerGetDatabaseDetailsCurrentUsageKey()
</span><span class="cx"> {
</span><del>- static API::String* key = API::String::create(WebDatabaseManagerProxy::databaseDetailsCurrentUsageKey()).leakRef();
- return toAPI(key);
</del><ins>+ static API::String& key = API::String::create(WebDatabaseManagerProxy::databaseDetailsCurrentUsageKey()).leakRef();
+ return toAPI(&key);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WKStringRef WKDatabaseManagerGetDatabaseDetailsCreationTimeKey()
</span><span class="cx"> {
</span><del>- static API::String* key = API::String::create(WebDatabaseManagerProxy::databaseDetailsCreationTimeKey()).leakRef();
- return toAPI(key);
</del><ins>+ static API::String& key = API::String::create(WebDatabaseManagerProxy::databaseDetailsCreationTimeKey()).leakRef();
+ return toAPI(&key);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WKStringRef WKDatabaseManagerGetDatabaseDetailsModificationTimeKey()
</span><span class="cx"> {
</span><del>- static API::String* key = API::String::create(WebDatabaseManagerProxy::databaseDetailsModificationTimeKey()).leakRef();
- return toAPI(key);
</del><ins>+ static API::String& key = API::String::create(WebDatabaseManagerProxy::databaseDetailsModificationTimeKey()).leakRef();
+ return toAPI(&key);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WKDatabaseManagerSetClient(WKDatabaseManagerRef databaseManagerRef, const WKDatabaseManagerClientBase* wkClient)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKKeyValueStorageManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKKeyValueStorageManager.cpp (183408 => 183409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKKeyValueStorageManager.cpp 2015-04-27 19:36:25 UTC (rev 183408)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKKeyValueStorageManager.cpp 2015-04-27 20:05:14 UTC (rev 183409)
</span><span class="lines">@@ -38,20 +38,20 @@
</span><span class="cx">
</span><span class="cx"> WKStringRef WKKeyValueStorageManagerGetOriginKey()
</span><span class="cx"> {
</span><del>- static API::String* key = API::String::create(WebKeyValueStorageManager::originKey()).leakRef();
- return toAPI(key);
</del><ins>+ static API::String& key = API::String::create(WebKeyValueStorageManager::originKey()).leakRef();
+ return toAPI(&key);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WKStringRef WKKeyValueStorageManagerGetCreationTimeKey()
</span><span class="cx"> {
</span><del>- static API::String* key = API::String::create(WebKeyValueStorageManager::creationTimeKey()).leakRef();
- return toAPI(key);
</del><ins>+ static API::String& key = API::String::create(WebKeyValueStorageManager::creationTimeKey()).leakRef();
+ return toAPI(&key);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WKStringRef WKKeyValueStorageManagerGetModificationTimeKey()
</span><span class="cx"> {
</span><del>- static API::String* key = API::String::create(WebKeyValueStorageManager::modificationTimeKey()).leakRef();
- return toAPI(key);
</del><ins>+ static API::String& key = API::String::create(WebKeyValueStorageManager::modificationTimeKey()).leakRef();
+ return toAPI(&key);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WKKeyValueStorageManagerGetKeyValueStorageOrigins(WKKeyValueStorageManagerRef keyValueStorageManagerRef, void* context, WKKeyValueStorageManagerGetKeyValueStorageOriginsFunction callback)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp (183408 => 183409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2015-04-27 19:36:25 UTC (rev 183408)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2015-04-27 20:05:14 UTC (rev 183409)
</span><span class="lines">@@ -363,14 +363,14 @@
</span><span class="cx">
</span><span class="cx"> WKStringRef WKPageGetSessionHistoryURLValueType()
</span><span class="cx"> {
</span><del>- static API::String* sessionHistoryURLValueType = API::String::create("SessionHistoryURL").leakRef();
- return toAPI(sessionHistoryURLValueType);
</del><ins>+ static API::String& sessionHistoryURLValueType = API::String::create("SessionHistoryURL").leakRef();
+ return toAPI(&sessionHistoryURLValueType);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WKStringRef WKPageGetSessionBackForwardListItemValueType()
</span><span class="cx"> {
</span><del>- static API::String* sessionBackForwardListValueType = API::String::create("SessionBackForwardListItem").leakRef();
- return toAPI(sessionBackForwardListValueType);
</del><ins>+ static API::String& sessionBackForwardListValueType = API::String::create("SessionBackForwardListItem").leakRef();
+ return toAPI(&sessionBackForwardListValueType);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WKTypeRef WKPageCopySessionState(WKPageRef pageRef, void* context, WKPageSessionStateFilterCallback filter)
</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).get()), 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().get()) : 0, 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).get()), 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().get()) : 0, context);
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebProcessPoolcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp (183408 => 183409)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp 2015-04-27 19:36:25 UTC (rev 183408)
+++ trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp 2015-04-27 20:05:14 UTC (rev 183409)
</span><span class="lines">@@ -565,7 +565,7 @@
</span><span class="cx"> messageNameStringBuilder.append('.');
</span><span class="cx"> messageNameStringBuilder.append(messageName.data(), messageName.size());
</span><span class="cx">
</span><del>- s_invalidMessageCallback(toAPI(API::String::create(messageNameStringBuilder.toString()).get()));
</del><ins>+ s_invalidMessageCallback(toAPI(API::String::create(messageNameStringBuilder.toString()).ptr()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebProcessPool::processDidCachePage(WebProcessProxy* process)
</span></span></pre>
</div>
</div>
</body>
</html>