<!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>[178385] 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/178385">178385</a></dd>
<dt>Author</dt> <dd>weinig@apple.com</dd>
<dt>Date</dt> <dd>2015-01-13 15:35:20 -0800 (Tue, 13 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Convert WebUserContentControllerProxy to an API::Object bridged to WKUserContentController
https://bugs.webkit.org/show_bug.cgi?id=140414
Reviewed by Dan Bernstein.
* Shared/API/APIObject.h:
Add Type::UserContentController.
* Shared/Cocoa/APIObject.mm:
(API::Object::newObject):
Allocate WebUserContentControllerProxy using [WKUserContentController alloc].
* UIProcess/API/Cocoa/WKUserContentController.mm:
(-[WKUserContentController init]):
(-[WKUserContentController dealloc]):
(-[WKUserContentController _apiObject]):
* UIProcess/API/Cocoa/WKUserContentControllerInternal.h:
(WebKit::wrapper):
Convert to using API::ObjectStorage for the internal WebUserContentControllerProxy.
* UIProcess/UserContent/WebUserContentControllerProxy.cpp:
(WebKit::WebUserContentControllerProxy::create): Deleted.
* UIProcess/UserContent/WebUserContentControllerProxy.h:
Convert to inherit from API::ObjectImpl<> and remove create function.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedAPIAPIObjecth">trunk/Source/WebKit2/Shared/API/APIObject.h</a></li>
<li><a href="#trunkSourceWebKit2SharedCocoaAPIObjectmm">trunk/Source/WebKit2/Shared/Cocoa/APIObject.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKUserContentControllermm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKUserContentController.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKUserContentControllerInternalh">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKUserContentControllerInternal.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessUserContentWebUserContentControllerProxycpp">trunk/Source/WebKit2/UIProcess/UserContent/WebUserContentControllerProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessUserContentWebUserContentControllerProxyh">trunk/Source/WebKit2/UIProcess/UserContent/WebUserContentControllerProxy.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (178384 => 178385)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-01-13 23:35:05 UTC (rev 178384)
+++ trunk/Source/WebKit2/ChangeLog 2015-01-13 23:35:20 UTC (rev 178385)
</span><span class="lines">@@ -1,3 +1,30 @@
</span><ins>+2015-01-13 Sam Weinig <sam@webkit.org>
+
+ Convert WebUserContentControllerProxy to an API::Object bridged to WKUserContentController
+ https://bugs.webkit.org/show_bug.cgi?id=140414
+
+ Reviewed by Dan Bernstein.
+
+ * Shared/API/APIObject.h:
+ Add Type::UserContentController.
+
+ * Shared/Cocoa/APIObject.mm:
+ (API::Object::newObject):
+ Allocate WebUserContentControllerProxy using [WKUserContentController alloc].
+
+ * UIProcess/API/Cocoa/WKUserContentController.mm:
+ (-[WKUserContentController init]):
+ (-[WKUserContentController dealloc]):
+ (-[WKUserContentController _apiObject]):
+ * UIProcess/API/Cocoa/WKUserContentControllerInternal.h:
+ (WebKit::wrapper):
+ Convert to using API::ObjectStorage for the internal WebUserContentControllerProxy.
+
+ * UIProcess/UserContent/WebUserContentControllerProxy.cpp:
+ (WebKit::WebUserContentControllerProxy::create): Deleted.
+ * UIProcess/UserContent/WebUserContentControllerProxy.h:
+ Convert to inherit from API::ObjectImpl<> and remove create function.
+
</ins><span class="cx"> 2015-01-13 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Stub out more of the process lifetime tracker code
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIAPIObjecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/API/APIObject.h (178384 => 178385)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/API/APIObject.h 2015-01-13 23:35:05 UTC (rev 178384)
+++ trunk/Source/WebKit2/Shared/API/APIObject.h 2015-01-13 23:35:20 UTC (rev 178385)
</span><span class="lines">@@ -134,6 +134,7 @@
</span><span class="cx"> Preferences,
</span><span class="cx"> Session,
</span><span class="cx"> TextChecker,
</span><ins>+ UserContentController,
</ins><span class="cx"> UserMediaPermissionRequest,
</span><span class="cx"> Vibration,
</span><span class="cx"> ViewportAttributes,
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedCocoaAPIObjectmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/Cocoa/APIObject.mm (178384 => 178385)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/Cocoa/APIObject.mm 2015-01-13 23:35:05 UTC (rev 178384)
+++ trunk/Source/WebKit2/Shared/Cocoa/APIObject.mm 2015-01-13 23:35:20 UTC (rev 178385)
</span><span class="lines">@@ -44,6 +44,7 @@
</span><span class="cx"> #import "WKNavigationDataInternal.h"
</span><span class="cx"> #import "WKNavigationInternal.h"
</span><span class="cx"> #import "WKProcessPoolInternal.h"
</span><ins>+#import "WKUserContentControllerInternal.h"
</ins><span class="cx"> #import "WKWebProcessPlugInBrowserContextControllerInternal.h"
</span><span class="cx"> #import "WKWebProcessPlugInFrameInternal.h"
</span><span class="cx"> #import "WKWebProcessPlugInHitTestResultInternal.h"
</span><span class="lines">@@ -153,6 +154,10 @@
</span><span class="cx"> wrapper = NSAllocateObject([WKNSURLRequest class], size, nullptr);
</span><span class="cx"> break;
</span><span class="cx">
</span><ins>+ case Type::UserContentController:
+ wrapper = [WKUserContentController alloc];
+ break;
+
</ins><span class="cx"> case Type::WebsiteDataStore:
</span><span class="cx"> wrapper = [_WKWebsiteDataStore alloc];
</span><span class="cx"> break;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKUserContentControllermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKUserContentController.mm (178384 => 178385)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKUserContentController.mm 2015-01-13 23:35:05 UTC (rev 178384)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKUserContentController.mm 2015-01-13 23:35:20 UTC (rev 178385)
</span><span class="lines">@@ -50,12 +50,19 @@
</span><span class="cx"> if (!(self = [super init]))
</span><span class="cx"> return nil;
</span><span class="cx">
</span><del>- _userContentControllerProxy = WebKit::WebUserContentControllerProxy::create();
</del><ins>+ API::Object::constructInWrapper<WebKit::WebUserContentControllerProxy>(self);
</ins><span class="cx"> _userScripts = adoptNS([[NSMutableArray alloc] init]);
</span><span class="cx">
</span><span class="cx"> return self;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (void)dealloc
+{
+ _userContentControllerProxy->~WebUserContentControllerProxy();
+
+ [super dealloc];
+}
+
</ins><span class="cx"> - (NSArray *)userScripts
</span><span class="cx"> {
</span><span class="cx"> return _userScripts.get();
</span><span class="lines">@@ -135,6 +142,13 @@
</span><span class="cx"> _userContentControllerProxy->removeUserMessageHandlerForName(name);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#pragma mark WKObject protocol implementation
+
+- (API::Object&)_apiObject
+{
+ return *_userContentControllerProxy;
+}
+
</ins><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKUserContentControllerInternalh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKUserContentControllerInternal.h (178384 => 178385)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKUserContentControllerInternal.h 2015-01-13 23:35:05 UTC (rev 178384)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKUserContentControllerInternal.h 2015-01-13 23:35:20 UTC (rev 178385)
</span><span class="lines">@@ -27,15 +27,24 @@
</span><span class="cx">
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span><del>-#import <wtf/RefPtr.h>
</del><ins>+#import "WKObject.h"
+#import "WebUserContentControllerProxy.h"
</ins><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><ins>+
</ins><span class="cx"> class WebUserContentControllerProxy;
</span><ins>+
+inline WKUserContentController *wrapper(WebUserContentControllerProxy& userContentController)
+{
+ ASSERT([userContentController.wrapper() isKindOfClass:[WKUserContentController class]]);
+ return (WKUserContentController *)userContentController.wrapper();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-@interface WKUserContentController () {
</del><ins>+}
+
+@interface WKUserContentController () <WKObject> {
</ins><span class="cx"> @package
</span><del>- RefPtr<WebKit::WebUserContentControllerProxy> _userContentControllerProxy;
</del><ins>+ API::ObjectStorage<WebKit::WebUserContentControllerProxy> _userContentControllerProxy;
</ins><span class="cx"> }
</span><span class="cx"> @end
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessUserContentWebUserContentControllerProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/UserContent/WebUserContentControllerProxy.cpp (178384 => 178385)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/UserContent/WebUserContentControllerProxy.cpp 2015-01-13 23:35:05 UTC (rev 178384)
+++ trunk/Source/WebKit2/UIProcess/UserContent/WebUserContentControllerProxy.cpp 2015-01-13 23:35:20 UTC (rev 178385)
</span><span class="lines">@@ -42,11 +42,6 @@
</span><span class="cx"> return ++identifier;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<WebUserContentControllerProxy> WebUserContentControllerProxy::create()
-{
- return adoptRef(new WebUserContentControllerProxy);
-}
-
</del><span class="cx"> WebUserContentControllerProxy::WebUserContentControllerProxy()
</span><span class="cx"> : m_identifier(generateIdentifier())
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessUserContentWebUserContentControllerProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/UserContent/WebUserContentControllerProxy.h (178384 => 178385)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/UserContent/WebUserContentControllerProxy.h 2015-01-13 23:35:05 UTC (rev 178384)
+++ trunk/Source/WebKit2/UIProcess/UserContent/WebUserContentControllerProxy.h 2015-01-13 23:35:20 UTC (rev 178385)
</span><span class="lines">@@ -26,6 +26,7 @@
</span><span class="cx"> #ifndef WebUserContentControllerProxy_h
</span><span class="cx"> #define WebUserContentControllerProxy_h
</span><span class="cx">
</span><ins>+#include "APIObject.h"
</ins><span class="cx"> #include "MessageReceiver.h"
</span><span class="cx"> #include <wtf/Forward.h>
</span><span class="cx"> #include <wtf/HashMap.h>
</span><span class="lines">@@ -48,9 +49,9 @@
</span><span class="cx"> class WebProcessProxy;
</span><span class="cx"> class WebScriptMessageHandler;
</span><span class="cx">
</span><del>-class WebUserContentControllerProxy : public RefCounted<WebUserContentControllerProxy>, private IPC::MessageReceiver {
</del><ins>+class WebUserContentControllerProxy : public API::ObjectImpl<API::Object::Type::UserContentController>, private IPC::MessageReceiver {
</ins><span class="cx"> public:
</span><del>- static PassRefPtr<WebUserContentControllerProxy> create();
</del><ins>+ explicit WebUserContentControllerProxy();
</ins><span class="cx"> ~WebUserContentControllerProxy();
</span><span class="cx">
</span><span class="cx"> uint64_t identifier() const { return m_identifier; }
</span><span class="lines">@@ -69,8 +70,6 @@
</span><span class="cx"> void removeUserMessageHandlerForName(const String&);
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- explicit WebUserContentControllerProxy();
-
</del><span class="cx"> // IPC::MessageReceiver.
</span><span class="cx"> virtual void didReceiveMessage(IPC::Connection&, IPC::MessageDecoder&) override;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>