<!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>[177685] 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/177685">177685</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-12-23 08:52:54 -0800 (Tue, 23 Dec 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use a Transformer for UserData as well, to avoid always copying arrays and dictionaries
https://bugs.webkit.org/show_bug.cgi?id=139896
Reviewed by Darin Adler.
* Shared/UserData.cpp:
(WebKit::shouldTransform):
(WebKit::UserData::transform):
* Shared/UserData.h:
(WebKit::UserData::Transformer::~Transformer):
* 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="#trunkSourceWebKit2SharedUserDatah">trunk/Source/WebKit2/Shared/UserData.h</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 (177684 => 177685)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-12-23 10:29:14 UTC (rev 177684)
+++ trunk/Source/WebKit2/ChangeLog 2014-12-23 16:52:54 UTC (rev 177685)
</span><span class="lines">@@ -1,5 +1,22 @@
</span><span class="cx"> 2014-12-22 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><ins>+ Use a Transformer for UserData as well, to avoid always copying arrays and dictionaries
+ https://bugs.webkit.org/show_bug.cgi?id=139896
+
+ Reviewed by Darin Adler.
+
+ * Shared/UserData.cpp:
+ (WebKit::shouldTransform):
+ (WebKit::UserData::transform):
+ * Shared/UserData.h:
+ (WebKit::UserData::Transformer::~Transformer):
+ * UIProcess/WebProcessProxy.cpp:
+ (WebKit::WebProcessProxy::apiObjectByConvertingToHandles):
+ * WebProcess/WebProcess.cpp:
+ (WebKit::WebProcess::apiObjectByConvertingFromHandles):
+
+2014-12-22 Anders Carlsson <andersca@apple.com>
+
</ins><span class="cx"> Make it possible to transform Objective-C object graphs, replacing certain elements with others
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=139893
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedUserDatacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/UserData.cpp (177684 => 177685)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/UserData.cpp 2014-12-23 10:29:14 UTC (rev 177684)
+++ trunk/Source/WebKit2/Shared/UserData.cpp 2014-12-23 16:52:54 UTC (rev 177685)
</span><span class="lines">@@ -57,18 +57,54 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<API::Object> UserData::transform(API::Object* object, const std::function<RefPtr<API::Object> (const API::Object&)> transformer)
</del><ins>+static bool shouldTransform(const API::Object& object, const UserData::Transformer& transformer)
</ins><span class="cx"> {
</span><ins>+ if (object.type() == API::Object::Type::Array) {
+ const auto& array = static_cast<const API::Array&>(object);
+
+ for (const auto& element : array.elements()) {
+ if (!element)
+ continue;
+
+ if (shouldTransform(*element, transformer))
+ return true;
+ }
+ }
+
+ if (object.type() == API::Object::Type::Dictionary) {
+ const auto& dictionary = static_cast<const ImmutableDictionary&>(object);
+
+ for (const auto& keyValuePair : dictionary.map()) {
+ if (!keyValuePair.value)
+ continue;
+
+ if (shouldTransform(*keyValuePair.value, transformer))
+ return true;
+ }
+ }
+
+ return transformer.shouldTransformObjectOfType(object.type());
+}
+
+RefPtr<API::Object> UserData::transform(API::Object* object, const Transformer& transformer)
+{
</ins><span class="cx"> if (!object)
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><ins>+ if (!shouldTransform(*object, transformer))
+ return object;
+
</ins><span class="cx"> if (object->type() == API::Object::Type::Array) {
</span><span class="cx"> auto& array = static_cast<API::Array&>(*object);
</span><span class="cx">
</span><span class="cx"> Vector<RefPtr<API::Object>> elements;
</span><span class="cx"> elements.reserveInitialCapacity(array.elements().size());
</span><del>- for (const auto& element : array.elements())
- elements.uncheckedAppend(transform(element.get(), transformer));
</del><ins>+ for (const auto& element : array.elements()) {
+ if (!element)
+ elements.uncheckedAppend(nullptr);
+ else
+ elements.uncheckedAppend(transformer.transformObject(*element));
+ }
</ins><span class="cx">
</span><span class="cx"> return API::Array::create(WTF::move(elements));
</span><span class="cx"> }
</span><span class="lines">@@ -83,7 +119,7 @@
</span><span class="cx"> return ImmutableDictionary::create(WTF::move(map));
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (auto transformedObject = transformer(*object))
</del><ins>+ if (auto transformedObject = transformer.transformObject(*object))
</ins><span class="cx"> return transformedObject;
</span><span class="cx">
</span><span class="cx"> return object;
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedUserDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/UserData.h (177684 => 177685)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/UserData.h 2014-12-23 10:29:14 UTC (rev 177684)
+++ trunk/Source/WebKit2/Shared/UserData.h 2014-12-23 16:52:54 UTC (rev 177685)
</span><span class="lines">@@ -26,13 +26,9 @@
</span><span class="cx"> #ifndef UserData_h
</span><span class="cx"> #define UserData_h
</span><span class="cx">
</span><del>-#include <functional>
</del><ins>+#include "APIObject.h"
</ins><span class="cx"> #include <wtf/RefPtr.h>
</span><span class="cx">
</span><del>-namespace API {
-class Object;
-}
-
</del><span class="cx"> namespace IPC {
</span><span class="cx"> class ArgumentEncoder;
</span><span class="cx"> class ArgumentDecoder;
</span><span class="lines">@@ -46,7 +42,12 @@
</span><span class="cx"> explicit UserData(RefPtr<API::Object>&&);
</span><span class="cx"> ~UserData();
</span><span class="cx">
</span><del>- static RefPtr<API::Object> transform(API::Object*, const std::function<RefPtr<API::Object> (const API::Object&)> transformer);
</del><ins>+ struct Transformer {
+ virtual ~Transformer() { }
+ virtual bool shouldTransformObjectOfType(API::Object::Type) const = 0;
+ virtual RefPtr<API::Object> transformObject(API::Object&) const = 0;
+ };
+ static RefPtr<API::Object> transform(API::Object*, const Transformer&);
</ins><span class="cx">
</span><span class="cx"> API::Object* object() const { return m_object.get(); }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebProcessProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp (177684 => 177685)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp 2014-12-23 10:29:14 UTC (rev 177684)
+++ trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp 2014-12-23 16:52:54 UTC (rev 177685)
</span><span class="lines">@@ -652,27 +652,45 @@
</span><span class="cx">
</span><span class="cx"> RefPtr<API::Object> WebProcessProxy::apiObjectByConvertingToHandles(API::Object* object)
</span><span class="cx"> {
</span><del>- return UserData::transform(object, [](const API::Object& object) -> RefPtr<API::Object> {
- switch (object.type()) {
- case API::Object::Type::Frame: {
- auto& frame = static_cast<const WebFrameProxy&>(object);
- return API::FrameHandle::create(frame.frameID());
- }
</del><ins>+ struct Transformer : UserData::Transformer {
+ virtual bool shouldTransformObjectOfType(API::Object::Type type) const
+ {
+ switch (type) {
+ case API::Object::Type::Frame:
+ case API::Object::Type::Page:
+ case API::Object::Type::PageGroup:
+ return true;
</ins><span class="cx">
</span><del>- case API::Object::Type::Page: {
- auto& page = static_cast<const WebPageProxy&>(object);
- return API::PageHandle::create(page.pageID());
</del><ins>+ default:
+ return false;
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- case API::Object::Type::PageGroup: {
- auto& pageGroup = static_cast<const WebPageGroup&>(object);
- return API::PageGroupHandle::create(WebPageGroupData(pageGroup.data()));
</del><ins>+ virtual RefPtr<API::Object> transformObject(API::Object& object) const override
+ {
+ switch (object.type()) {
+ case API::Object::Type::Frame: {
+ auto& frame = static_cast<const WebFrameProxy&>(object);
+ return API::FrameHandle::create(frame.frameID());
+ }
+
+ case API::Object::Type::Page: {
+ auto& page = static_cast<const WebPageProxy&>(object);
+ return API::PageHandle::create(page.pageID());
+ }
+
+ case API::Object::Type::PageGroup: {
+ auto& pageGroup = static_cast<const WebPageGroup&>(object);
+ return API::PageGroupHandle::create(WebPageGroupData(pageGroup.data()));
+ }
+
+ default:
+ return nullptr;
+ }
</ins><span class="cx"> }
</span><ins>+ } transformer;
</ins><span class="cx">
</span><del>- default:
- return nullptr;
- }
- });
</del><ins>+ return UserData::transform(object, transformer);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebProcessProxy::sendProcessWillSuspend()
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebProcesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebProcess.cpp (177684 => 177685)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2014-12-23 10:29:14 UTC (rev 177684)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2014-12-23 16:52:54 UTC (rev 177685)
</span><span class="lines">@@ -1229,30 +1229,49 @@
</span><span class="cx">
</span><span class="cx"> RefPtr<API::Object> WebProcess::apiObjectByConvertingFromHandles(API::Object* object)
</span><span class="cx"> {
</span><del>- return UserData::transform(object, [this](const API::Object& object) -> RefPtr<API::Object> {
- switch (object.type()) {
- case API::Object::Type::FrameHandle: {
- auto& frameHandle = static_cast<const API::FrameHandle&>(object);
</del><ins>+ struct Transformer : UserData::Transformer {
+ virtual bool shouldTransformObjectOfType(API::Object::Type type) const
+ {
+ switch (type) {
+ case API::Object::Type::FrameHandle:
+ case API::Object::Type::PageHandle:
+ case API::Object::Type::PageGroupHandle:
+ return true;
</ins><span class="cx">
</span><del>- return webFrame(frameHandle.frameID());
</del><ins>+ default:
+ return false;
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- case API::Object::Type::PageGroupHandle: {
- auto& pageGroupHandle = static_cast<const API::PageGroupHandle&>(object);
</del><ins>+ virtual RefPtr<API::Object> transformObject(API::Object& object) const override
+ {
+ switch (object.type()) {
+ case API::Object::Type::FrameHandle: {
+ auto& frameHandle = static_cast<const API::FrameHandle&>(object);
</ins><span class="cx">
</span><del>- return webPageGroup(pageGroupHandle.webPageGroupData());
- }
</del><ins>+ return WebProcess::shared().webFrame(frameHandle.frameID());
+ }
</ins><span class="cx">
</span><del>- case API::Object::Type::PageHandle: {
- auto& pageHandle = static_cast<const API::PageHandle&>(object);
</del><ins>+ case API::Object::Type::PageGroupHandle: {
+ auto& pageGroupHandle = static_cast<const API::PageGroupHandle&>(object);
</ins><span class="cx">
</span><del>- return webPage(pageHandle.pageID());
</del><ins>+ return WebProcess::shared().webPageGroup(pageGroupHandle.webPageGroupData());
+ }
+
+ case API::Object::Type::PageHandle: {
+ auto& pageHandle = static_cast<const API::PageHandle&>(object);
+
+ return WebProcess::shared().webPage(pageHandle.pageID());
+ }
+
+ default:
+ return nullptr;
+ }
</ins><span class="cx"> }
</span><ins>+ } transformer;
</ins><span class="cx">
</span><del>- default:
- return nullptr;
- }
- });
</del><ins>+ return UserData::transform(object, transformer);
+
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebProcess::setMemoryCacheDisabled(bool disabled)
</span></span></pre>
</div>
</div>
</body>
</html>