<!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>[191009] 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/191009">191009</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2015-10-13 14:56:59 -0700 (Tue, 13 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add and implement WKPageGetObjectRegistry
https://bugs.webkit.org/show_bug.cgi?id=150102
Reviewed by Tim Horton.
Put the _WKObjectRegistry used by WKPageRef and WKBrowsingContextController on the WKView for now.
If we decide to share more code between WKView and WKWebView, the object registry could live in an object that would be shared
between WKView and WKWebView.
* UIProcess/API/C/mac/WKPagePrivateMac.h:
* UIProcess/API/C/mac/WKPagePrivateMac.mm:
(WKPageGetObjectRegistry):
* UIProcess/API/Cocoa/WKBrowsingContextController.mm:
(-[WKBrowsingContextController _remoteObjectRegistry]):
(-[WKBrowsingContextController dealloc]): Deleted.
* UIProcess/API/mac/WKView.mm:
(-[WKView dealloc]):
(-[WKView _remoteObjectRegistry]):
* UIProcess/API/mac/WKViewInternal.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICmacWKPagePrivateMach">trunk/Source/WebKit2/UIProcess/API/C/mac/WKPagePrivateMac.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICmacWKPagePrivateMacmm">trunk/Source/WebKit2/UIProcess/API/C/mac/WKPagePrivateMac.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKBrowsingContextControllermm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextController.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPImacWKViewmm">trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPImacWKViewInternalh">trunk/Source/WebKit2/UIProcess/API/mac/WKViewInternal.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (191008 => 191009)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-10-13 21:46:10 UTC (rev 191008)
+++ trunk/Source/WebKit2/ChangeLog 2015-10-13 21:56:59 UTC (rev 191009)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2015-10-13 Anders Carlsson <andersca@apple.com>
+
+ Add and implement WKPageGetObjectRegistry
+ https://bugs.webkit.org/show_bug.cgi?id=150102
+
+ Reviewed by Tim Horton.
+
+ Put the _WKObjectRegistry used by WKPageRef and WKBrowsingContextController on the WKView for now.
+ If we decide to share more code between WKView and WKWebView, the object registry could live in an object that would be shared
+ between WKView and WKWebView.
+
+ * UIProcess/API/C/mac/WKPagePrivateMac.h:
+ * UIProcess/API/C/mac/WKPagePrivateMac.mm:
+ (WKPageGetObjectRegistry):
+ * UIProcess/API/Cocoa/WKBrowsingContextController.mm:
+ (-[WKBrowsingContextController _remoteObjectRegistry]):
+ (-[WKBrowsingContextController dealloc]): Deleted.
+ * UIProcess/API/mac/WKView.mm:
+ (-[WKView dealloc]):
+ (-[WKView _remoteObjectRegistry]):
+ * UIProcess/API/mac/WKViewInternal.h:
+
</ins><span class="cx"> 2015-10-13 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Avoid useless copies in range-loops that are using 'auto'
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICmacWKPagePrivateMach"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/mac/WKPagePrivateMac.h (191008 => 191009)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/mac/WKPagePrivateMac.h 2015-10-13 21:46:10 UTC (rev 191008)
+++ trunk/Source/WebKit2/UIProcess/API/C/mac/WKPagePrivateMac.h 2015-10-13 21:56:59 UTC (rev 191009)
</span><span class="lines">@@ -35,6 +35,8 @@
</span><span class="cx">
</span><span class="cx"> #ifdef __OBJC__
</span><span class="cx">
</span><ins>+@class _WKRemoteObjectRegistry;
+
</ins><span class="cx"> @protocol _WKObservablePageState
</span><span class="cx">
</span><span class="cx"> @property (nonatomic, readonly, copy) NSString *title;
</span><span class="lines">@@ -49,6 +51,7 @@
</span><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> WK_EXPORT id <_WKObservablePageState> WKPageCreateObservableState(WKPageRef page) NS_RETURNS_RETAINED;
</span><ins>+WK_EXPORT _WKRemoteObjectRegistry *WKPageGetObjectRegistry(WKPageRef page);
</ins><span class="cx">
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICmacWKPagePrivateMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/mac/WKPagePrivateMac.mm (191008 => 191009)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/mac/WKPagePrivateMac.mm 2015-10-13 21:46:10 UTC (rev 191008)
+++ trunk/Source/WebKit2/UIProcess/API/C/mac/WKPagePrivateMac.mm 2015-10-13 21:56:59 UTC (rev 191009)
</span><span class="lines">@@ -29,6 +29,7 @@
</span><span class="cx"> #import "PageLoadStateObserver.h"
</span><span class="cx"> #import "WKAPICast.h"
</span><span class="cx"> #import "WKNSURLExtras.h"
</span><ins>+#import "WKViewInternal.h"
</ins><span class="cx"> #import "WebPageGroup.h"
</span><span class="cx"> #import "WebPageProxy.h"
</span><span class="cx"> #import "WebPreferences.h"
</span><span class="lines">@@ -101,6 +102,11 @@
</span><span class="cx"> return [[WKObservablePageState alloc] initWithPage:toImpl(pageRef)];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+_WKRemoteObjectRegistry *WKPageGetObjectRegistry(WKPageRef pageRef)
+{
+ return toImpl(pageRef)->wkView()._remoteObjectRegistry;
+}
+
</ins><span class="cx"> pid_t WKPageGetProcessIdentifier(WKPageRef pageRef)
</span><span class="cx"> {
</span><span class="cx"> return toImpl(pageRef)->processIdentifier();
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKBrowsingContextControllermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextController.mm (191008 => 191009)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextController.mm 2015-10-13 21:46:10 UTC (rev 191008)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextController.mm 2015-10-13 21:56:59 UTC (rev 191009)
</span><span class="lines">@@ -51,6 +51,7 @@
</span><span class="cx"> #import "WKRetainPtr.h"
</span><span class="cx"> #import "WKURLRequestNS.h"
</span><span class="cx"> #import "WKURLResponseNS.h"
</span><ins>+#import "WKViewInternal.h"
</ins><span class="cx"> #import "WeakObjCPtr.h"
</span><span class="cx"> #import "WebCertificateInfo.h"
</span><span class="cx"> #import "WebPageProxy.h"
</span><span class="lines">@@ -79,8 +80,6 @@
</span><span class="cx">
</span><span class="cx"> WeakObjCPtr<id <WKBrowsingContextLoadDelegate>> _loadDelegate;
</span><span class="cx"> WeakObjCPtr<id <WKBrowsingContextPolicyDelegate>> _policyDelegate;
</span><del>-
- RetainPtr<_WKRemoteObjectRegistry> _remoteObjectRegistry;
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static HashMap<WebPageProxy*, WKBrowsingContextController *>& browsingContextControllerMap()
</span><span class="lines">@@ -96,11 +95,6 @@
</span><span class="cx">
</span><span class="cx"> _page->pageLoadState().removeObserver(*_pageLoadStateObserver);
</span><span class="cx">
</span><del>- if (_remoteObjectRegistry) {
- _page->process().processPool().removeMessageReceiver(Messages::RemoteObjectRegistry::messageReceiverName(), _page->pageID());
- [_remoteObjectRegistry _invalidate];
- }
-
</del><span class="cx"> [super dealloc];
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -757,12 +751,7 @@
</span><span class="cx">
</span><span class="cx"> - (_WKRemoteObjectRegistry *)_remoteObjectRegistry
</span><span class="cx"> {
</span><del>- if (!_remoteObjectRegistry) {
- _remoteObjectRegistry = adoptNS([[_WKRemoteObjectRegistry alloc] _initWithMessageSender:*_page]);
- _page->process().processPool().addMessageReceiver(Messages::RemoteObjectRegistry::messageReceiverName(), _page->pageID(), [_remoteObjectRegistry remoteObjectRegistry]);
- }
-
- return _remoteObjectRegistry.get();
</del><ins>+ return _page->wkView()._remoteObjectRegistry;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (pid_t)processIdentifier
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPImacWKViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm (191008 => 191009)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm 2015-10-13 21:46:10 UTC (rev 191008)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm 2015-10-13 21:56:59 UTC (rev 191009)
</span><span class="lines">@@ -48,6 +48,8 @@
</span><span class="cx"> #import "PageClientImpl.h"
</span><span class="cx"> #import "PasteboardTypes.h"
</span><span class="cx"> #import "RemoteLayerTreeDrawingAreaProxy.h"
</span><ins>+#import "RemoteObjectRegistry.h"
+#import "RemoteObjectRegistryMessages.h"
</ins><span class="cx"> #import "StringUtilities.h"
</span><span class="cx"> #import "TextChecker.h"
</span><span class="cx"> #import "TextCheckerState.h"
</span><span class="lines">@@ -78,6 +80,7 @@
</span><span class="cx"> #import "WebProcessPool.h"
</span><span class="cx"> #import "WebProcessProxy.h"
</span><span class="cx"> #import "WebSystemInterface.h"
</span><ins>+#import "_WKRemoteObjectRegistryInternal.h"
</ins><span class="cx"> #import "_WKThumbnailViewInternal.h"
</span><span class="cx"> #import <QuartzCore/QuartzCore.h>
</span><span class="cx"> #import <WebCore/AXObjectCache.h>
</span><span class="lines">@@ -181,6 +184,8 @@
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx"> RetainPtr<WKBrowsingContextController> _browsingContextController;
</span><span class="cx"> RetainPtr<NSView> _inspectorAttachmentView;
</span><ins>+
+ RetainPtr<_WKRemoteObjectRegistry> _remoteObjectRegistry;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> RetainPtr<NSTrackingArea> _primaryTrackingArea;
</span><span class="lines">@@ -386,6 +391,13 @@
</span><span class="cx"> #endif
</span><span class="cx"> [_data->_layoutStrategy willDestroyView:self];
</span><span class="cx">
</span><ins>+#if WK_API_ENABLED
+ if (_data->_remoteObjectRegistry) {
+ _data->_page->process().processPool().removeMessageReceiver(Messages::RemoteObjectRegistry::messageReceiverName(), _data->_page->pageID());
+ [_data->_remoteObjectRegistry _invalidate];
+ }
+#endif
+
</ins><span class="cx"> _data->_page->close();
</span><span class="cx">
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="lines">@@ -3949,6 +3961,20 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if WK_API_ENABLED
+- (_WKRemoteObjectRegistry *)_remoteObjectRegistry
+{
+ if (!_data->_remoteObjectRegistry) {
+ _data->_remoteObjectRegistry = adoptNS([[_WKRemoteObjectRegistry alloc] _initWithMessageSender:*_data->_page]);
+ _data->_page->process().processPool().addMessageReceiver(Messages::RemoteObjectRegistry::messageReceiverName(), _data->_page->pageID(), [_data->_remoteObjectRegistry remoteObjectRegistry]);
+ }
+
+ return _data->_remoteObjectRegistry.get();
+}
+
+#endif
+
+
</ins><span class="cx"> - (void)_didCommitLoadForMainFrame
</span><span class="cx"> {
</span><span class="cx"> [self _updateSupportsArbitraryLayoutModes];
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPImacWKViewInternalh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKViewInternal.h (191008 => 191009)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/mac/WKViewInternal.h 2015-10-13 21:46:10 UTC (rev 191008)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKViewInternal.h 2015-10-13 21:56:59 UTC (rev 191009)
</span><span class="lines">@@ -34,7 +34,7 @@
</span><span class="cx"> #import <wtf/RetainPtr.h>
</span><span class="cx"> #import <wtf/Vector.h>
</span><span class="cx">
</span><del>-@class WKWebViewConfiguration;
</del><ins>+@class _WKRemoteObjectRegistry;
</ins><span class="cx">
</span><span class="cx"> namespace API {
</span><span class="cx"> class Object;
</span><span class="lines">@@ -163,4 +163,8 @@
</span><span class="cx">
</span><span class="cx"> - (void)_updateSupportsArbitraryLayoutModes;
</span><span class="cx">
</span><ins>+#if WK_API_ENABLED
+@property (nonatomic, readonly) _WKRemoteObjectRegistry *_remoteObjectRegistry;
+#endif
+
</ins><span class="cx"> @end
</span></span></pre>
</div>
</div>
</body>
</html>