<!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>[160148] 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/160148">160148</a></dd>
<dt>Author</dt> <dd>weinig@apple.com</dd>
<dt>Date</dt> <dd>2013-12-04 17:43:49 -0800 (Wed, 04 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Cocoa] Make WKConnection work with WKObject wrapping
https://bugs.webkit.org/show_bug.cgi?id=125266
Reviewed by Dan Bernstein.
* UIProcess/API/Cocoa/WKConnection.mm:
(-[WKConnection dealloc]):
(didReceiveMessage):
(didClose):
(setUpClient):
(-[WKConnection delegate]):
(-[WKConnection setDelegate:]):
(-[WKConnection sendMessageWithName:body:]):
(-[WKConnection remoteObjectRegistry]):
(-[WKConnection API::]):
* UIProcess/API/Cocoa/WKConnectionInternal.h:
(WebKit::wrapper):
* UIProcess/API/Cocoa/WKProcessGroup.mm:
(didCreateConnection):
* WebProcess/InjectedBundle/API/mac/WKWebProcessPlugIn.mm:
(-[WKWebProcessPlugInController _initWithPrincipalClassInstance:bundleRef:]):
(-[WKWebProcessPlugInController connection]):
(-[WKWebProcessPlugInController _bundleRef]):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKConnectionmm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKConnection.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKConnectionInternalh">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKConnectionInternal.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKProcessGroupmm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessGroup.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleAPImacWKWebProcessPlugInmm">trunk/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugIn.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (160147 => 160148)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2013-12-05 01:30:00 UTC (rev 160147)
+++ trunk/Source/WebKit2/ChangeLog 2013-12-05 01:43:49 UTC (rev 160148)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2013-12-04 Sam Weinig <sam@webkit.org>
+
+ [Cocoa] Make WKConnection work with WKObject wrapping
+ https://bugs.webkit.org/show_bug.cgi?id=125266
+
+ Reviewed by Dan Bernstein.
+
+ * UIProcess/API/Cocoa/WKConnection.mm:
+ (-[WKConnection dealloc]):
+ (didReceiveMessage):
+ (didClose):
+ (setUpClient):
+ (-[WKConnection delegate]):
+ (-[WKConnection setDelegate:]):
+ (-[WKConnection sendMessageWithName:body:]):
+ (-[WKConnection remoteObjectRegistry]):
+ (-[WKConnection API::]):
+ * UIProcess/API/Cocoa/WKConnectionInternal.h:
+ (WebKit::wrapper):
+ * UIProcess/API/Cocoa/WKProcessGroup.mm:
+ (didCreateConnection):
+ * WebProcess/InjectedBundle/API/mac/WKWebProcessPlugIn.mm:
+ (-[WKWebProcessPlugInController _initWithPrincipalClassInstance:bundleRef:]):
+ (-[WKWebProcessPlugInController connection]):
+ (-[WKWebProcessPlugInController _bundleRef]):
+
</ins><span class="cx"> 2013-12-04 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Add a WeakObjCPtr class
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKConnectionmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKConnection.mm (160147 => 160148)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKConnection.mm 2013-12-05 01:30:00 UTC (rev 160147)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKConnection.mm 2013-12-05 01:43:49 UTC (rev 160148)
</span><span class="lines">@@ -29,56 +29,38 @@
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span><span class="cx"> #import "ObjCObjectGraph.h"
</span><del>-#import "WKConnectionRef.h"
-#import "WKData.h"
</del><ins>+#import "WKRemoteObjectRegistryInternal.h"
</ins><span class="cx"> #import "WKRetainPtr.h"
</span><ins>+#import "WKSharedAPICast.h"
</ins><span class="cx"> #import "WKStringCF.h"
</span><del>-#import "WKRemoteObjectRegistryInternal.h"
</del><span class="cx"> #import <wtf/RetainPtr.h>
</span><ins>+#import <wtf/text/WTFString.h>
</ins><span class="cx">
</span><span class="cx"> using namespace WebKit;
</span><span class="cx">
</span><span class="cx"> @implementation WKConnection {
</span><del>- // Underlying connection object.
- WKRetainPtr<WKConnectionRef> _connectionRef;
-
</del><ins>+ API::ObjectStorage<WebConnection> _connection;
</ins><span class="cx"> RetainPtr<WKRemoteObjectRegistry> _remoteObjectRegistry;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+@synthesize delegate = _delegate;
+
</ins><span class="cx"> - (void)dealloc
</span><span class="cx"> {
</span><del>- WKConnectionSetConnectionClient(_connectionRef.get(), 0);
</del><ins>+ _connection->~WebConnection();
</ins><span class="cx">
</span><span class="cx"> [super dealloc];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (void)sendMessageWithName:(NSString *)messageName body:(id)messageBody
-{
- WKRetainPtr<WKStringRef> wkMessageName = adoptWK(WKStringCreateWithCFString((CFStringRef)messageName));
- RefPtr<ObjCObjectGraph> wkMessageBody = ObjCObjectGraph::create(messageBody);
-
- WKConnectionPostMessage(_connectionRef.get(), wkMessageName.get(), (WKTypeRef)wkMessageBody.get());
-}
-
-- (WKRemoteObjectRegistry *)remoteObjectRegistry
-{
- if (!_remoteObjectRegistry)
- _remoteObjectRegistry = adoptNS([[WKRemoteObjectRegistry alloc] _initWithConnectionRef:_connectionRef.get()]);
-
- return _remoteObjectRegistry.get();
-}
-
</del><span class="cx"> static void didReceiveMessage(WKConnectionRef, WKStringRef messageName, WKTypeRef messageBody, const void* clientInfo)
</span><span class="cx"> {
</span><span class="cx"> WKConnection *connection = (WKConnection *)clientInfo;
</span><del>-
</del><span class="cx"> if ([connection->_remoteObjectRegistry _handleMessageWithName:messageName body:messageBody])
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if ([connection.delegate respondsToSelector:@selector(connection:didReceiveMessageWithName:body:)]) {
</span><span class="cx"> RetainPtr<CFStringRef> nsMessageName = adoptCF(WKStringCopyCFString(kCFAllocatorDefault, messageName));
</span><span class="cx"> RetainPtr<id> nsMessageBody = ((ObjCObjectGraph*)messageBody)->rootObject();
</span><del>-
</del><span class="cx"> [connection.delegate connection:connection didReceiveMessageWithName:(NSString *)nsMessageName.get() body:nsMessageBody.get()];
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -86,37 +68,58 @@
</span><span class="cx"> static void didClose(WKConnectionRef, const void* clientInfo)
</span><span class="cx"> {
</span><span class="cx"> WKConnection *connection = (WKConnection *)clientInfo;
</span><del>- if ([connection.delegate respondsToSelector:@selector(connectionDidClose:)]) {
</del><ins>+ if ([connection.delegate respondsToSelector:@selector(connectionDidClose:)])
</ins><span class="cx"> [connection.delegate connectionDidClose:connection];
</span><del>- }
</del><span class="cx"> }
</span><span class="cx">
</span><del>-static void setUpClient(WKConnection *connection, WKConnectionRef connectionRef)
</del><ins>+static void setUpClient(WKConnection *wrapper, WebConnection& connection)
</ins><span class="cx"> {
</span><span class="cx"> WKConnectionClientV0 client;
</span><span class="cx"> memset(&client, 0, sizeof(client));
</span><span class="cx">
</span><span class="cx"> client.base.version = 0;
</span><del>- client.base.clientInfo = connection;
</del><ins>+ client.base.clientInfo = wrapper;
</ins><span class="cx"> client.didReceiveMessage = didReceiveMessage;
</span><span class="cx"> client.didClose = didClose;
</span><span class="cx">
</span><del>- WKConnectionSetConnectionClient(connectionRef, &client.base);
</del><ins>+ connection.initializeConnectionClient(&client.base);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-- (id)_initWithConnectionRef:(WKConnectionRef)connectionRef
</del><ins>+- (id <WKConnectionDelegate>)delegate
</ins><span class="cx"> {
</span><del>- self = [super init];
- if (!self)
- return nil;
</del><ins>+ return _delegate;
+}
</ins><span class="cx">
</span><del>- _connectionRef = connectionRef;
</del><ins>+- (void)setDelegate:(id <WKConnectionDelegate>)delegate
+{
+ _delegate = delegate;
+ if (_delegate)
+ setUpClient(self, *_connection);
+ else
+ _connection->initializeConnectionClient(nullptr);
+}
</ins><span class="cx">
</span><del>- setUpClient(self, _connectionRef.get());
</del><ins>+- (void)sendMessageWithName:(NSString *)messageName body:(id)messageBody
+{
+ RefPtr<ObjCObjectGraph> wkMessageBody = ObjCObjectGraph::create(messageBody);
+ _connection->postMessage(messageName, wkMessageBody.get());
+}
</ins><span class="cx">
</span><del>- return self;
</del><ins>+- (WKRemoteObjectRegistry *)remoteObjectRegistry
+{
+ if (!_remoteObjectRegistry)
+ _remoteObjectRegistry = adoptNS([[WKRemoteObjectRegistry alloc] _initWithConnectionRef:toAPI(_connection.get())]);
+
+ return _remoteObjectRegistry.get();
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+#pragma mark WKObject protocol implementation
+
+- (API::Object&)_apiObject
+{
+ return *_connection;
+}
+
</ins><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> #endif // WK_API_ENABLED
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKConnectionInternalh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKConnectionInternal.h (160147 => 160148)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKConnectionInternal.h 2013-12-05 01:30:00 UTC (rev 160147)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKConnectionInternal.h 2013-12-05 01:43:49 UTC (rev 160148)
</span><span class="lines">@@ -27,12 +27,20 @@
</span><span class="cx">
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span><del>-#import <WebKit2/WKBase.h>
</del><ins>+#import "WKObject.h"
+#import "WebConnection.h"
</ins><span class="cx">
</span><del>-@interface WKConnection ()
</del><ins>+namespace WebKit {
</ins><span class="cx">
</span><del>-- (id)_initWithConnectionRef:(WKConnectionRef)connectionRef;
</del><ins>+inline WKConnection *wrapper(WebConnection& connection)
+{
+ ASSERT([connection.wrapper() isKindOfClass:[WKConnection class]]);
+ return (WKConnection *)connection.wrapper();
+}
</ins><span class="cx">
</span><ins>+}
+
+@interface WKConnection () <WKObject>
</ins><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> #endif // WK_API_ENABLED
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKProcessGroupmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessGroup.mm (160147 => 160148)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessGroup.mm 2013-12-05 01:30:00 UTC (rev 160147)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessGroup.mm 2013-12-05 01:43:49 UTC (rev 160148)
</span><span class="lines">@@ -69,10 +69,8 @@
</span><span class="cx"> static void didCreateConnection(WKContextRef, WKConnectionRef connectionRef, const void* clientInfo)
</span><span class="cx"> {
</span><span class="cx"> WKProcessGroup *processGroup = (WKProcessGroup *)clientInfo;
</span><del>- if ([processGroup.delegate respondsToSelector:@selector(processGroup:didCreateConnectionToWebProcessPlugIn:)]) {
- RetainPtr<WKConnection> connection = adoptNS([[WKConnection alloc] _initWithConnectionRef:connectionRef]);
- [processGroup.delegate processGroup:processGroup didCreateConnectionToWebProcessPlugIn:connection.get()];
- }
</del><ins>+ if ([processGroup.delegate respondsToSelector:@selector(processGroup:didCreateConnectionToWebProcessPlugIn:)])
+ [processGroup.delegate processGroup:processGroup didCreateConnectionToWebProcessPlugIn:wrapper(*toImpl(connectionRef))];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void setUpConnectionClient(WKProcessGroup *processGroup, WKContextRef contextRef)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleAPImacWKWebProcessPlugInmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugIn.mm (160147 => 160148)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugIn.mm 2013-12-05 01:30:00 UTC (rev 160147)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugIn.mm 2013-12-05 01:43:49 UTC (rev 160148)
</span><span class="lines">@@ -36,11 +36,13 @@
</span><span class="cx"> #import "WKWebProcessPlugInBrowserContextControllerInternal.h"
</span><span class="cx"> #import <wtf/RetainPtr.h>
</span><span class="cx">
</span><ins>+using namespace WebKit;
+
</ins><span class="cx"> typedef HashMap<WKBundlePageRef, RetainPtr<WKWebProcessPlugInBrowserContextController *>> BundlePageWrapperCache;
</span><span class="cx">
</span><span class="cx"> @interface WKWebProcessPlugInController () {
</span><del>- RetainPtr<id <WKWebProcessPlugIn> > _principalClassInstance;
- WKRetainPtr<WKBundleRef> _bundleRef;
</del><ins>+ RetainPtr<id <WKWebProcessPlugIn>> _principalClassInstance;
+ RefPtr<InjectedBundle> _bundle;
</ins><span class="cx"> BundlePageWrapperCache _bundlePageWrapperCache;
</span><span class="cx"> RetainPtr<WKConnection *> _connectionWrapper;
</span><span class="cx"> }
</span><span class="lines">@@ -110,8 +112,7 @@
</span><span class="cx"> return nil;
</span><span class="cx">
</span><span class="cx"> _principalClassInstance = principalClassInstance;
</span><del>- _bundleRef = bundleRef;
- _connectionWrapper = adoptNS([[WKConnection alloc] _initWithConnectionRef:WKBundleGetApplicationConnection(_bundleRef.get())]);
</del><ins>+ _bundle = toImpl(bundleRef);
</ins><span class="cx">
</span><span class="cx"> ASSERT_WITH_MESSAGE(!sharedInstance, "WKWebProcessPlugInController initialized multiple times.");
</span><span class="cx"> sharedInstance = self;
</span><span class="lines">@@ -129,7 +130,7 @@
</span><span class="cx">
</span><span class="cx"> - (WKConnection *)connection
</span><span class="cx"> {
</span><del>- return _connectionWrapper.get();
</del><ins>+ return wrapper(*_bundle->webConnectionToUIProcess());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> @end
</span><span class="lines">@@ -138,7 +139,7 @@
</span><span class="cx">
</span><span class="cx"> - (WKBundleRef)_bundleRef
</span><span class="cx"> {
</span><del>- return _bundleRef.get();
</del><ins>+ return toAPI(_bundle.get());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> @end
</span></span></pre>
</div>
</div>
</body>
</html>