<!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>[177709] 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/177709">177709</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-12-23 17:01:18 -0800 (Tue, 23 Dec 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Handle coding object graphs in the UI process
https://bugs.webkit.org/show_bug.cgi?id=139925
Reviewed by Sam Weinig.
* UIProcess/Cocoa/WebProcessProxyCocoa.mm: Added.
(WebKit::WebProcessProxy::transformHandlesToObjects):
(WebKit::WebProcessProxy::transformObjectsToHandles):
* UIProcess/WebProcessProxy.cpp:
(WebKit::WebProcessProxy::transformHandlesToObjects):
(WebKit::WebProcessProxy::transformObjectsToHandles):
* UIProcess/WebProcessProxy.h:
* WebKit2.xcodeproj/project.pbxproj:
* WebProcess/WebProcess.cpp:
(WebKit::WebProcess::transformObjectsToHandles):
* WebProcess/WebProcess.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebProcessProxycpp">trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebProcessProxyh">trunk/Source/WebKit2/UIProcess/WebProcessProxy.h</a></li>
<li><a href="#trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj">trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj</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>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2UIProcessCocoaWebProcessProxyCocoamm">trunk/Source/WebKit2/UIProcess/Cocoa/WebProcessProxyCocoa.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (177708 => 177709)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-12-24 01:00:20 UTC (rev 177708)
+++ trunk/Source/WebKit2/ChangeLog 2014-12-24 01:01:18 UTC (rev 177709)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2014-12-23 Anders Carlsson <andersca@apple.com>
+
+ Handle coding object graphs in the UI process
+ https://bugs.webkit.org/show_bug.cgi?id=139925
+
+ Reviewed by Sam Weinig.
+
+ * UIProcess/Cocoa/WebProcessProxyCocoa.mm: Added.
+ (WebKit::WebProcessProxy::transformHandlesToObjects):
+ (WebKit::WebProcessProxy::transformObjectsToHandles):
+ * UIProcess/WebProcessProxy.cpp:
+ (WebKit::WebProcessProxy::transformHandlesToObjects):
+ (WebKit::WebProcessProxy::transformObjectsToHandles):
+ * UIProcess/WebProcessProxy.h:
+ * WebKit2.xcodeproj/project.pbxproj:
+ * WebProcess/WebProcess.cpp:
+ (WebKit::WebProcess::transformObjectsToHandles):
+ * WebProcess/WebProcess.h:
+
</ins><span class="cx"> 2014-12-23 Sam Weinig <sam@webkit.org>
</span><span class="cx">
</span><span class="cx"> ContextMenuContextData should store a ShareableBitmap not a ShareableBitmap::Handle
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessCocoaWebProcessProxyCocoamm"></a>
<div class="addfile"><h4>Added: trunk/Source/WebKit2/UIProcess/Cocoa/WebProcessProxyCocoa.mm (0 => 177709)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Cocoa/WebProcessProxyCocoa.mm (rev 0)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/WebProcessProxyCocoa.mm 2014-12-24 01:01:18 UTC (rev 177709)
</span><span class="lines">@@ -0,0 +1,96 @@
</span><ins>+/*
+ * Copyright (C) 2014 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#import "config.h"
+#import "WebProcessProxy.h"
+
+#import "ObjCObjectGraph.h"
+#import "WKBrowsingContextControllerInternal.h"
+#import "WKBrowsingContextHandleInternal.h"
+
+namespace WebKit {
+
+RefPtr<ObjCObjectGraph> WebProcessProxy::transformHandlesToObjects(ObjCObjectGraph& objectGraph)
+{
+ struct Transformer final : ObjCObjectGraph::Transformer {
+ Transformer(WebProcessProxy& webProcessProxy)
+ : m_webProcessProxy(webProcessProxy)
+ {
+ }
+
+ virtual bool shouldTransformObject(id object) const override
+ {
+#if WK_API_ENABLED
+ if (dynamic_objc_cast<WKBrowsingContextHandle>(object))
+ return true;
+#endif
+ return false;
+ }
+
+ virtual RetainPtr<id> transformObject(id object) const
+ {
+#if WK_API_ENABLED
+ if (auto* handle = dynamic_objc_cast<WKBrowsingContextHandle>(object)) {
+ if (auto* webPageProxy = m_webProcessProxy.webPage(handle.pageID))
+ return [WKBrowsingContextController _browsingContextControllerForPageRef:toAPI(webPageProxy)];
+
+ return [NSNull null];
+ }
+#endif
+ return object;
+ }
+
+ WebProcessProxy& m_webProcessProxy;
+ };
+
+ return ObjCObjectGraph::create(ObjCObjectGraph::transform(objectGraph.rootObject(), Transformer(*this)).get());
+}
+
+RefPtr<ObjCObjectGraph> WebProcessProxy::transformObjectsToHandles(ObjCObjectGraph& objectGraph)
+{
+ struct Transformer final : ObjCObjectGraph::Transformer {
+ virtual bool shouldTransformObject(id object) const override
+ {
+#if WK_API_ENABLED
+ if (dynamic_objc_cast<WKBrowsingContextController>(object))
+ return true;
+#endif
+ return false;
+ }
+
+ virtual RetainPtr<id> transformObject(id object) const
+ {
+#if WK_API_ENABLED
+ if (auto* controller = dynamic_objc_cast<WKBrowsingContextController>(object))
+ return controller.handle;
+#endif
+ return object;
+ }
+ };
+
+ return ObjCObjectGraph::create(ObjCObjectGraph::transform(objectGraph.rootObject(), Transformer()).get());
+}
+
+}
</ins></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebProcessProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp (177708 => 177709)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp 2014-12-24 01:00:20 UTC (rev 177708)
+++ trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp 2014-12-24 01:01:18 UTC (rev 177709)
</span><span class="lines">@@ -57,6 +57,7 @@
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(COCOA)
</span><ins>+#include "ObjCObjectGraph.h"
</ins><span class="cx"> #include "PDFPlugin.h"
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -664,6 +665,9 @@
</span><span class="cx"> case API::Object::Type::FrameHandle:
</span><span class="cx"> case API::Object::Type::PageHandle:
</span><span class="cx"> case API::Object::Type::PageGroupHandle:
</span><ins>+#if PLATFORM(COCOA)
+ case API::Object::Type::ObjCObjectGraph:
+#endif
</ins><span class="cx"> return true;
</span><span class="cx">
</span><span class="cx"> default:
</span><span class="lines">@@ -683,6 +687,10 @@
</span><span class="cx"> case API::Object::Type::PageHandle:
</span><span class="cx"> return m_webProcessProxy.webPage(static_cast<API::PageHandle&>(object).pageID());
</span><span class="cx">
</span><ins>+#if PLATFORM(COCOA)
+ case API::Object::Type::ObjCObjectGraph:
+ return m_webProcessProxy.transformHandlesToObjects(static_cast<ObjCObjectGraph&>(object));;
+#endif
</ins><span class="cx"> default:
</span><span class="cx"> return &object;
</span><span class="cx"> }
</span><span class="lines">@@ -703,6 +711,9 @@
</span><span class="cx"> case API::Object::Type::Frame:
</span><span class="cx"> case API::Object::Type::Page:
</span><span class="cx"> case API::Object::Type::PageGroup:
</span><ins>+#if PLATFORM(COCOA)
+ case API::Object::Type::ObjCObjectGraph:
+#endif
</ins><span class="cx"> return true;
</span><span class="cx">
</span><span class="cx"> default:
</span><span class="lines">@@ -722,13 +733,18 @@
</span><span class="cx"> case API::Object::Type::PageGroup:
</span><span class="cx"> return API::PageGroupHandle::create(WebPageGroupData(static_cast<const WebPageGroup&>(object).data()));
</span><span class="cx">
</span><ins>+#if PLATFORM(COCOA)
+ case API::Object::Type::ObjCObjectGraph:
+ return 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><ins>+ };
</ins><span class="cx">
</span><del>- return UserData::transform(object, transformer);
</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="trunkSourceWebKit2UIProcessWebProcessProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebProcessProxy.h (177708 => 177709)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebProcessProxy.h 2014-12-24 01:00:20 UTC (rev 177708)
+++ trunk/Source/WebKit2/UIProcess/WebProcessProxy.h 2014-12-24 01:01:18 UTC (rev 177709)
</span><span class="lines">@@ -127,8 +127,13 @@
</span><span class="cx"> void requestTermination();
</span><span class="cx">
</span><span class="cx"> RefPtr<API::Object> transformHandlesToObjects(API::Object*);
</span><del>- RefPtr<API::Object> transformObjectsToHandles(API::Object*);
</del><ins>+ static RefPtr<API::Object> transformObjectsToHandles(API::Object*);
</ins><span class="cx">
</span><ins>+#if PLATFORM(COCOA)
+ RefPtr<ObjCObjectGraph> transformHandlesToObjects(ObjCObjectGraph&);
+ static RefPtr<ObjCObjectGraph> transformObjectsToHandles(ObjCObjectGraph&);
+#endif
+
</ins><span class="cx"> void windowServerConnectionStateChanged();
</span><span class="cx">
</span><span class="cx"> void sendProcessWillSuspend();
</span></span></pre></div>
<a id="trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (177708 => 177709)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2014-12-24 01:00:20 UTC (rev 177708)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2014-12-24 01:01:18 UTC (rev 177709)
</span><span class="lines">@@ -136,6 +136,7 @@
</span><span class="cx"> 1A043DC2124FF87500FFBFB5 /* PluginProxy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A043DC0124FF87500FFBFB5 /* PluginProxy.cpp */; };
</span><span class="cx"> 1A043F6912514D8B00FFBFB5 /* WebProcessConnectionMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A043F6712514D8B00FFBFB5 /* WebProcessConnectionMessageReceiver.cpp */; };
</span><span class="cx"> 1A043F6A12514D8B00FFBFB5 /* WebProcessConnectionMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A043F6812514D8B00FFBFB5 /* WebProcessConnectionMessages.h */; };
</span><ins>+ 1A04F6191A4A3A7A00A21B6E /* WebProcessProxyCocoa.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A04F6171A4A3A7A00A21B6E /* WebProcessProxyCocoa.mm */; };
</ins><span class="cx"> 1A07D2F81919B3A900ECDA16 /* __init__.py in Copy Message Generation Scripts */ = {isa = PBXBuildFile; fileRef = 0FC0856E187CE0A900780D86 /* __init__.py */; };
</span><span class="cx"> 1A07D2F91919B3A900ECDA16 /* messages.py in Copy Message Generation Scripts */ = {isa = PBXBuildFile; fileRef = 0FC0856F187CE0A900780D86 /* messages.py */; };
</span><span class="cx"> 1A07D2FA1919B3A900ECDA16 /* model.py in Copy Message Generation Scripts */ = {isa = PBXBuildFile; fileRef = 0FC08570187CE0A900780D86 /* model.py */; };
</span><span class="lines">@@ -2116,6 +2117,7 @@
</span><span class="cx"> 1A043F5912514CF300FFBFB5 /* WebProcessConnection.messages.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = WebProcessConnection.messages.in; sourceTree = "<group>"; };
</span><span class="cx"> 1A043F6712514D8B00FFBFB5 /* WebProcessConnectionMessageReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebProcessConnectionMessageReceiver.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 1A043F6812514D8B00FFBFB5 /* WebProcessConnectionMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebProcessConnectionMessages.h; sourceTree = "<group>"; };
</span><ins>+ 1A04F6171A4A3A7A00A21B6E /* WebProcessProxyCocoa.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebProcessProxyCocoa.mm; sourceTree = "<group>"; };
</ins><span class="cx"> 1A0EC601124A9F2C007EF4A5 /* PluginProcessManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PluginProcessManager.h; sourceTree = "<group>"; };
</span><span class="cx"> 1A0EC602124A9F2C007EF4A5 /* PluginProcessManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PluginProcessManager.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 1A0EC6B1124BBD36007EF4A5 /* PluginProcess.messages.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = PluginProcess.messages.in; sourceTree = "<group>"; };
</span><span class="lines">@@ -4681,6 +4683,7 @@
</span><span class="cx"> 1AFE436318B6C081009C7A48 /* UIDelegate.mm */,
</span><span class="cx"> 1AC0273E196622D600C12B75 /* WebPageProxyCocoa.mm */,
</span><span class="cx"> 7CE4D2151A49148400C7F152 /* WebProcessPoolCocoa.mm */,
</span><ins>+ 1A04F6171A4A3A7A00A21B6E /* WebProcessProxyCocoa.mm */,
</ins><span class="cx"> 1AD01BCB1905D54900C9C45F /* WKReloadFrameErrorRecoveryAttempter.h */,
</span><span class="cx"> 1AD01BCA1905D54900C9C45F /* WKReloadFrameErrorRecoveryAttempter.mm */,
</span><span class="cx"> 2D7AAFD218C8640600A7ACD4 /* WKWebViewContentProvider.h */,
</span><span class="lines">@@ -9247,6 +9250,7 @@
</span><span class="cx"> 2D819BA11862800E001F03D1 /* ViewGestureGeometryCollectorMessageReceiver.cpp in Sources */,
</span><span class="cx"> 2D6CD11A189058A500E5A4A0 /* ViewSnapshotStore.mm in Sources */,
</span><span class="cx"> 2684054F18B86C8E0022C38B /* ViewUpdateDispatcher.cpp in Sources */,
</span><ins>+ 1A04F6191A4A3A7A00A21B6E /* WebProcessProxyCocoa.mm in Sources */,
</ins><span class="cx"> 2684055218B86ED60022C38B /* ViewUpdateDispatcherMessageReceiver.cpp in Sources */,
</span><span class="cx"> 2684054C18B86C350022C38B /* VisibleContentRectUpdateInfo.cpp in Sources */,
</span><span class="cx"> 1A0F29E3120B44420053D1B9 /* VisitedLinkProvider.cpp in Sources */,
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebProcesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebProcess.cpp (177708 => 177709)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2014-12-24 01:00:20 UTC (rev 177708)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2014-12-24 01:01:18 UTC (rev 177709)
</span><span class="lines">@@ -1281,11 +1281,6 @@
</span><span class="cx"> RefPtr<API::Object> WebProcess::transformObjectsToHandles(API::Object* object)
</span><span class="cx"> {
</span><span class="cx"> struct Transformer final : UserData::Transformer {
</span><del>- Transformer(WebProcess& webProcess)
- : m_webProcess(webProcess)
- {
- }
-
</del><span class="cx"> virtual bool shouldTransformObjectOfType(API::Object::Type type) const override
</span><span class="cx"> {
</span><span class="cx"> switch (type) {
</span><span class="lines">@@ -1320,18 +1315,16 @@
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> case API::Object::Type::ObjCObjectGraph:
</span><del>- return m_webProcess.transformObjectsToHandles(static_cast<ObjCObjectGraph&>(object));
</del><ins>+ return transformObjectsToHandles(static_cast<ObjCObjectGraph&>(object));
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> default:
</span><span class="cx"> return &object;
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-
- WebProcess& m_webProcess;
</del><span class="cx"> };
</span><span class="cx">
</span><del>- return UserData::transform(object, Transformer(*this));
</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>
<a id="trunkSourceWebKit2WebProcessWebProcessh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebProcess.h (177708 => 177709)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebProcess.h 2014-12-24 01:00:20 UTC (rev 177708)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.h 2014-12-24 01:01:18 UTC (rev 177709)
</span><span class="lines">@@ -188,8 +188,13 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> RefPtr<API::Object> transformHandlesToObjects(API::Object*);
</span><del>- RefPtr<API::Object> transformObjectsToHandles(API::Object*);
</del><ins>+ static RefPtr<API::Object> transformObjectsToHandles(API::Object*);
</ins><span class="cx">
</span><ins>+#if PLATFORM(COCOA)
+ RefPtr<ObjCObjectGraph> transformHandlesToObjects(ObjCObjectGraph&);
+ static RefPtr<ObjCObjectGraph> transformObjectsToHandles(ObjCObjectGraph&);
+#endif
+
</ins><span class="cx"> #if ENABLE(SERVICE_CONTROLS)
</span><span class="cx"> bool hasImageServices() const { return m_hasImageServices; }
</span><span class="cx"> bool hasSelectionServices() const { return m_hasSelectionServices; }
</span><span class="lines">@@ -276,11 +281,6 @@
</span><span class="cx"> virtual void stopRunLoop() override;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(COCOA)
- RefPtr<ObjCObjectGraph> transformHandlesToObjects(ObjCObjectGraph&);
- RefPtr<ObjCObjectGraph> transformObjectsToHandles(ObjCObjectGraph&);
-#endif
-
</del><span class="cx"> void platformInitializeProcess(const ChildProcessInitializationParameters&);
</span><span class="cx">
</span><span class="cx"> // IPC::Connection::Client
</span></span></pre>
</div>
</div>
</body>
</html>