<!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>[177698] 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/177698">177698</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-12-23 15:06:10 -0800 (Tue, 23 Dec 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add WebProcess::transformObjectsToHandles
https://bugs.webkit.org/show_bug.cgi?id=139918
Reviewed by Tim Horton.
This function will be used for transforming bundle objects to their respective handle types
when sending messages to the UI process.
* WebProcess/WebProcess.cpp:
(WebKit::WebProcess::transformHandlesToObjects):
(WebKit::WebProcess::transformObjectsToHandles):
* WebProcess/WebProcess.h:
* WebProcess/cocoa/WebProcessCocoa.mm:
(WebKit::WebProcess::transformHandlesToObjects):
(WebKit::WebProcess::transformObjectsToHandles):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebProcesscpp">trunk/Source/WebKit2/WebProcess/WebProcess.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebProcessh">trunk/Source/WebKit2/WebProcess/WebProcess.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcesscocoaWebProcessCocoamm">trunk/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (177697 => 177698)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-12-23 22:27:11 UTC (rev 177697)
+++ trunk/Source/WebKit2/ChangeLog 2014-12-23 23:06:10 UTC (rev 177698)
</span><span class="lines">@@ -1,5 +1,23 @@
</span><span class="cx"> 2014-12-23 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><ins>+ Add WebProcess::transformObjectsToHandles
+ https://bugs.webkit.org/show_bug.cgi?id=139918
+
+ Reviewed by Tim Horton.
+
+ This function will be used for transforming bundle objects to their respective handle types
+ when sending messages to the UI process.
+
+ * WebProcess/WebProcess.cpp:
+ (WebKit::WebProcess::transformHandlesToObjects):
+ (WebKit::WebProcess::transformObjectsToHandles):
+ * WebProcess/WebProcess.h:
+ * WebProcess/cocoa/WebProcessCocoa.mm:
+ (WebKit::WebProcess::transformHandlesToObjects):
+ (WebKit::WebProcess::transformObjectsToHandles):
+
+2014-12-23 Anders Carlsson <andersca@apple.com>
+
</ins><span class="cx"> Move dynamic_objc_cast to RetainPtr.h
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=139915
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebProcesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebProcess.cpp (177697 => 177698)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2014-12-23 22:27:11 UTC (rev 177697)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2014-12-23 23:06:10 UTC (rev 177698)
</span><span class="lines">@@ -1229,7 +1229,12 @@
</span><span class="cx">
</span><span class="cx"> RefPtr<API::Object> WebProcess::transformHandlesToObjects(API::Object* object)
</span><span class="cx"> {
</span><del>- struct Transformer : UserData::Transformer {
</del><ins>+ struct Transformer final : UserData::Transformer {
+ Transformer(WebProcess& webProcess)
+ : m_webProcess(webProcess)
+ {
+ }
+
</ins><span class="cx"> virtual bool shouldTransformObjectOfType(API::Object::Type type) const
</span><span class="cx"> {
</span><span class="cx"> switch (type) {
</span><span class="lines">@@ -1249,32 +1254,84 @@
</span><span class="cx"> virtual RefPtr<API::Object> transformObject(API::Object& object) const override
</span><span class="cx"> {
</span><span class="cx"> switch (object.type()) {
</span><del>- case API::Object::Type::FrameHandle: {
- auto& frameHandle = static_cast<const API::FrameHandle&>(object);
</del><ins>+ case API::Object::Type::FrameHandle:
+ return m_webProcess.webFrame(static_cast<const API::FrameHandle&>(object).frameID());
</ins><span class="cx">
</span><del>- return WebProcess::shared().webFrame(frameHandle.frameID());
</del><ins>+ case API::Object::Type::PageGroupHandle:
+ return m_webProcess.webPageGroup(static_cast<const API::PageGroupHandle&>(object).webPageGroupData());
+
+ case API::Object::Type::PageHandle:
+ return m_webProcess.webPage(static_cast<const API::PageHandle&>(object).pageID());
+
+#if PLATFORM(COCOA)
+ case API::Object::Type::ObjCObjectGraph:
+ return m_webProcess.transformHandlesToObjects(static_cast<ObjCObjectGraph&>(object));
+#endif
+ default:
+ return &object;
</ins><span class="cx"> }
</span><ins>+ }
</ins><span class="cx">
</span><del>- case API::Object::Type::PageGroupHandle: {
- auto& pageGroupHandle = static_cast<const API::PageGroupHandle&>(object);
</del><ins>+ WebProcess& m_webProcess;
+ };
</ins><span class="cx">
</span><del>- return WebProcess::shared().webPageGroup(pageGroupHandle.webPageGroupData());
</del><ins>+ return UserData::transform(object, Transformer(*this));
+}
+
+RefPtr<API::Object> WebProcess::transformObjectsToHandles(API::Object* object)
+{
+ struct Transformer final : UserData::Transformer {
+ Transformer(WebProcess& webProcess)
+ : m_webProcess(webProcess)
+ {
+ }
+
+ virtual bool shouldTransformObjectOfType(API::Object::Type type) const override
+ {
+ switch (type) {
+ case API::Object::Type::BundleFrame:
+ case API::Object::Type::BundlePage:
+ case API::Object::Type::BundlePageGroup:
+#if PLATFORM(COCOA)
+ case API::Object::Type::ObjCObjectGraph:
+#endif
+ return true;
+
+ default:
+ return false;
</ins><span class="cx"> }
</span><ins>+ }
</ins><span class="cx">
</span><del>- case API::Object::Type::PageHandle: {
- auto& pageHandle = static_cast<const API::PageHandle&>(object);
</del><ins>+ virtual RefPtr<API::Object> transformObject(API::Object& object) const override
+ {
+ switch (object.type()) {
+ case API::Object::Type::BundleFrame:
+ return API::FrameHandle::create(static_cast<const WebFrame&>(object).frameID());
</ins><span class="cx">
</span><del>- return WebProcess::shared().webPage(pageHandle.pageID());
</del><ins>+ case API::Object::Type::BundlePage:
+ return API::PageHandle::create(static_cast<const WebPage&>(object).pageID());
+
+ case API::Object::Type::BundlePageGroup: {
+ WebPageGroupData pageGroupData;
+ pageGroupData.pageGroupID = static_cast<const WebPageGroupProxy&>(object).pageGroupID();
+
+ return API::PageGroupHandle::create(WTF::move(pageGroupData));
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+#if PLATFORM(COCOA)
+ case API::Object::Type::ObjCObjectGraph:
+ return m_webProcess.transformObjectsToHandles(static_cast<ObjCObjectGraph&>(object));
+#endif
+
</ins><span class="cx"> default:
</span><span class="cx"> return &object;
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>- } transformer;
</del><span class="cx">
</span><del>- return UserData::transform(object, transformer);
</del><ins>+ WebProcess& m_webProcess;
+ };
</ins><span class="cx">
</span><ins>+ return UserData::transform(object, Transformer(*this));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebProcess::setMemoryCacheDisabled(bool disabled)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebProcessh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebProcess.h (177697 => 177698)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebProcess.h 2014-12-23 22:27:11 UTC (rev 177697)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.h 2014-12-23 23:06:10 UTC (rev 177698)
</span><span class="lines">@@ -188,6 +188,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> RefPtr<API::Object> transformHandlesToObjects(API::Object*);
</span><ins>+ RefPtr<API::Object> transformObjectsToHandles(API::Object*);
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(SERVICE_CONTROLS)
</span><span class="cx"> bool hasImageServices() const { return m_hasImageServices; }
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcesscocoaWebProcessCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm (177697 => 177698)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm 2014-12-23 22:27:11 UTC (rev 177697)
+++ trunk/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm 2014-12-23 23:06:10 UTC (rev 177698)
</span><span class="lines">@@ -303,7 +303,7 @@
</span><span class="cx">
</span><span class="cx"> virtual bool shouldTransformObject(id object) const override
</span><span class="cx"> {
</span><del>- if ([object isKindOfClass:[WKBrowsingContextHandle class]])
</del><ins>+ if (dynamic_objc_cast<WKBrowsingContextHandle>(object))
</ins><span class="cx"> return true;
</span><span class="cx">
</span><span class="cx"> return false;
</span><span class="lines">@@ -311,8 +311,8 @@
</span><span class="cx">
</span><span class="cx"> virtual RetainPtr<id> transformObject(id object) const
</span><span class="cx"> {
</span><del>- if ([object isKindOfClass:[WKBrowsingContextHandle class]]) {
- if (auto* webPage = m_webProcess.webPage(((WKBrowsingContextHandle *)object)._pageID))
</del><ins>+ if (auto* handle = dynamic_objc_cast<WKBrowsingContextHandle>(object)) {
+ if (auto* webPage = m_webProcess.webPage(handle._pageID))
</ins><span class="cx"> return wrapper(*webPage);
</span><span class="cx">
</span><span class="cx"> return [NSNull null];
</span><span class="lines">@@ -332,7 +332,7 @@
</span><span class="cx"> struct Transformer final : ObjCObjectGraph::Transformer {
</span><span class="cx"> virtual bool shouldTransformObject(id object) const override
</span><span class="cx"> {
</span><del>- if ([object isKindOfClass:[WKWebProcessPlugInBrowserContextController class]])
</del><ins>+ if (dynamic_objc_cast<WKWebProcessPlugInBrowserContextController>(object))
</ins><span class="cx"> return true;
</span><span class="cx">
</span><span class="cx"> return false;
</span><span class="lines">@@ -340,8 +340,8 @@
</span><span class="cx">
</span><span class="cx"> virtual RetainPtr<id> transformObject(id object) const
</span><span class="cx"> {
</span><del>- if ([object isKindOfClass:[WKWebProcessPlugInBrowserContextController class]])
- return ((WKWebProcessPlugInBrowserContextController *)object).handle;
</del><ins>+ if (auto* controller = dynamic_objc_cast<WKWebProcessPlugInBrowserContextController>(object))
+ return controller.handle;
</ins><span class="cx">
</span><span class="cx"> return object;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>