<!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>[183412] 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/183412">183412</a></dd>
<dt>Author</dt> <dd>zandobersek@gmail.com</dd>
<dt>Date</dt> <dd>2015-04-27 13:15:12 -0700 (Mon, 27 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[WK2] API::Dictionary creation functions should return Ref<>
https://bugs.webkit.org/show_bug.cgi?id=144221
Reviewed by Darin Adler.
Have API::Dictionary creation functions return Ref<>.
The call-sites are also updated, using and operating
on the returned Ref<> object where possible.
* Shared/API/APIDictionary.cpp:
(API::Dictionary::create):
* Shared/API/APIDictionary.h:
* Shared/API/Cocoa/WKRemoteObjectCoder.mm:
(createEncodedObject):
* Shared/API/Cocoa/_WKRemoteObjectRegistry.mm:
(-[_WKRemoteObjectRegistry _sendInvocation:interface:]):
* Shared/API/c/WKDictionary.cpp:
(WKDictionaryCreate):
* Shared/API/c/WKMutableDictionary.cpp:
(WKMutableDictionaryCreate):
* Shared/Plugins/Netscape/PluginInformation.cpp:
(WebKit::createPluginInformationDictionary):
* Shared/Plugins/Netscape/PluginInformation.h:
* UIProcess/API/C/WKPage.cpp:
(WKPageSetPageUIClient):
* UIProcess/API/gtk/WebKitWebContext.cpp:
(webkit_web_context_prefetch_dns):
* UIProcess/API/gtk/WebKitWebView.cpp:
(webkit_web_view_get_snapshot):
* UIProcess/Plugins/PlugInAutoStartProvider.cpp:
(WebKit::PlugInAutoStartProvider::autoStartOriginsTableCopy):
* UIProcess/Plugins/PlugInAutoStartProvider.h:
* UIProcess/StatisticsRequest.cpp:
(WebKit::createDictionaryFromHashMap):
(WebKit::StatisticsRequest::completedRequest):
* UIProcess/WebFormClient.cpp:
(WebKit::WebFormClient::willSubmitForm):
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::didFailToInitializePlugin):
* WebProcess/InjectedBundle/API/gtk/WebKitWebPage.cpp:
(didInitiateLoadForResource):
(willSendRequestForFrame):
(didReceiveResponseForResource):
(didReceiveContentLengthForResource):
(didFinishLoadForResource):
(didFailLoadForResource):
(webkitWebPageDidReceiveMessage):
* WebProcess/InjectedBundle/InjectedBundlePageFormClient.cpp:
(WebKit::InjectedBundlePageFormClient::willSendSubmitEvent):
(WebKit::InjectedBundlePageFormClient::willSubmitForm):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedAPIAPIDictionarycpp">trunk/Source/WebKit2/Shared/API/APIDictionary.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedAPIAPIDictionaryh">trunk/Source/WebKit2/Shared/API/APIDictionary.h</a></li>
<li><a href="#trunkSourceWebKit2SharedAPICocoaWKRemoteObjectCodermm">trunk/Source/WebKit2/Shared/API/Cocoa/WKRemoteObjectCoder.mm</a></li>
<li><a href="#trunkSourceWebKit2SharedAPICocoa_WKRemoteObjectRegistrymm">trunk/Source/WebKit2/Shared/API/Cocoa/_WKRemoteObjectRegistry.mm</a></li>
<li><a href="#trunkSourceWebKit2SharedAPIcWKDictionarycpp">trunk/Source/WebKit2/Shared/API/c/WKDictionary.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedAPIcWKMutableDictionarycpp">trunk/Source/WebKit2/Shared/API/c/WKMutableDictionary.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedPluginsNetscapePluginInformationcpp">trunk/Source/WebKit2/Shared/Plugins/Netscape/PluginInformation.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedPluginsNetscapePluginInformationh">trunk/Source/WebKit2/Shared/Plugins/Netscape/PluginInformation.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKPagecpp">trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitWebContextcpp">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitWebViewcpp">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessPluginsPlugInAutoStartProvidercpp">trunk/Source/WebKit2/UIProcess/Plugins/PlugInAutoStartProvider.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessPluginsPlugInAutoStartProviderh">trunk/Source/WebKit2/UIProcess/Plugins/PlugInAutoStartProvider.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessStatisticsRequestcpp">trunk/Source/WebKit2/UIProcess/StatisticsRequest.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebFormClientcpp">trunk/Source/WebKit2/UIProcess/WebFormClient.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxycpp">trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleAPIgtkWebKitWebPagecpp">trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/WebKitWebPage.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleInjectedBundlePageFormClientcpp">trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageFormClient.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (183411 => 183412)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-04-27 20:13:53 UTC (rev 183411)
+++ trunk/Source/WebKit2/ChangeLog 2015-04-27 20:15:12 UTC (rev 183412)
</span><span class="lines">@@ -1,5 +1,58 @@
</span><span class="cx"> 2015-04-27 Zan Dobersek <zdobersek@igalia.com>
</span><span class="cx">
</span><ins>+ [WK2] API::Dictionary creation functions should return Ref<>
+ https://bugs.webkit.org/show_bug.cgi?id=144221
+
+ Reviewed by Darin Adler.
+
+ Have API::Dictionary creation functions return Ref<>.
+ The call-sites are also updated, using and operating
+ on the returned Ref<> object where possible.
+
+ * Shared/API/APIDictionary.cpp:
+ (API::Dictionary::create):
+ * Shared/API/APIDictionary.h:
+ * Shared/API/Cocoa/WKRemoteObjectCoder.mm:
+ (createEncodedObject):
+ * Shared/API/Cocoa/_WKRemoteObjectRegistry.mm:
+ (-[_WKRemoteObjectRegistry _sendInvocation:interface:]):
+ * Shared/API/c/WKDictionary.cpp:
+ (WKDictionaryCreate):
+ * Shared/API/c/WKMutableDictionary.cpp:
+ (WKMutableDictionaryCreate):
+ * Shared/Plugins/Netscape/PluginInformation.cpp:
+ (WebKit::createPluginInformationDictionary):
+ * Shared/Plugins/Netscape/PluginInformation.h:
+ * UIProcess/API/C/WKPage.cpp:
+ (WKPageSetPageUIClient):
+ * UIProcess/API/gtk/WebKitWebContext.cpp:
+ (webkit_web_context_prefetch_dns):
+ * UIProcess/API/gtk/WebKitWebView.cpp:
+ (webkit_web_view_get_snapshot):
+ * UIProcess/Plugins/PlugInAutoStartProvider.cpp:
+ (WebKit::PlugInAutoStartProvider::autoStartOriginsTableCopy):
+ * UIProcess/Plugins/PlugInAutoStartProvider.h:
+ * UIProcess/StatisticsRequest.cpp:
+ (WebKit::createDictionaryFromHashMap):
+ (WebKit::StatisticsRequest::completedRequest):
+ * UIProcess/WebFormClient.cpp:
+ (WebKit::WebFormClient::willSubmitForm):
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::didFailToInitializePlugin):
+ * WebProcess/InjectedBundle/API/gtk/WebKitWebPage.cpp:
+ (didInitiateLoadForResource):
+ (willSendRequestForFrame):
+ (didReceiveResponseForResource):
+ (didReceiveContentLengthForResource):
+ (didFinishLoadForResource):
+ (didFailLoadForResource):
+ (webkitWebPageDidReceiveMessage):
+ * WebProcess/InjectedBundle/InjectedBundlePageFormClient.cpp:
+ (WebKit::InjectedBundlePageFormClient::willSendSubmitEvent):
+ (WebKit::InjectedBundlePageFormClient::willSubmitForm):
+
+2015-04-27 Zan Dobersek <zdobersek@igalia.com>
+
</ins><span class="cx"> [WK2] API::Data creation functions should return Ref<>
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=144220
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIAPIDictionarycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/API/APIDictionary.cpp (183411 => 183412)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/API/APIDictionary.cpp 2015-04-27 20:13:53 UTC (rev 183411)
+++ trunk/Source/WebKit2/Shared/API/APIDictionary.cpp 2015-04-27 20:15:12 UTC (rev 183412)
</span><span class="lines">@@ -31,14 +31,14 @@
</span><span class="cx">
</span><span class="cx"> namespace API {
</span><span class="cx">
</span><del>-RefPtr<Dictionary> Dictionary::create()
</del><ins>+Ref<Dictionary> Dictionary::create()
</ins><span class="cx"> {
</span><span class="cx"> return create({ });
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<Dictionary> Dictionary::create(MapType map)
</del><ins>+Ref<Dictionary> Dictionary::create(MapType map)
</ins><span class="cx"> {
</span><del>- return adoptRef(new Dictionary(WTF::move(map)));
</del><ins>+ return adoptRef(*new Dictionary(WTF::move(map)));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Dictionary::Dictionary(MapType map)
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIAPIDictionaryh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/API/APIDictionary.h (183411 => 183412)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/API/APIDictionary.h 2015-04-27 20:13:53 UTC (rev 183411)
+++ trunk/Source/WebKit2/Shared/API/APIDictionary.h 2015-04-27 20:15:12 UTC (rev 183412)
</span><span class="lines">@@ -28,7 +28,6 @@
</span><span class="cx">
</span><span class="cx"> #include "APIObject.h"
</span><span class="cx"> #include <wtf/HashMap.h>
</span><del>-#include <wtf/PassRefPtr.h>
</del><span class="cx"> #include <wtf/text/StringHash.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="lines">@@ -40,8 +39,8 @@
</span><span class="cx"> public:
</span><span class="cx"> typedef HashMap<WTF::String, RefPtr<Object>> MapType;
</span><span class="cx">
</span><del>- static RefPtr<Dictionary> create();
- static RefPtr<Dictionary> create(MapType);
</del><ins>+ static Ref<Dictionary> create();
+ static Ref<Dictionary> create(MapType);
</ins><span class="cx">
</span><span class="cx"> virtual ~Dictionary();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAPICocoaWKRemoteObjectCodermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/API/Cocoa/WKRemoteObjectCoder.mm (183411 => 183412)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/API/Cocoa/WKRemoteObjectCoder.mm 2015-04-27 20:13:53 UTC (rev 183411)
+++ trunk/Source/WebKit2/Shared/API/Cocoa/WKRemoteObjectCoder.mm 2015-04-27 20:15:12 UTC (rev 183412)
</span><span class="lines">@@ -45,7 +45,7 @@
</span><span class="cx"> static NSString * const selectorKey = @"selector";
</span><span class="cx"> static NSString * const typeStringKey = @"typeString";
</span><span class="cx">
</span><del>-static PassRefPtr<API::Dictionary> createEncodedObject(WKRemoteObjectEncoder *, id);
</del><ins>+static RefPtr<API::Dictionary> createEncodedObject(WKRemoteObjectEncoder *, id);
</ins><span class="cx">
</span><span class="cx"> @interface NSMethodSignature (Details)
</span><span class="cx"> - (NSString *)_typeString;
</span><span class="lines">@@ -238,17 +238,17 @@
</span><span class="cx"> [object encodeWithCoder:encoder];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static PassRefPtr<API::Dictionary> createEncodedObject(WKRemoteObjectEncoder *encoder, id object)
</del><ins>+static RefPtr<API::Dictionary> createEncodedObject(WKRemoteObjectEncoder *encoder, id object)
</ins><span class="cx"> {
</span><span class="cx"> if (!object)
</span><span class="cx"> return nil;
</span><span class="cx">
</span><del>- RefPtr<API::Dictionary> dictionary = API::Dictionary::create();
- TemporaryChange<API::Dictionary*> dictionaryChange(encoder->_currentDictionary, dictionary.get());
</del><ins>+ Ref<API::Dictionary> dictionary = API::Dictionary::create();
+ TemporaryChange<API::Dictionary*> dictionaryChange(encoder->_currentDictionary, dictionary.ptr());
</ins><span class="cx">
</span><span class="cx"> encodeObject(encoder, object);
</span><span class="cx">
</span><del>- return dictionary;
</del><ins>+ return WTF::move(dictionary);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)encodeValueOfObjCType:(const char *)type at:(const void *)address
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAPICocoa_WKRemoteObjectRegistrymm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/API/Cocoa/_WKRemoteObjectRegistry.mm (183411 => 183412)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/API/Cocoa/_WKRemoteObjectRegistry.mm 2015-04-27 20:13:53 UTC (rev 183411)
+++ trunk/Source/WebKit2/Shared/API/Cocoa/_WKRemoteObjectRegistry.mm 2015-04-27 20:15:12 UTC (rev 183412)
</span><span class="lines">@@ -102,14 +102,14 @@
</span><span class="cx"> RetainPtr<WKRemoteObjectEncoder> encoder = adoptNS([[WKRemoteObjectEncoder alloc] init]);
</span><span class="cx"> [encoder encodeObject:invocation forKey:invocationKey];
</span><span class="cx">
</span><del>- RefPtr<API::Dictionary> body = API::Dictionary::create();
</del><ins>+ Ref<API::Dictionary> body = API::Dictionary::create();
</ins><span class="cx"> body->set(interfaceIdentifierKey, API::String::create(interface.identifier));
</span><span class="cx"> body->set(encodedInvocationKey, [encoder rootObjectDictionary]);
</span><span class="cx">
</span><span class="cx"> if (!_remoteObjectRegistry)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- _remoteObjectRegistry->sendInvocation(UserData(body.get()));
</del><ins>+ _remoteObjectRegistry->sendInvocation(UserData(body.ptr()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (WebKit::RemoteObjectRegistry&)remoteObjectRegistry
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIcWKDictionarycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/API/c/WKDictionary.cpp (183411 => 183412)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/API/c/WKDictionary.cpp 2015-04-27 20:13:53 UTC (rev 183411)
+++ trunk/Source/WebKit2/Shared/API/c/WKDictionary.cpp 2015-04-27 20:15:12 UTC (rev 183412)
</span><span class="lines">@@ -43,7 +43,7 @@
</span><span class="cx"> for (size_t i = 0; i < numberOfValues; ++i)
</span><span class="cx"> map.add(toImpl(keys[i])->string(), toImpl(values[i]));
</span><span class="cx">
</span><del>- return toAPI(API::Dictionary::create(WTF::move(map)).release().leakRef());
</del><ins>+ return toAPI(&API::Dictionary::create(WTF::move(map)).leakRef());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WKTypeRef WKDictionaryGetItemForKey(WKDictionaryRef dictionaryRef, WKStringRef key)
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIcWKMutableDictionarycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/API/c/WKMutableDictionary.cpp (183411 => 183412)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/API/c/WKMutableDictionary.cpp 2015-04-27 20:13:53 UTC (rev 183411)
+++ trunk/Source/WebKit2/Shared/API/c/WKMutableDictionary.cpp 2015-04-27 20:15:12 UTC (rev 183412)
</span><span class="lines">@@ -33,8 +33,7 @@
</span><span class="cx">
</span><span class="cx"> WKMutableDictionaryRef WKMutableDictionaryCreate()
</span><span class="cx"> {
</span><del>- RefPtr<API::Dictionary> dictionary = API::Dictionary::create();
- return const_cast<WKMutableDictionaryRef>(toAPI(dictionary.release().leakRef()));
</del><ins>+ return const_cast<WKMutableDictionaryRef>(toAPI(&API::Dictionary::create().leakRef()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool WKDictionarySetItem(WKMutableDictionaryRef dictionaryRef, WKStringRef keyRef, WKTypeRef itemRef)
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedPluginsNetscapePluginInformationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/Plugins/Netscape/PluginInformation.cpp (183411 => 183412)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/Plugins/Netscape/PluginInformation.cpp 2015-04-27 20:13:53 UTC (rev 183411)
+++ trunk/Source/WebKit2/Shared/Plugins/Netscape/PluginInformation.cpp 2015-04-27 20:15:12 UTC (rev 183412)
</span><span class="lines">@@ -122,7 +122,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<API::Dictionary> createPluginInformationDictionary(const PluginModuleInfo& plugin)
</del><ins>+Ref<API::Dictionary> createPluginInformationDictionary(const PluginModuleInfo& plugin)
</ins><span class="cx"> {
</span><span class="cx"> API::Dictionary::MapType map;
</span><span class="cx"> getPluginModuleInformation(plugin, map);
</span><span class="lines">@@ -130,7 +130,7 @@
</span><span class="cx"> return API::Dictionary::create(WTF::move(map));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<API::Dictionary> createPluginInformationDictionary(const PluginModuleInfo& plugin, const String& frameURLString, const String& mimeType, const String& pageURLString, const String& pluginspageAttributeURLString, const String& pluginURLString, bool replacementObscured)
</del><ins>+Ref<API::Dictionary> createPluginInformationDictionary(const PluginModuleInfo& plugin, const String& frameURLString, const String& mimeType, const String& pageURLString, const String& pluginspageAttributeURLString, const String& pluginURLString, bool replacementObscured)
</ins><span class="cx"> {
</span><span class="cx"> API::Dictionary::MapType map;
</span><span class="cx"> getPluginModuleInformation(plugin, map);
</span><span class="lines">@@ -150,7 +150,7 @@
</span><span class="cx"> return API::Dictionary::create(WTF::move(map));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<API::Dictionary> createPluginInformationDictionary(const String& mimeType, const String& frameURLString, const String& pageURLString)
</del><ins>+Ref<API::Dictionary> createPluginInformationDictionary(const String& mimeType, const String& frameURLString, const String& pageURLString)
</ins><span class="cx"> {
</span><span class="cx"> API::Dictionary::MapType map;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedPluginsNetscapePluginInformationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/Plugins/Netscape/PluginInformation.h (183411 => 183412)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/Plugins/Netscape/PluginInformation.h 2015-04-27 20:13:53 UTC (rev 183411)
+++ trunk/Source/WebKit2/Shared/Plugins/Netscape/PluginInformation.h 2015-04-27 20:15:12 UTC (rev 183412)
</span><span class="lines">@@ -51,9 +51,9 @@
</span><span class="cx"> String pluginInformationPluginURLKey();
</span><span class="cx"> String plugInInformationReplacementObscuredKey();
</span><span class="cx">
</span><del>-PassRefPtr<API::Dictionary> createPluginInformationDictionary(const PluginModuleInfo&);
-PassRefPtr<API::Dictionary> createPluginInformationDictionary(const PluginModuleInfo&, const String& frameURLString, const String& mimeType, const String& pageURLString, const String& pluginspageAttributeURLString, const String& pluginURLString, bool replacementObscured = false);
-PassRefPtr<API::Dictionary> createPluginInformationDictionary(const String& mimeType, const String& frameURLString, const String& pageURLString);
</del><ins>+Ref<API::Dictionary> createPluginInformationDictionary(const PluginModuleInfo&);
+Ref<API::Dictionary> createPluginInformationDictionary(const PluginModuleInfo&, const String& frameURLString, const String& mimeType, const String& pageURLString, const String& pluginspageAttributeURLString, const String& pluginURLString, bool replacementObscured = false);
+Ref<API::Dictionary> createPluginInformationDictionary(const String& mimeType, const String& frameURLString, const String& pageURLString);
</ins><span class="cx">
</span><span class="cx"> void getPluginModuleInformation(const PluginModuleInfo&, API::Dictionary::MapType&);
</span><span class="cx"> void getPlatformPluginModuleInformation(const PluginModuleInfo&, API::Dictionary::MapType&);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp (183411 => 183412)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2015-04-27 20:13:53 UTC (rev 183411)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2015-04-27 20:15:12 UTC (rev 183412)
</span><span class="lines">@@ -1343,13 +1343,13 @@
</span><span class="cx"> map.set("resizable", API::Boolean::create(windowFeatures.resizable));
</span><span class="cx"> map.set("fullscreen", API::Boolean::create(windowFeatures.fullscreen));
</span><span class="cx"> map.set("dialog", API::Boolean::create(windowFeatures.dialog));
</span><del>- RefPtr<API::Dictionary> featuresMap = API::Dictionary::create(WTF::move(map));
</del><ins>+ Ref<API::Dictionary> featuresMap = API::Dictionary::create(WTF::move(map));
</ins><span class="cx">
</span><span class="cx"> if (!m_client.base.version)
</span><del>- return adoptRef(toImpl(m_client.createNewPage_deprecatedForUseWithV0(toAPI(page), toAPI(featuresMap.get()), toAPI(navigationActionData.modifiers), toAPI(navigationActionData.mouseButton), m_client.base.clientInfo)));
</del><ins>+ return adoptRef(toImpl(m_client.createNewPage_deprecatedForUseWithV0(toAPI(page), toAPI(featuresMap.ptr()), toAPI(navigationActionData.modifiers), toAPI(navigationActionData.mouseButton), m_client.base.clientInfo)));
</ins><span class="cx">
</span><span class="cx"> RefPtr<API::URLRequest> request = API::URLRequest::create(resourceRequest);
</span><del>- return adoptRef(toImpl(m_client.createNewPage(toAPI(page), toAPI(request.get()), toAPI(featuresMap.get()), toAPI(navigationActionData.modifiers), toAPI(navigationActionData.mouseButton), m_client.base.clientInfo)));
</del><ins>+ return adoptRef(toImpl(m_client.createNewPage(toAPI(page), toAPI(request.get()), toAPI(featuresMap.ptr()), toAPI(navigationActionData.modifiers), toAPI(navigationActionData.mouseButton), m_client.base.clientInfo)));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> virtual void showPage(WebPageProxy* page) override
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitWebContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp (183411 => 183412)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp 2015-04-27 20:13:53 UTC (rev 183411)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp 2015-04-27 20:15:12 UTC (rev 183412)
</span><span class="lines">@@ -1009,7 +1009,7 @@
</span><span class="cx">
</span><span class="cx"> API::Dictionary::MapType message;
</span><span class="cx"> message.set(String::fromUTF8("Hostname"), API::String::create(String::fromUTF8(hostname)));
</span><del>- context->priv->context->postMessageToInjectedBundle(String::fromUTF8("PrefetchDNS"), API::Dictionary::create(WTF::move(message)).get());
</del><ins>+ context->priv->context->postMessageToInjectedBundle(String::fromUTF8("PrefetchDNS"), API::Dictionary::create(WTF::move(message)).ptr());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitWebViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp (183411 => 183412)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp 2015-04-27 20:13:53 UTC (rev 183411)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp 2015-04-27 20:15:12 UTC (rev 183412)
</span><span class="lines">@@ -3502,7 +3502,7 @@
</span><span class="cx"> message.set(String::fromUTF8("TransparentBackground"), API::Boolean::create(options & WEBKIT_SNAPSHOT_OPTIONS_TRANSPARENT_BACKGROUND));
</span><span class="cx">
</span><span class="cx"> webView->priv->snapshotResultsMap.set(callbackID, adoptGRef(g_task_new(webView, cancellable, callback, userData)));
</span><del>- getPage(webView)->postMessageToInjectedBundle(String::fromUTF8("GetSnapshot"), API::Dictionary::create(WTF::move(message)).get());
</del><ins>+ getPage(webView)->postMessageToInjectedBundle(String::fromUTF8("GetSnapshot"), API::Dictionary::create(WTF::move(message)).ptr());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessPluginsPlugInAutoStartProvidercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Plugins/PlugInAutoStartProvider.cpp (183411 => 183412)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Plugins/PlugInAutoStartProvider.cpp 2015-04-27 20:13:53 UTC (rev 183411)
+++ trunk/Source/WebKit2/UIProcess/Plugins/PlugInAutoStartProvider.cpp 2015-04-27 20:15:12 UTC (rev 183412)
</span><span class="lines">@@ -87,7 +87,7 @@
</span><span class="cx"> return sessionMap;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<API::Dictionary> PlugInAutoStartProvider::autoStartOriginsTableCopy() const
</del><ins>+Ref<API::Dictionary> PlugInAutoStartProvider::autoStartOriginsTableCopy() const
</ins><span class="cx"> {
</span><span class="cx"> API::Dictionary::MapType map;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessPluginsPlugInAutoStartProviderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Plugins/PlugInAutoStartProvider.h (183411 => 183412)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Plugins/PlugInAutoStartProvider.h 2015-04-27 20:13:53 UTC (rev 183411)
+++ trunk/Source/WebKit2/UIProcess/Plugins/PlugInAutoStartProvider.h 2015-04-27 20:15:12 UTC (rev 183412)
</span><span class="lines">@@ -56,7 +56,7 @@
</span><span class="cx"> void addAutoStartOriginHash(const String& pageOrigin, unsigned plugInOriginHash, WebCore::SessionID);
</span><span class="cx"> void didReceiveUserInteraction(unsigned plugInOriginHash, WebCore::SessionID);
</span><span class="cx">
</span><del>- PassRefPtr<API::Dictionary> autoStartOriginsTableCopy() const;
</del><ins>+ Ref<API::Dictionary> autoStartOriginsTableCopy() const;
</ins><span class="cx"> void setAutoStartOriginsTable(API::Dictionary&);
</span><span class="cx"> void setAutoStartOriginsFilteringOutEntriesAddedAfterTime(API::Dictionary&, double time);
</span><span class="cx"> void setAutoStartOriginsArray(API::Array&);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessStatisticsRequestcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/StatisticsRequest.cpp (183411 => 183412)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/StatisticsRequest.cpp 2015-04-27 20:13:53 UTC (rev 183411)
+++ trunk/Source/WebKit2/UIProcess/StatisticsRequest.cpp 2015-04-27 20:15:12 UTC (rev 183412)
</span><span class="lines">@@ -58,10 +58,10 @@
</span><span class="cx"> dictionary->set(it->key, RefPtr<API::UInt64>(API::UInt64::create(it->value)).get());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static PassRefPtr<API::Dictionary> createDictionaryFromHashMap(const HashMap<String, uint64_t>& map)
</del><ins>+static Ref<API::Dictionary> createDictionaryFromHashMap(const HashMap<String, uint64_t>& map)
</ins><span class="cx"> {
</span><del>- RefPtr<API::Dictionary> result = API::Dictionary::create();
- addToDictionaryFromHashMap(result.get(), map);
</del><ins>+ Ref<API::Dictionary> result = API::Dictionary::create();
+ addToDictionaryFromHashMap(result.ptr(), map);
</ins><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -79,9 +79,9 @@
</span><span class="cx"> addToDictionaryFromHashMap(m_responseDictionary.get(), data.statisticsNumbers);
</span><span class="cx">
</span><span class="cx"> if (!data.javaScriptProtectedObjectTypeCounts.isEmpty())
</span><del>- m_responseDictionary->set("JavaScriptProtectedObjectTypeCounts", createDictionaryFromHashMap(data.javaScriptProtectedObjectTypeCounts).get());
</del><ins>+ m_responseDictionary->set("JavaScriptProtectedObjectTypeCounts", createDictionaryFromHashMap(data.javaScriptProtectedObjectTypeCounts));
</ins><span class="cx"> if (!data.javaScriptObjectTypeCounts.isEmpty())
</span><del>- m_responseDictionary->set("JavaScriptObjectTypeCounts", createDictionaryFromHashMap(data.javaScriptObjectTypeCounts).get());
</del><ins>+ m_responseDictionary->set("JavaScriptObjectTypeCounts", createDictionaryFromHashMap(data.javaScriptObjectTypeCounts));
</ins><span class="cx">
</span><span class="cx"> if (!data.webCoreCacheStatistics.isEmpty()) {
</span><span class="cx"> Vector<RefPtr<API::Object>> cacheStatistics;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebFormClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebFormClient.cpp (183411 => 183412)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebFormClient.cpp 2015-04-27 20:13:53 UTC (rev 183411)
+++ trunk/Source/WebKit2/UIProcess/WebFormClient.cpp 2015-04-27 20:15:12 UTC (rev 183412)
</span><span class="lines">@@ -49,8 +49,8 @@
</span><span class="cx"> API::Dictionary::MapType map;
</span><span class="cx"> for (size_t i = 0; i < textFieldValues.size(); ++i)
</span><span class="cx"> map.set(textFieldValues[i].first, API::String::create(textFieldValues[i].second));
</span><del>- RefPtr<API::Dictionary> textFieldsMap = API::Dictionary::create(WTF::move(map));
- m_client.willSubmitForm(toAPI(&page), toAPI(&frame), toAPI(&sourceFrame), toAPI(textFieldsMap.get()), toAPI(userData), toAPI(&listener.get()), m_client.base.clientInfo);
</del><ins>+ Ref<API::Dictionary> textFieldsMap = API::Dictionary::create(WTF::move(map));
+ m_client.willSubmitForm(toAPI(&page), toAPI(&frame), toAPI(&sourceFrame), toAPI(textFieldsMap.ptr()), toAPI(userData), toAPI(&listener.get()), m_client.base.clientInfo);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (183411 => 183412)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2015-04-27 20:13:53 UTC (rev 183411)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2015-04-27 20:15:12 UTC (rev 183412)
</span><span class="lines">@@ -5202,7 +5202,7 @@
</span><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API)
</span><span class="cx"> void WebPageProxy::didFailToInitializePlugin(const String& mimeType, const String& frameURLString, const String& pageURLString)
</span><span class="cx"> {
</span><del>- m_loaderClient->didFailToInitializePlugin(*this, createPluginInformationDictionary(mimeType, frameURLString, pageURLString).get());
</del><ins>+ m_loaderClient->didFailToInitializePlugin(*this, createPluginInformationDictionary(mimeType, frameURLString, pageURLString).ptr());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::didBlockInsecurePluginVersion(const String& mimeType, const String& pluginURLString, const String& frameURLString, const String& pageURLString, bool replacementObscured)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleAPIgtkWebKitWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/WebKitWebPage.cpp (183411 => 183412)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/WebKitWebPage.cpp 2015-04-27 20:13:53 UTC (rev 183411)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/WebKitWebPage.cpp 2015-04-27 20:15:12 UTC (rev 183412)
</span><span class="lines">@@ -186,7 +186,7 @@
</span><span class="cx"> message.set(String::fromUTF8("Frame"), toImpl(frame));
</span><span class="cx"> message.set(String::fromUTF8("Identifier"), API::UInt64::create(identifier));
</span><span class="cx"> message.set(String::fromUTF8("Request"), toImpl(request));
</span><del>- WebProcess::singleton().injectedBundle()->postMessage(String::fromUTF8("WebPage.DidInitiateLoadForResource"), API::Dictionary::create(WTF::move(message)).get());
</del><ins>+ WebProcess::singleton().injectedBundle()->postMessage(String::fromUTF8("WebPage.DidInitiateLoadForResource"), API::Dictionary::create(WTF::move(message)).ptr());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static WKURLRequestRef willSendRequestForFrame(WKBundlePageRef page, WKBundleFrameRef, uint64_t identifier, WKURLRequestRef wkRequest, WKURLResponseRef wkRedirectResponse, const void* clientInfo)
</span><span class="lines">@@ -211,7 +211,7 @@
</span><span class="cx"> message.set(String::fromUTF8("Request"), newRequest.get());
</span><span class="cx"> if (!redirectResourceResponse.isNull())
</span><span class="cx"> message.set(String::fromUTF8("RedirectResponse"), toImpl(wkRedirectResponse));
</span><del>- WebProcess::singleton().injectedBundle()->postMessage(String::fromUTF8("WebPage.DidSendRequestForResource"), API::Dictionary::create(WTF::move(message)).get());
</del><ins>+ WebProcess::singleton().injectedBundle()->postMessage(String::fromUTF8("WebPage.DidSendRequestForResource"), API::Dictionary::create(WTF::move(message)).ptr());
</ins><span class="cx">
</span><span class="cx"> return toAPI(newRequest.release().leakRef());
</span><span class="cx"> }
</span><span class="lines">@@ -222,7 +222,7 @@
</span><span class="cx"> message.set(String::fromUTF8("Page"), toImpl(page));
</span><span class="cx"> message.set(String::fromUTF8("Identifier"), API::UInt64::create(identifier));
</span><span class="cx"> message.set(String::fromUTF8("Response"), toImpl(response));
</span><del>- WebProcess::singleton().injectedBundle()->postMessage(String::fromUTF8("WebPage.DidReceiveResponseForResource"), API::Dictionary::create(WTF::move(message)).get());
</del><ins>+ WebProcess::singleton().injectedBundle()->postMessage(String::fromUTF8("WebPage.DidReceiveResponseForResource"), API::Dictionary::create(WTF::move(message)).ptr());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void didReceiveContentLengthForResource(WKBundlePageRef page, WKBundleFrameRef, uint64_t identifier, uint64_t length, const void*)
</span><span class="lines">@@ -231,7 +231,7 @@
</span><span class="cx"> message.set(String::fromUTF8("Page"), toImpl(page));
</span><span class="cx"> message.set(String::fromUTF8("Identifier"), API::UInt64::create(identifier));
</span><span class="cx"> message.set(String::fromUTF8("ContentLength"), API::UInt64::create(length));
</span><del>- WebProcess::singleton().injectedBundle()->postMessage(String::fromUTF8("WebPage.DidReceiveContentLengthForResource"), API::Dictionary::create(WTF::move(message)).get());
</del><ins>+ WebProcess::singleton().injectedBundle()->postMessage(String::fromUTF8("WebPage.DidReceiveContentLengthForResource"), API::Dictionary::create(WTF::move(message)).ptr());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void didFinishLoadForResource(WKBundlePageRef page, WKBundleFrameRef, uint64_t identifier, const void*)
</span><span class="lines">@@ -239,7 +239,7 @@
</span><span class="cx"> API::Dictionary::MapType message;
</span><span class="cx"> message.set(String::fromUTF8("Page"), toImpl(page));
</span><span class="cx"> message.set(String::fromUTF8("Identifier"), API::UInt64::create(identifier));
</span><del>- WebProcess::singleton().injectedBundle()->postMessage(String::fromUTF8("WebPage.DidFinishLoadForResource"), API::Dictionary::create(WTF::move(message)).get());
</del><ins>+ WebProcess::singleton().injectedBundle()->postMessage(String::fromUTF8("WebPage.DidFinishLoadForResource"), API::Dictionary::create(WTF::move(message)).ptr());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void didFailLoadForResource(WKBundlePageRef page, WKBundleFrameRef, uint64_t identifier, WKErrorRef error, const void*)
</span><span class="lines">@@ -248,7 +248,7 @@
</span><span class="cx"> message.set(String::fromUTF8("Page"), toImpl(page));
</span><span class="cx"> message.set(String::fromUTF8("Identifier"), API::UInt64::create(identifier));
</span><span class="cx"> message.set(String::fromUTF8("Error"), toImpl(error));
</span><del>- WebProcess::singleton().injectedBundle()->postMessage(String::fromUTF8("WebPage.DidFailLoadForResource"), API::Dictionary::create(WTF::move(message)).get());
</del><ins>+ WebProcess::singleton().injectedBundle()->postMessage(String::fromUTF8("WebPage.DidFailLoadForResource"), API::Dictionary::create(WTF::move(message)).ptr());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> class PageContextMenuClient final : public API::InjectedBundle::PageContextMenuClient {
</span><span class="lines">@@ -500,7 +500,7 @@
</span><span class="cx"> messageReply.set("Page", webPage);
</span><span class="cx"> messageReply.set("CallbackID", API::UInt64::create(callbackID));
</span><span class="cx"> messageReply.set("Snapshot", snapshotImage);
</span><del>- WebProcess::singleton().injectedBundle()->postMessage("WebPage.DidGetSnapshot", API::Dictionary::create(WTF::move(messageReply)).get());
</del><ins>+ WebProcess::singleton().injectedBundle()->postMessage("WebPage.DidGetSnapshot", API::Dictionary::create(WTF::move(messageReply)).ptr());
</ins><span class="cx"> } else
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleInjectedBundlePageFormClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageFormClient.cpp (183411 => 183412)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageFormClient.cpp 2015-04-27 20:13:53 UTC (rev 183411)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageFormClient.cpp 2015-04-27 20:15:12 UTC (rev 183412)
</span><span class="lines">@@ -138,7 +138,7 @@
</span><span class="cx"> map.set(values[i].first, API::String::create(values[i].second));
</span><span class="cx"> auto textFieldsMap = API::Dictionary::create(WTF::move(map));
</span><span class="cx">
</span><del>- m_client.willSendSubmitEvent(toAPI(page), toAPI(nodeHandle.get()), toAPI(frame), toAPI(sourceFrame), toAPI(textFieldsMap.get()), m_client.base.clientInfo);
</del><ins>+ m_client.willSendSubmitEvent(toAPI(page), toAPI(nodeHandle.get()), toAPI(frame), toAPI(sourceFrame), toAPI(textFieldsMap.ptr()), m_client.base.clientInfo);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InjectedBundlePageFormClient::willSubmitForm(WebPage* page, HTMLFormElement* formElement, WebFrame* frame, WebFrame* sourceFrame, const Vector<std::pair<String, String>>& values, RefPtr<API::Object>& userData)
</span><span class="lines">@@ -154,7 +154,7 @@
</span><span class="cx"> auto textFieldsMap = API::Dictionary::create(WTF::move(map));
</span><span class="cx">
</span><span class="cx"> WKTypeRef userDataToPass = 0;
</span><del>- m_client.willSubmitForm(toAPI(page), toAPI(nodeHandle.get()), toAPI(frame), toAPI(sourceFrame), toAPI(textFieldsMap.get()), &userDataToPass, m_client.base.clientInfo);
</del><ins>+ m_client.willSubmitForm(toAPI(page), toAPI(nodeHandle.get()), toAPI(frame), toAPI(sourceFrame), toAPI(textFieldsMap.ptr()), &userDataToPass, m_client.base.clientInfo);
</ins><span class="cx"> userData = adoptRef(toImpl(userDataToPass));
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>