<!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>[162719] 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/162719">162719</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-01-24 13:25:23 -0800 (Fri, 24 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use a side table to map WebPageProxy objects to WKBrowsingContextController objects
https://bugs.webkit.org/show_bug.cgi?id=127577
Reviewed by Tim Horton.
* UIProcess/API/Cocoa/WKBrowsingContextController.mm:
(browsingContextControllerMap):
(-[WKBrowsingContextController dealloc]):
(-[WKBrowsingContextController _initWithPageRef:]):
(+[WKBrowsingContextController _browsingContextControllerForPageRef:]):
* UIProcess/API/Cocoa/WKBrowsingContextControllerInternal.h:
* UIProcess/WebPageProxy.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKBrowsingContextControllermm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextController.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKBrowsingContextControllerInternalh">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextControllerInternal.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxyh">trunk/Source/WebKit2/UIProcess/WebPageProxy.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (162718 => 162719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-01-24 21:23:17 UTC (rev 162718)
+++ trunk/Source/WebKit2/ChangeLog 2014-01-24 21:25:23 UTC (rev 162719)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2014-01-24 Anders Carlsson <andersca@apple.com>
+
+ Use a side table to map WebPageProxy objects to WKBrowsingContextController objects
+ https://bugs.webkit.org/show_bug.cgi?id=127577
+
+ Reviewed by Tim Horton.
+
+ * UIProcess/API/Cocoa/WKBrowsingContextController.mm:
+ (browsingContextControllerMap):
+ (-[WKBrowsingContextController dealloc]):
+ (-[WKBrowsingContextController _initWithPageRef:]):
+ (+[WKBrowsingContextController _browsingContextControllerForPageRef:]):
+ * UIProcess/API/Cocoa/WKBrowsingContextControllerInternal.h:
+ * UIProcess/WebPageProxy.h:
+
</ins><span class="cx"> 2014-01-24 Tim Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> iOS build fix after r162710.
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKBrowsingContextControllermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextController.mm (162718 => 162719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextController.mm 2014-01-24 21:23:17 UTC (rev 162718)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextController.mm 2014-01-24 21:25:23 UTC (rev 162719)
</span><span class="lines">@@ -58,6 +58,7 @@
</span><span class="cx"> #import "WebCertificateInfo.h"
</span><span class="cx"> #import "WebContext.h"
</span><span class="cx"> #import "WebPageProxy.h"
</span><ins>+#import <wtf/NeverDestroyed.h>
</ins><span class="cx">
</span><span class="cx"> using namespace WebCore;
</span><span class="cx"> using namespace WebKit;
</span><span class="lines">@@ -149,10 +150,18 @@
</span><span class="cx"> RetainPtr<WKRemoteObjectRegistry> _remoteObjectRegistry;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static HashMap<WebPageProxy*, WKBrowsingContextController *>& browsingContextControllerMap()
+{
+ static NeverDestroyed<HashMap<WebPageProxy*, WKBrowsingContextController *>> browsingContextControllerMap;
+ return browsingContextControllerMap;
+}
+
</ins><span class="cx"> - (void)dealloc
</span><span class="cx"> {
</span><ins>+ ASSERT(browsingContextControllerMap().get(_page.get()) == self);
+ browsingContextControllerMap().remove(_page.get());
+
</ins><span class="cx"> _page->pageLoadState().removeObserver(*_pageLoadStateObserver);
</span><del>- _page->~WebPageProxy();
</del><span class="cx">
</span><span class="cx"> [_remoteObjectRegistry _invalidate];
</span><span class="cx">
</span><span class="lines">@@ -785,13 +794,7 @@
</span><span class="cx"> return YES;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#pragma mark WKObject protocol implementation
</del><span class="cx">
</span><del>-- (API::Object&)_apiObject
-{
- return *reinterpret_cast<API::Object*>(&_page);
-}
-
</del><span class="cx"> - (instancetype)_initWithPageRef:(WKPageRef)pageRef
</span><span class="cx"> {
</span><span class="cx"> if (!(self = [super init]))
</span><span class="lines">@@ -802,12 +805,15 @@
</span><span class="cx"> _pageLoadStateObserver = std::make_unique<PageLoadStateObserver>(self);
</span><span class="cx"> _page->pageLoadState().addObserver(*_pageLoadStateObserver);
</span><span class="cx">
</span><ins>+ ASSERT(!browsingContextControllerMap().contains(_page.get()));
+ browsingContextControllerMap().set(_page.get(), self);
+
</ins><span class="cx"> return self;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> + (WKBrowsingContextController *)_browsingContextControllerForPageRef:(WKPageRef)pageRef
</span><span class="cx"> {
</span><del>- return (WKBrowsingContextController *)static_cast<const WebLoaderClient*>(WebKit::toImpl(pageRef)->loaderClient())->client().base.clientInfo;
</del><ins>+ return browsingContextControllerMap().get(toImpl(pageRef));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> @end
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKBrowsingContextControllerInternalh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextControllerInternal.h (162718 => 162719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextControllerInternal.h 2014-01-24 21:23:17 UTC (rev 162718)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextControllerInternal.h 2014-01-24 21:25:23 UTC (rev 162719)
</span><span class="lines">@@ -27,11 +27,10 @@
</span><span class="cx">
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span><del>-#import "WKObject.h"
</del><span class="cx"> #import "WeakObjCPtr.h"
</span><span class="cx"> #import "WebPageProxy.h"
</span><span class="cx">
</span><del>-@interface WKBrowsingContextController () <WKObject> {
</del><ins>+@interface WKBrowsingContextController () {
</ins><span class="cx"> @package
</span><span class="cx"> WebKit::WeakObjCPtr<id <WKBrowsingContextHistoryDelegate>> _historyDelegate;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (162718 => 162719)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2014-01-24 21:23:17 UTC (rev 162718)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2014-01-24 21:25:23 UTC (rev 162719)
</span><span class="lines">@@ -834,8 +834,6 @@
</span><span class="cx"> void endColorPicker();
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- const API::LoaderClient* loaderClient() { return m_loaderClient.get(); }
-
</del><span class="cx"> WebCore::IntSize minimumLayoutSize() const { return m_minimumLayoutSize; }
</span><span class="cx"> void setMinimumLayoutSize(const WebCore::IntSize&);
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>