<!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>[160245] 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/160245">160245</a></dd>
<dt>Author</dt> <dd>mitz@apple.com</dd>
<dt>Date</dt> <dd>2013-12-06 13:40:34 -0800 (Fri, 06 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre><rdar://problem/15606872> REGRESSION (<a href="http://trac.webkit.org/projects/webkit/changeset/160148">r160148</a>): Mail throws an exception during launch
https://bugs.webkit.org/show_bug.cgi?id=125362
Reviewed by Sam Weinig.
There were two problems in how WKConnection was made to work with WKObject: first,
API::Object::newObject() was not updated to allocate the correct wrapper class, and second,
WebConnection has subclasses with additional data members, which don’t fit in the object
storage ivar.
* Shared/Cocoa/APIObject.mm:
(API::Object::newObject): Changed to allocate a WKConnection of the required size.
* UIProcess/API/Cocoa/WKConnection.mm:
Removed _connection ivar.
(-[WKConnection dealloc]): Changed to use -_connection accessor instead of ivar.
(-[WKConnection setDelegate:]): Ditto.
(-[WKConnection sendMessageWithName:body:]): Ditto.
(-[WKConnection remoteObjectRegistry]): Ditto.
(-[WKConnection _connection]): Added.
(-[WKConnection _apiObject]): Changed to return the object in the instance extra storage.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedCocoaAPIObjectmm">trunk/Source/WebKit2/Shared/Cocoa/APIObject.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKConnectionmm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKConnection.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (160244 => 160245)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2013-12-06 21:38:26 UTC (rev 160244)
+++ trunk/Source/WebKit2/ChangeLog 2013-12-06 21:40:34 UTC (rev 160245)
</span><span class="lines">@@ -1,5 +1,28 @@
</span><span class="cx"> 2013-12-06 Dan Bernstein <mitz@apple.com>
</span><span class="cx">
</span><ins>+ <rdar://problem/15606872> REGRESSION (r160148): Mail throws an exception during launch
+ https://bugs.webkit.org/show_bug.cgi?id=125362
+
+ Reviewed by Sam Weinig.
+
+ There were two problems in how WKConnection was made to work with WKObject: first,
+ API::Object::newObject() was not updated to allocate the correct wrapper class, and second,
+ WebConnection has subclasses with additional data members, which don’t fit in the object
+ storage ivar.
+
+ * Shared/Cocoa/APIObject.mm:
+ (API::Object::newObject): Changed to allocate a WKConnection of the required size.
+ * UIProcess/API/Cocoa/WKConnection.mm:
+ Removed _connection ivar.
+ (-[WKConnection dealloc]): Changed to use -_connection accessor instead of ivar.
+ (-[WKConnection setDelegate:]): Ditto.
+ (-[WKConnection sendMessageWithName:body:]): Ditto.
+ (-[WKConnection remoteObjectRegistry]): Ditto.
+ (-[WKConnection _connection]): Added.
+ (-[WKConnection _apiObject]): Changed to return the object in the instance extra storage.
+
+2013-12-06 Dan Bernstein <mitz@apple.com>
+
</ins><span class="cx"> [Cocoa] Add load delegate methods for responding to authentication challenges
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=125333
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedCocoaAPIObjectmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/Cocoa/APIObject.mm (160244 => 160245)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/Cocoa/APIObject.mm 2013-12-06 21:38:26 UTC (rev 160244)
+++ trunk/Source/WebKit2/Shared/Cocoa/APIObject.mm 2013-12-06 21:40:34 UTC (rev 160245)
</span><span class="lines">@@ -33,6 +33,7 @@
</span><span class="cx"> #import "WKBrowsingContextControllerInternal.h"
</span><span class="cx"> #import "WKBrowsingContextGroupInternal.h"
</span><span class="cx"> #import "WKNSArray.h"
</span><ins>+#import "WKConnectionInternal.h"
</ins><span class="cx"> #import "WKNSDictionary.h"
</span><span class="cx"> #import "WKNSError.h"
</span><span class="cx"> #import "WKNSString.h"
</span><span class="lines">@@ -79,6 +80,10 @@
</span><span class="cx"> wrapper = [WKBackForwardListItem alloc];
</span><span class="cx"> break;
</span><span class="cx">
</span><ins>+ case Type::Connection:
+ wrapper = NSAllocateObject([WKConnection self], size, nullptr);
+ break;
+
</ins><span class="cx"> case Type::Context:
</span><span class="cx"> wrapper = [WKProcessGroup alloc];
</span><span class="cx"> break;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKConnectionmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKConnection.mm (160244 => 160245)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKConnection.mm 2013-12-06 21:38:26 UTC (rev 160244)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKConnection.mm 2013-12-06 21:40:34 UTC (rev 160245)
</span><span class="lines">@@ -40,15 +40,13 @@
</span><span class="cx"> using namespace WebKit;
</span><span class="cx">
</span><span class="cx"> @implementation WKConnection {
</span><del>- API::ObjectStorage<WebConnection> _connection;
</del><span class="cx"> RetainPtr<WKRemoteObjectRegistry> _remoteObjectRegistry;
</span><del>-
</del><span class="cx"> WeakObjCPtr<id <WKConnectionDelegate>> _delegate;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)dealloc
</span><span class="cx"> {
</span><del>- _connection->~WebConnection();
</del><ins>+ self._connection.~WebConnection();
</ins><span class="cx">
</span><span class="cx"> [super dealloc];
</span><span class="cx"> }
</span><span class="lines">@@ -98,30 +96,35 @@
</span><span class="cx"> {
</span><span class="cx"> _delegate = delegate;
</span><span class="cx"> if (delegate)
</span><del>- setUpClient(self, *_connection);
</del><ins>+ setUpClient(self, self._connection);
</ins><span class="cx"> else
</span><del>- _connection->initializeConnectionClient(nullptr);
</del><ins>+ self._connection.initializeConnectionClient(nullptr);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)sendMessageWithName:(NSString *)messageName body:(id)messageBody
</span><span class="cx"> {
</span><span class="cx"> RefPtr<ObjCObjectGraph> wkMessageBody = ObjCObjectGraph::create(messageBody);
</span><del>- _connection->postMessage(messageName, wkMessageBody.get());
</del><ins>+ self._connection.postMessage(messageName, wkMessageBody.get());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (WKRemoteObjectRegistry *)remoteObjectRegistry
</span><span class="cx"> {
</span><span class="cx"> if (!_remoteObjectRegistry)
</span><del>- _remoteObjectRegistry = adoptNS([[WKRemoteObjectRegistry alloc] _initWithConnectionRef:toAPI(_connection.get())]);
</del><ins>+ _remoteObjectRegistry = adoptNS([[WKRemoteObjectRegistry alloc] _initWithConnectionRef:toAPI(&self._connection)]);
</ins><span class="cx">
</span><span class="cx"> return _remoteObjectRegistry.get();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (WebConnection&)_connection
+{
+ return *static_cast<WebConnection*>(object_getIndexedIvars(self));
+}
+
</ins><span class="cx"> #pragma mark WKObject protocol implementation
</span><span class="cx">
</span><span class="cx"> - (API::Object&)_apiObject
</span><span class="cx"> {
</span><del>- return *_connection;
</del><ins>+ return *static_cast<API::Object*>(object_getIndexedIvars(self));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> @end
</span></span></pre>
</div>
</div>
</body>
</html>