<!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>[160504] 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/160504">160504</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2013-12-12 12:28:47 -0800 (Thu, 12 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Clean up dictionary handling a little
https://bugs.webkit.org/show_bug.cgi?id=125644
Reviewed by Dan Bernstein.
Add a WKDictionaryCreate function as a first step towards eliminating WKMutableDictionaryRef,
(in the same way we've eliminated WKMutableArrayRef). Also, rename adopt to create and make it take a Map by value
so we can use std::move where appropriate.
* Shared/API/c/WKDictionary.cpp:
(WKDictionaryCreate):
* Shared/API/c/WKDictionary.h:
* Shared/Cocoa/WKNSDictionary.mm:
(-[WKNSDictionary copyWithZone:]):
* Shared/ImmutableDictionary.cpp:
(WebKit::ImmutableDictionary::create):
(WebKit::ImmutableDictionary::ImmutableDictionary):
* Shared/ImmutableDictionary.h:
* Shared/MutableDictionary.cpp:
(WebKit::MutableDictionary::MutableDictionary):
* Shared/Plugins/Netscape/PluginInformation.cpp:
(WebKit::createPluginInformationDictionary):
* Shared/UserData.cpp:
(WebKit::UserData::transform):
(WebKit::UserData::decode):
* Shared/UserMessageCoders.h:
(WebKit::UserMessageDecoder::baseDecode):
* UIProcess/Plugins/PlugInAutoStartProvider.cpp:
(WebKit::PlugInAutoStartProvider::autoStartOriginsTableCopy):
* UIProcess/WebContext.cpp:
(WebKit::WebContext::pluginInfoStoreDidLoadPlugins):
* UIProcess/WebDatabaseManagerProxy.cpp:
(WebKit::WebDatabaseManagerProxy::didGetDatabasesByOrigin):
* UIProcess/WebFormClient.cpp:
(WebKit::WebFormClient::willSubmitForm):
* UIProcess/WebUIClient.cpp:
(WebKit::WebUIClient::createNewPage):
* 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="#trunkSourceWebKit2SharedAPIcWKDictionarycpp">trunk/Source/WebKit2/Shared/API/c/WKDictionary.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedAPIcWKDictionaryh">trunk/Source/WebKit2/Shared/API/c/WKDictionary.h</a></li>
<li><a href="#trunkSourceWebKit2SharedCocoaWKNSDictionarymm">trunk/Source/WebKit2/Shared/Cocoa/WKNSDictionary.mm</a></li>
<li><a href="#trunkSourceWebKit2SharedImmutableDictionarycpp">trunk/Source/WebKit2/Shared/ImmutableDictionary.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedImmutableDictionaryh">trunk/Source/WebKit2/Shared/ImmutableDictionary.h</a></li>
<li><a href="#trunkSourceWebKit2SharedMutableDictionarycpp">trunk/Source/WebKit2/Shared/MutableDictionary.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedPluginsNetscapePluginInformationcpp">trunk/Source/WebKit2/Shared/Plugins/Netscape/PluginInformation.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedUserDatacpp">trunk/Source/WebKit2/Shared/UserData.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedUserMessageCodersh">trunk/Source/WebKit2/Shared/UserMessageCoders.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessPluginsPlugInAutoStartProvidercpp">trunk/Source/WebKit2/UIProcess/Plugins/PlugInAutoStartProvider.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebContextcpp">trunk/Source/WebKit2/UIProcess/WebContext.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebDatabaseManagerProxycpp">trunk/Source/WebKit2/UIProcess/WebDatabaseManagerProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebFormClientcpp">trunk/Source/WebKit2/UIProcess/WebFormClient.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebUIClientcpp">trunk/Source/WebKit2/UIProcess/WebUIClient.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 (160503 => 160504)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2013-12-12 20:18:45 UTC (rev 160503)
+++ trunk/Source/WebKit2/ChangeLog 2013-12-12 20:28:47 UTC (rev 160504)
</span><span class="lines">@@ -1,3 +1,46 @@
</span><ins>+2013-12-12 Anders Carlsson <andersca@apple.com>
+
+ Clean up dictionary handling a little
+ https://bugs.webkit.org/show_bug.cgi?id=125644
+
+ Reviewed by Dan Bernstein.
+
+ Add a WKDictionaryCreate function as a first step towards eliminating WKMutableDictionaryRef,
+ (in the same way we've eliminated WKMutableArrayRef). Also, rename adopt to create and make it take a Map by value
+ so we can use std::move where appropriate.
+
+ * Shared/API/c/WKDictionary.cpp:
+ (WKDictionaryCreate):
+ * Shared/API/c/WKDictionary.h:
+ * Shared/Cocoa/WKNSDictionary.mm:
+ (-[WKNSDictionary copyWithZone:]):
+ * Shared/ImmutableDictionary.cpp:
+ (WebKit::ImmutableDictionary::create):
+ (WebKit::ImmutableDictionary::ImmutableDictionary):
+ * Shared/ImmutableDictionary.h:
+ * Shared/MutableDictionary.cpp:
+ (WebKit::MutableDictionary::MutableDictionary):
+ * Shared/Plugins/Netscape/PluginInformation.cpp:
+ (WebKit::createPluginInformationDictionary):
+ * Shared/UserData.cpp:
+ (WebKit::UserData::transform):
+ (WebKit::UserData::decode):
+ * Shared/UserMessageCoders.h:
+ (WebKit::UserMessageDecoder::baseDecode):
+ * UIProcess/Plugins/PlugInAutoStartProvider.cpp:
+ (WebKit::PlugInAutoStartProvider::autoStartOriginsTableCopy):
+ * UIProcess/WebContext.cpp:
+ (WebKit::WebContext::pluginInfoStoreDidLoadPlugins):
+ * UIProcess/WebDatabaseManagerProxy.cpp:
+ (WebKit::WebDatabaseManagerProxy::didGetDatabasesByOrigin):
+ * UIProcess/WebFormClient.cpp:
+ (WebKit::WebFormClient::willSubmitForm):
+ * UIProcess/WebUIClient.cpp:
+ (WebKit::WebUIClient::createNewPage):
+ * WebProcess/InjectedBundle/InjectedBundlePageFormClient.cpp:
+ (WebKit::InjectedBundlePageFormClient::willSendSubmitEvent):
+ (WebKit::InjectedBundlePageFormClient::willSubmitForm):
+
</ins><span class="cx"> 2013-12-12 Dan Bernstein <mitz@apple.com>
</span><span class="cx">
</span><span class="cx"> [Cocoa] Navigation action information for policy decisions is missing the original request
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIcWKDictionarycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/API/c/WKDictionary.cpp (160503 => 160504)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/API/c/WKDictionary.cpp 2013-12-12 20:18:45 UTC (rev 160503)
+++ trunk/Source/WebKit2/Shared/API/c/WKDictionary.cpp 2013-12-12 20:28:47 UTC (rev 160504)
</span><span class="lines">@@ -37,6 +37,15 @@
</span><span class="cx"> return toAPI(ImmutableDictionary::APIType);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+WK_EXPORT WKDictionaryRef WKDictionaryCreate(const WKStringRef* keys, const WKTypeRef* values, size_t numberOfValues)
+{
+ ImmutableDictionary::MapType map;
+ for (size_t i = 0; i < numberOfValues; ++i)
+ map.add(toImpl(keys[i])->string(), toImpl(values[i]));
+
+ return toAPI(ImmutableDictionary::create(std::move(map)).release().leakRef());
+}
+
</ins><span class="cx"> WKTypeRef WKDictionaryGetItemForKey(WKDictionaryRef dictionaryRef, WKStringRef key)
</span><span class="cx"> {
</span><span class="cx"> return toImpl(dictionaryRef)->get(toImpl(key)->string());
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIcWKDictionaryh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/API/c/WKDictionary.h (160503 => 160504)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/API/c/WKDictionary.h 2013-12-12 20:18:45 UTC (rev 160503)
+++ trunk/Source/WebKit2/Shared/API/c/WKDictionary.h 2013-12-12 20:28:47 UTC (rev 160504)
</span><span class="lines">@@ -36,6 +36,8 @@
</span><span class="cx">
</span><span class="cx"> WK_EXPORT WKTypeID WKDictionaryGetTypeID();
</span><span class="cx">
</span><ins>+WK_EXPORT WKDictionaryRef WKDictionaryCreate(const WKStringRef* keys, const WKTypeRef* values, size_t numberOfValues);
+
</ins><span class="cx"> WK_EXPORT WKTypeRef WKDictionaryGetItemForKey(WKDictionaryRef dictionary, WKStringRef key);
</span><span class="cx"> WK_EXPORT size_t WKDictionaryGetSize(WKDictionaryRef dictionary);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedCocoaWKNSDictionarymm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/Cocoa/WKNSDictionary.mm (160503 => 160504)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/Cocoa/WKNSDictionary.mm 2013-12-12 20:18:45 UTC (rev 160503)
+++ trunk/Source/WebKit2/Shared/Cocoa/WKNSDictionary.mm 2013-12-12 20:28:47 UTC (rev 160504)
</span><span class="lines">@@ -82,7 +82,7 @@
</span><span class="cx"> return [self retain];
</span><span class="cx">
</span><span class="cx"> auto map = _dictionary->map();
</span><del>- return ImmutableDictionary::adopt(map).leakRef()->wrapper();
</del><ins>+ return ImmutableDictionary::create(std::move(map)).release().leakRef()->wrapper();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #pragma mark WKObject protocol implementation
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedImmutableDictionarycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/ImmutableDictionary.cpp (160503 => 160504)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/ImmutableDictionary.cpp 2013-12-12 20:18:45 UTC (rev 160503)
+++ trunk/Source/WebKit2/Shared/ImmutableDictionary.cpp 2013-12-12 20:28:47 UTC (rev 160504)
</span><span class="lines">@@ -31,15 +31,21 @@
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><del>-ImmutableDictionary::ImmutableDictionary()
</del><ins>+RefPtr<ImmutableDictionary> ImmutableDictionary::create()
</ins><span class="cx"> {
</span><ins>+ return create({ });
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-ImmutableDictionary::ImmutableDictionary(MapType& map)
</del><ins>+RefPtr<ImmutableDictionary> ImmutableDictionary::create(MapType map)
</ins><span class="cx"> {
</span><del>- m_map.swap(map);
</del><ins>+ return adoptRef(new ImmutableDictionary(std::move(map)));
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+ImmutableDictionary::ImmutableDictionary(MapType map)
+ : m_map(std::move(map))
+{
+}
+
</ins><span class="cx"> ImmutableDictionary::~ImmutableDictionary()
</span><span class="cx"> {
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedImmutableDictionaryh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/ImmutableDictionary.h (160503 => 160504)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/ImmutableDictionary.h 2013-12-12 20:18:45 UTC (rev 160503)
+++ trunk/Source/WebKit2/Shared/ImmutableDictionary.h 2013-12-12 20:28:47 UTC (rev 160504)
</span><span class="lines">@@ -44,14 +44,8 @@
</span><span class="cx"> public:
</span><span class="cx"> typedef HashMap<String, RefPtr<API::Object>> MapType;
</span><span class="cx">
</span><del>- static PassRefPtr<ImmutableDictionary> create()
- {
- return adoptRef(new ImmutableDictionary);
- }
- static PassRefPtr<ImmutableDictionary> adopt(MapType& map)
- {
- return adoptRef(new ImmutableDictionary(map));
- }
</del><ins>+ static RefPtr<ImmutableDictionary> create();
+ static RefPtr<ImmutableDictionary> create(MapType);
</ins><span class="cx">
</span><span class="cx"> virtual ~ImmutableDictionary();
</span><span class="cx">
</span><span class="lines">@@ -89,8 +83,7 @@
</span><span class="cx"> const MapType& map() const { return m_map; }
</span><span class="cx">
</span><span class="cx"> protected:
</span><del>- ImmutableDictionary();
- explicit ImmutableDictionary(MapType&);
</del><ins>+ explicit ImmutableDictionary(MapType);
</ins><span class="cx">
</span><span class="cx"> MapType m_map;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedMutableDictionarycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/MutableDictionary.cpp (160503 => 160504)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/MutableDictionary.cpp 2013-12-12 20:18:45 UTC (rev 160503)
+++ trunk/Source/WebKit2/Shared/MutableDictionary.cpp 2013-12-12 20:28:47 UTC (rev 160504)
</span><span class="lines">@@ -29,6 +29,7 @@
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><span class="cx"> MutableDictionary::MutableDictionary()
</span><ins>+ : ImmutableDictionary({ })
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedPluginsNetscapePluginInformationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/Plugins/Netscape/PluginInformation.cpp (160503 => 160504)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/Plugins/Netscape/PluginInformation.cpp 2013-12-12 20:18:45 UTC (rev 160503)
+++ trunk/Source/WebKit2/Shared/Plugins/Netscape/PluginInformation.cpp 2013-12-12 20:28:47 UTC (rev 160504)
</span><span class="lines">@@ -127,7 +127,7 @@
</span><span class="cx"> ImmutableDictionary::MapType map;
</span><span class="cx"> getPluginModuleInformation(plugin, map);
</span><span class="cx">
</span><del>- return ImmutableDictionary::adopt(map);
</del><ins>+ return ImmutableDictionary::create(std::move(map));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> PassRefPtr<ImmutableDictionary> createPluginInformationDictionary(const PluginModuleInfo& plugin, const String& frameURLString, const String& mimeType, const String& pageURLString, const String& pluginspageAttributeURLString, const String& pluginURLString, bool replacementObscured)
</span><span class="lines">@@ -147,7 +147,7 @@
</span><span class="cx"> map.set(pluginInformationPluginURLKey(), WebURL::create(pluginURLString));
</span><span class="cx"> map.set(plugInInformationReplacementObscuredKey(), API::Boolean::create(replacementObscured));
</span><span class="cx">
</span><del>- return ImmutableDictionary::adopt(map);
</del><ins>+ return ImmutableDictionary::create(std::move(map));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> PassRefPtr<ImmutableDictionary> createPluginInformationDictionary(const String& mimeType, const String& frameURLString, const String& pageURLString)
</span><span class="lines">@@ -161,7 +161,7 @@
</span><span class="cx"> if (!pageURLString.isEmpty())
</span><span class="cx"> map.set(pluginInformationPageURLKey(), WebURL::create(pageURLString));
</span><span class="cx">
</span><del>- return ImmutableDictionary::adopt(map);
</del><ins>+ return ImmutableDictionary::create(std::move(map));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if !PLATFORM(MAC)
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedUserDatacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/UserData.cpp (160503 => 160504)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/UserData.cpp 2013-12-12 20:18:45 UTC (rev 160503)
+++ trunk/Source/WebKit2/Shared/UserData.cpp 2013-12-12 20:28:47 UTC (rev 160504)
</span><span class="lines">@@ -71,7 +71,7 @@
</span><span class="cx"> for (const auto& keyValuePair : dictionary.map())
</span><span class="cx"> map.add(keyValuePair.key, transform(keyValuePair.value.get(), transformer));
</span><span class="cx">
</span><del>- return ImmutableDictionary::adopt(map);
</del><ins>+ return ImmutableDictionary::create(std::move(map));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (auto transformedObject = transformer(*object))
</span><span class="lines">@@ -222,7 +222,7 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- result = ImmutableDictionary::adopt(map);
</del><ins>+ result = ImmutableDictionary::create(std::move(map));
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedUserMessageCodersh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/UserMessageCoders.h (160503 => 160504)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/UserMessageCoders.h 2013-12-12 20:18:45 UTC (rev 160503)
+++ trunk/Source/WebKit2/Shared/UserMessageCoders.h 2013-12-12 20:28:47 UTC (rev 160504)
</span><span class="lines">@@ -307,7 +307,7 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- coder.m_root = ImmutableDictionary::adopt(map);
</del><ins>+ coder.m_root = ImmutableDictionary::create(std::move(map));
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> case API::Object::Type::String: {
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessPluginsPlugInAutoStartProvidercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Plugins/PlugInAutoStartProvider.cpp (160503 => 160504)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Plugins/PlugInAutoStartProvider.cpp 2013-12-12 20:18:45 UTC (rev 160503)
+++ trunk/Source/WebKit2/UIProcess/Plugins/PlugInAutoStartProvider.cpp 2013-12-12 20:28:47 UTC (rev 160504)
</span><span class="lines">@@ -93,10 +93,10 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (hashMap.size())
</span><del>- map.set(it->key, ImmutableDictionary::adopt(hashMap));
</del><ins>+ map.set(it->key, ImmutableDictionary::create(std::move(hashMap)));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- return ImmutableDictionary::adopt(map);
</del><ins>+ return ImmutableDictionary::create(std::move(map));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void PlugInAutoStartProvider::setAutoStartOriginsTable(ImmutableDictionary& table)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebContext.cpp (160503 => 160504)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebContext.cpp 2013-12-12 20:18:45 UTC (rev 160503)
+++ trunk/Source/WebKit2/UIProcess/WebContext.cpp 2013-12-12 20:28:47 UTC (rev 160504)
</span><span class="lines">@@ -1293,7 +1293,7 @@
</span><span class="cx"> map.set(ASCIILiteral("version"), WebString::create(pluginModule.versionString));
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- plugins.uncheckedAppend(ImmutableDictionary::adopt(map));
</del><ins>+ plugins.uncheckedAppend(ImmutableDictionary::create(std::move(map)));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> m_client.plugInInformationBecameAvailable(this, API::Array::create(std::move(plugins)).get());
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebDatabaseManagerProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebDatabaseManagerProxy.cpp (160503 => 160504)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebDatabaseManagerProxy.cpp 2013-12-12 20:18:45 UTC (rev 160503)
+++ trunk/Source/WebKit2/UIProcess/WebDatabaseManagerProxy.cpp 2013-12-12 20:28:47 UTC (rev 160504)
</span><span class="lines">@@ -173,7 +173,7 @@
</span><span class="cx"> detailsMap.set(databaseDetailsExpectedUsageKey(), API::UInt64::create(databaseDetails.expectedUsage()));
</span><span class="cx"> detailsMap.set(databaseDetailsCurrentUsageKey(), API::UInt64::create(databaseDetails.currentUsage()));
</span><span class="cx">
</span><del>- databases.uncheckedAppend(ImmutableDictionary::adopt(detailsMap));
</del><ins>+ databases.uncheckedAppend(ImmutableDictionary::create(std::move(detailsMap)));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> HashMap<String, RefPtr<API::Object>> originAndDatabasesMap;
</span><span class="lines">@@ -182,7 +182,7 @@
</span><span class="cx"> originAndDatabasesMap.set(originUsageKey(), API::UInt64::create(originAndDatabases.originUsage));
</span><span class="cx"> originAndDatabasesMap.set(databaseDetailsKey(), API::Array::create(std::move(databases)));
</span><span class="cx">
</span><del>- result.uncheckedAppend(ImmutableDictionary::adopt(originAndDatabasesMap));
</del><ins>+ result.uncheckedAppend(ImmutableDictionary::create(std::move(originAndDatabasesMap)));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> callback->performCallbackWithReturnValue(API::Array::create(std::move(result)).get());
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebFormClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebFormClient.cpp (160503 => 160504)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebFormClient.cpp 2013-12-12 20:18:45 UTC (rev 160503)
+++ trunk/Source/WebKit2/UIProcess/WebFormClient.cpp 2013-12-12 20:28:47 UTC (rev 160504)
</span><span class="lines">@@ -41,7 +41,7 @@
</span><span class="cx"> ImmutableDictionary::MapType map;
</span><span class="cx"> for (size_t i = 0; i < textFieldValues.size(); ++i)
</span><span class="cx"> map.set(textFieldValues[i].first, WebString::create(textFieldValues[i].second));
</span><del>- RefPtr<ImmutableDictionary> textFieldsMap = ImmutableDictionary::adopt(map);
</del><ins>+ RefPtr<ImmutableDictionary> textFieldsMap = ImmutableDictionary::create(std::move(map));
</ins><span class="cx">
</span><span class="cx"> m_client.willSubmitForm(toAPI(page), toAPI(frame), toAPI(sourceFrame), toAPI(textFieldsMap.get()), toAPI(userData), toAPI(listener), m_client.base.clientInfo);
</span><span class="cx"> return true;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebUIClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebUIClient.cpp (160503 => 160504)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebUIClient.cpp 2013-12-12 20:18:45 UTC (rev 160503)
+++ trunk/Source/WebKit2/UIProcess/WebUIClient.cpp 2013-12-12 20:28:47 UTC (rev 160504)
</span><span class="lines">@@ -71,7 +71,7 @@
</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<ImmutableDictionary> featuresMap = ImmutableDictionary::adopt(map);
</del><ins>+ RefPtr<ImmutableDictionary> featuresMap = ImmutableDictionary::create(std::move(map));
</ins><span class="cx">
</span><span class="cx"> if (!m_client.base.version)
</span><span class="cx"> return adoptRef(toImpl(m_client.createNewPage_deprecatedForUseWithV0(toAPI(page), toAPI(featuresMap.get()), toAPI(modifiers), toAPI(button), m_client.base.clientInfo)));
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleInjectedBundlePageFormClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageFormClient.cpp (160503 => 160504)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageFormClient.cpp 2013-12-12 20:18:45 UTC (rev 160503)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageFormClient.cpp 2013-12-12 20:28:47 UTC (rev 160504)
</span><span class="lines">@@ -103,7 +103,7 @@
</span><span class="cx"> ImmutableDictionary::MapType map;
</span><span class="cx"> for (size_t i = 0; i < values.size(); ++i)
</span><span class="cx"> map.set(values[i].first, WebString::create(values[i].second));
</span><del>- RefPtr<ImmutableDictionary> textFieldsMap = ImmutableDictionary::adopt(map);
</del><ins>+ auto textFieldsMap = ImmutableDictionary::create(std::move(map));
</ins><span class="cx">
</span><span class="cx"> m_client.willSendSubmitEvent(toAPI(page), toAPI(nodeHandle.get()), toAPI(frame), toAPI(sourceFrame), toAPI(textFieldsMap.get()), m_client.base.clientInfo);
</span><span class="cx"> }
</span><span class="lines">@@ -118,7 +118,7 @@
</span><span class="cx"> ImmutableDictionary::MapType map;
</span><span class="cx"> for (size_t i = 0; i < values.size(); ++i)
</span><span class="cx"> map.set(values[i].first, WebString::create(values[i].second));
</span><del>- RefPtr<ImmutableDictionary> textFieldsMap = ImmutableDictionary::adopt(map);
</del><ins>+ auto textFieldsMap = ImmutableDictionary::create(std::move(map));
</ins><span class="cx">
</span><span class="cx"> WKTypeRef userDataToPass = 0;
</span><span class="cx"> m_client.willSubmitForm(toAPI(page), toAPI(nodeHandle.get()), toAPI(frame), toAPI(sourceFrame), toAPI(textFieldsMap.get()), &userDataToPass, m_client.base.clientInfo);
</span></span></pre>
</div>
</div>
</body>
</html>