<!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>[177693] 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/177693">177693</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-12-23 12:44:25 -0800 (Tue, 23 Dec 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix UserMessage::transform to only call shouldTransform once
https://bugs.webkit.org/show_bug.cgi?id=139911
Reviewed by Sam Weinig.
Also, make it possible for transformers to return null objects and change the transformers
to return the passed in object when there's no need to do a transform.
* Shared/UserData.cpp:
(WebKit::transformGraph):
(WebKit::UserData::transform):
(WebKit::UserData::encode): Deleted.
(WebKit::UserData::decode): Deleted.
* UIProcess/WebProcessProxy.cpp:
(WebKit::WebProcessProxy::apiObjectByConvertingToHandles):
* WebProcess/WebProcess.cpp:
(WebKit::WebProcess::apiObjectByConvertingFromHandles):</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>
<li><a href="#trunkSourceWebKit2UIProcessWebProcessProxycpp">trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebProcesscpp">trunk/Source/WebKit2/WebProcess/WebProcess.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (177692 => 177693)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-12-23 20:29:26 UTC (rev 177692)
+++ trunk/Source/WebKit2/ChangeLog 2014-12-23 20:44:25 UTC (rev 177693)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2014-12-23 Anders Carlsson <andersca@apple.com>
+
+ Fix UserMessage::transform to only call shouldTransform once
+ https://bugs.webkit.org/show_bug.cgi?id=139911
+
+ Reviewed by Sam Weinig.
+
+ Also, make it possible for transformers to return null objects and change the transformers
+ to return the passed in object when there's no need to do a transform.
+
+ * Shared/UserData.cpp:
+ (WebKit::transformGraph):
+ (WebKit::UserData::transform):
+ (WebKit::UserData::encode): Deleted.
+ (WebKit::UserData::decode): Deleted.
+ * UIProcess/WebProcessProxy.cpp:
+ (WebKit::WebProcessProxy::apiObjectByConvertingToHandles):
+ * WebProcess/WebProcess.cpp:
+ (WebKit::WebProcess::apiObjectByConvertingFromHandles):
+
</ins><span class="cx"> 2014-12-23 Sam Weinig <sam@webkit.org>
</span><span class="cx">
</span><span class="cx"> Rename WebContext to WebProcessPool
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedUserDatacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/UserData.cpp (177692 => 177693)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/UserData.cpp 2014-12-23 20:29:26 UTC (rev 177692)
+++ trunk/Source/WebKit2/Shared/UserData.cpp 2014-12-23 20:44:25 UTC (rev 177693)
</span><span class="lines">@@ -86,17 +86,11 @@
</span><span class="cx"> return transformer.shouldTransformObjectOfType(object.type());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<API::Object> UserData::transform(API::Object* object, const Transformer& transformer)
</del><ins>+static RefPtr<API::Object> transformGraph(API::Object& object, const UserData::Transformer& transformer)
</ins><span class="cx"> {
</span><del>- if (!object)
- return nullptr;
</del><ins>+ if (object.type() == API::Object::Type::Array) {
+ auto& array = static_cast<API::Array&>(object);
</ins><span class="cx">
</span><del>- if (!shouldTransform(*object, transformer))
- return object;
-
- if (object->type() == API::Object::Type::Array) {
- auto& array = static_cast<API::Array&>(*object);
-
</del><span class="cx"> Vector<RefPtr<API::Object>> elements;
</span><span class="cx"> elements.reserveInitialCapacity(array.elements().size());
</span><span class="cx"> for (const auto& element : array.elements()) {
</span><span class="lines">@@ -109,20 +103,31 @@
</span><span class="cx"> return API::Array::create(WTF::move(elements));
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (object->type() == API::Object::Type::Dictionary) {
- auto& dictionary = static_cast<ImmutableDictionary&>(*object);
</del><ins>+ if (object.type() == API::Object::Type::Dictionary) {
+ auto& dictionary = static_cast<ImmutableDictionary&>(object);
</ins><span class="cx">
</span><span class="cx"> ImmutableDictionary::MapType map;
</span><del>- for (const auto& keyValuePair : dictionary.map())
- map.add(keyValuePair.key, transform(keyValuePair.value.get(), transformer));
-
</del><ins>+ for (const auto& keyValuePair : dictionary.map()) {
+ if (!keyValuePair.value)
+ map.add(keyValuePair.key, nullptr);
+ else
+ map.add(keyValuePair.key, transformGraph(*keyValuePair.value, transformer));
+ }
</ins><span class="cx"> return ImmutableDictionary::create(WTF::move(map));
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (auto transformedObject = transformer.transformObject(*object))
- return transformedObject;
</del><ins>+ return transformer.transformObject(object);
+}
</ins><span class="cx">
</span><del>- return object;
</del><ins>+RefPtr<API::Object> UserData::transform(API::Object* object, const Transformer& transformer)
+{
+ if (!object)
+ return nullptr;
+
+ if (!shouldTransform(*object, transformer))
+ return object;
+
+ return transformGraph(*object, transformer);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void UserData::encode(IPC::ArgumentEncoder& encoder) const
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebProcessProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp (177692 => 177693)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp 2014-12-23 20:29:26 UTC (rev 177692)
+++ trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp 2014-12-23 20:44:25 UTC (rev 177693)
</span><span class="lines">@@ -685,7 +685,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> default:
</span><del>- return nullptr;
</del><ins>+ return &object;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> } transformer;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebProcesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebProcess.cpp (177692 => 177693)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2014-12-23 20:29:26 UTC (rev 177692)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2014-12-23 20:44:25 UTC (rev 177693)
</span><span class="lines">@@ -1265,7 +1265,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> default:
</span><del>- return nullptr;
</del><ins>+ return &object;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> } transformer;
</span></span></pre>
</div>
</div>
</body>
</html>