<!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>[160381] 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/160381">160381</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2013-12-10 13:07:26 -0800 (Tue, 10 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add more API object types to UserData
https://bugs.webkit.org/show_bug.cgi?id=125532
Reviewed by Beth Dakin.
* Shared/UserData.cpp:
(WebKit::UserData::transform):
Handle dictionaries.
(WebKit::UserData::encode):
(WebKit::UserData::decode):
Handle more API::Objects.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedUserDatacpp">trunk/Source/WebKit2/Shared/UserData.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (160380 => 160381)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2013-12-10 20:12:56 UTC (rev 160380)
+++ trunk/Source/WebKit2/ChangeLog 2013-12-10 21:07:26 UTC (rev 160381)
</span><span class="lines">@@ -1,5 +1,20 @@
</span><span class="cx"> 2013-12-10 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><ins>+ Add more API object types to UserData
+ https://bugs.webkit.org/show_bug.cgi?id=125532
+
+ Reviewed by Beth Dakin.
+
+ * Shared/UserData.cpp:
+ (WebKit::UserData::transform):
+ Handle dictionaries.
+
+ (WebKit::UserData::encode):
+ (WebKit::UserData::decode):
+ Handle more API::Objects.
+
+2013-12-10 Anders Carlsson <andersca@apple.com>
+
</ins><span class="cx"> More UserData work
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=125524
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedUserDatacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/UserData.cpp (160380 => 160381)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/UserData.cpp 2013-12-10 20:12:56 UTC (rev 160380)
+++ trunk/Source/WebKit2/Shared/UserData.cpp 2013-12-10 21:07:26 UTC (rev 160381)
</span><span class="lines">@@ -30,7 +30,10 @@
</span><span class="cx"> #include "APIFrameHandle.h"
</span><span class="cx"> #include "ArgumentCoders.h"
</span><span class="cx"> #include "ArgumentEncoder.h"
</span><ins>+#include "MutableDictionary.h"
</ins><span class="cx"> #include "WebNumber.h"
</span><ins>+#include "WebSerializedScriptValue.h"
+#include "WebString.h"
</ins><span class="cx"> #include "WebURL.h"
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="lines">@@ -60,6 +63,16 @@
</span><span class="cx"> return API::Array::create(std::move(elements));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if (object->type() == API::Object::Type::Dictionary) {
+ auto& dictionary = static_cast<ImmutableDictionary&>(*object);
+
+ ImmutableDictionary::MapType map;
+ for (const auto& keyValuePair : dictionary.map())
+ map.add(keyValuePair.key, transform(keyValuePair.value.get(), transformer));
+
+ return ImmutableDictionary::adopt(map);
+ }
+
</ins><span class="cx"> if (auto transformedObject = transformer(*object))
</span><span class="cx"> return transformedObject;
</span><span class="cx">
</span><span class="lines">@@ -106,12 +119,36 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ case API::Object::Type::Dictionary: {
+ auto& dictionary = static_cast<const ImmutableDictionary&>(object);
+ auto& map = dictionary.map();
+
+ encoder << map.size();
+ for (const auto& keyValuePair : map) {
+ encoder << keyValuePair.key;
+ encode(encoder, keyValuePair.value.get());
+ }
+ break;
+ }
+
</ins><span class="cx"> case API::Object::Type::FrameHandle: {
</span><span class="cx"> auto& frameHandle = static_cast<const API::FrameHandle&>(object);
</span><span class="cx"> encoder << frameHandle.frameID();
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ case API::Object::Type::SerializedScriptValue: {
+ auto& serializedScriptValue = static_cast<const WebSerializedScriptValue&>(object);
+ encoder << serializedScriptValue.dataReference();
+ break;
+ }
+
+ case API::Object::Type::String: {
+ auto& string = static_cast<const WebString&>(object);
+ encoder << string.string();
+ break;
+ }
+
</ins><span class="cx"> case API::Object::Type::URL: {
</span><span class="cx"> auto& url = static_cast<const WebURL&>(object);
</span><span class="cx"> encoder << url.string();
</span><span class="lines">@@ -163,6 +200,29 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ case API::Object::Type::Dictionary: {
+ uint64_t size;
+ if (!decoder.decode(size))
+ return false;
+
+ ImmutableDictionary::MapType map;
+ for (size_t i = 0; i < size; ++i) {
+ String key;
+ if (!decoder.decode(key))
+ return false;
+
+ RefPtr<API::Object> value;
+ if (!decode(decoder, value))
+ return false;
+
+ if (!map.add(std::move(key), std::move(value)).isNewEntry)
+ return false;
+ }
+
+ result = ImmutableDictionary::adopt(map);
+ break;
+ }
+
</ins><span class="cx"> case API::Object::Type::FrameHandle: {
</span><span class="cx"> uint64_t frameID;
</span><span class="cx"> if (!decoder.decode(frameID))
</span><span class="lines">@@ -176,6 +236,25 @@
</span><span class="cx"> result = nullptr;
</span><span class="cx"> break;
</span><span class="cx">
</span><ins>+ case API::Object::Type::SerializedScriptValue: {
+ CoreIPC::DataReference dataReference;
+ if (!decoder.decode(dataReference))
+ return false;
+
+ auto vector = dataReference.vector();
+ result = WebSerializedScriptValue::adopt(vector);
+ break;
+ }
+
+ case API::Object::Type::String: {
+ String string;
+ if (!decoder.decode(string))
+ return false;
+
+ result = WebString::create(string);
+ break;
+ }
+
</ins><span class="cx"> case API::Object::Type::URL: {
</span><span class="cx"> String string;
</span><span class="cx"> if (!decoder.decode(string))
</span></span></pre>
</div>
</div>
</body>
</html>