<!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>[178464] 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/178464">178464</a></dd>
<dt>Author</dt> <dd>weinig@apple.com</dd>
<dt>Date</dt> <dd>2015-01-14 16:35:09 -0800 (Wed, 14 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Convert WKUserScript to be an API::Object bridged object
https://bugs.webkit.org/show_bug.cgi?id=140471
Reviewed by Dan Bernstein.
* Shared/API/APIObject.h:
* Shared/Cocoa/APIObject.mm:
(API::Object::newObject):
Add Type::UserScript.
* UIProcess/API/APIUserScript.h: Added.
Add API object for UserScripts.
* UIProcess/API/Cocoa/WKUserContentController.mm:
(-[WKUserContentController init]):
(-[WKUserContentController userScripts]):
(-[WKUserContentController addUserScript:]):
(-[WKUserContentController removeAllUserScripts]):
(toWebCoreUserScriptInjectionTime): Deleted.
* UIProcess/UserContent/WebUserContentControllerProxy.cpp:
(WebKit::WebUserContentControllerProxy::WebUserContentControllerProxy):
(WebKit::WebUserContentControllerProxy::addProcess):
(WebKit::WebUserContentControllerProxy::addUserScript):
(WebKit::WebUserContentControllerProxy::removeAllUserScripts):
* UIProcess/UserContent/WebUserContentControllerProxy.h:
(WebKit::WebUserContentControllerProxy::userScripts):
Store the WKUserScripts in the WebUserContentControllerProxy instead of the
Objective-C layer WKUserContentController, to allow creation of the object
from either the Objective-C or C++ sides.
* UIProcess/API/Cocoa/WKUserScript.mm:
(generateIdentifier):
(-[WKUserScript initWithSource:injectionTime:forMainFrameOnly:]):
(-[WKUserScript source]):
(-[WKUserScript injectionTime]):
(-[WKUserScript isForMainFrameOnly]):
(-[WKUserScript _apiObject]):
* UIProcess/API/Cocoa/WKUserScriptInternal.h:
(API::wrapper):
(API::toWebCoreUserScriptInjectionTime):
(API::toWKUserScriptInjectionTime):
Convert to get properties from the API::UserScript.
* WebKit2.xcodeproj/project.pbxproj:
Add the new file.</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="#trunkSourceWebKit2UIProcessAPICocoaWKUserScriptmm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKUserScript.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKUserScriptInternalh">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKUserScriptInternal.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>
<li><a href="#trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj">trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2UIProcessAPIAPIUserScripth">trunk/Source/WebKit2/UIProcess/API/APIUserScript.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (178463 => 178464)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-01-15 00:21:31 UTC (rev 178463)
+++ trunk/Source/WebKit2/ChangeLog 2015-01-15 00:35:09 UTC (rev 178464)
</span><span class="lines">@@ -1,3 +1,51 @@
</span><ins>+2015-01-14 Sam Weinig <sam@webkit.org>
+
+ Convert WKUserScript to be an API::Object bridged object
+ https://bugs.webkit.org/show_bug.cgi?id=140471
+
+ Reviewed by Dan Bernstein.
+
+ * Shared/API/APIObject.h:
+ * Shared/Cocoa/APIObject.mm:
+ (API::Object::newObject):
+ Add Type::UserScript.
+
+ * UIProcess/API/APIUserScript.h: Added.
+ Add API object for UserScripts.
+
+ * UIProcess/API/Cocoa/WKUserContentController.mm:
+ (-[WKUserContentController init]):
+ (-[WKUserContentController userScripts]):
+ (-[WKUserContentController addUserScript:]):
+ (-[WKUserContentController removeAllUserScripts]):
+ (toWebCoreUserScriptInjectionTime): Deleted.
+ * UIProcess/UserContent/WebUserContentControllerProxy.cpp:
+ (WebKit::WebUserContentControllerProxy::WebUserContentControllerProxy):
+ (WebKit::WebUserContentControllerProxy::addProcess):
+ (WebKit::WebUserContentControllerProxy::addUserScript):
+ (WebKit::WebUserContentControllerProxy::removeAllUserScripts):
+ * UIProcess/UserContent/WebUserContentControllerProxy.h:
+ (WebKit::WebUserContentControllerProxy::userScripts):
+ Store the WKUserScripts in the WebUserContentControllerProxy instead of the
+ Objective-C layer WKUserContentController, to allow creation of the object
+ from either the Objective-C or C++ sides.
+
+ * UIProcess/API/Cocoa/WKUserScript.mm:
+ (generateIdentifier):
+ (-[WKUserScript initWithSource:injectionTime:forMainFrameOnly:]):
+ (-[WKUserScript source]):
+ (-[WKUserScript injectionTime]):
+ (-[WKUserScript isForMainFrameOnly]):
+ (-[WKUserScript _apiObject]):
+ * UIProcess/API/Cocoa/WKUserScriptInternal.h:
+ (API::wrapper):
+ (API::toWebCoreUserScriptInjectionTime):
+ (API::toWKUserScriptInjectionTime):
+ Convert to get properties from the API::UserScript.
+
+ * WebKit2.xcodeproj/project.pbxproj:
+ Add the new file.
+
</ins><span class="cx"> 2015-01-14 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Add per page connection callbacks to the lifetime observer
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIAPIObjecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/API/APIObject.h (178463 => 178464)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/API/APIObject.h 2015-01-15 00:21:31 UTC (rev 178463)
+++ trunk/Source/WebKit2/Shared/API/APIObject.h 2015-01-15 00:35:09 UTC (rev 178464)
</span><span class="lines">@@ -81,6 +81,7 @@
</span><span class="cx"> URLRequest,
</span><span class="cx"> URLResponse,
</span><span class="cx"> UserContentURLPattern,
</span><ins>+ UserScript,
</ins><span class="cx"> WebArchive,
</span><span class="cx"> WebArchiveResource,
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedCocoaAPIObjectmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/Cocoa/APIObject.mm (178463 => 178464)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/Cocoa/APIObject.mm 2015-01-15 00:21:31 UTC (rev 178463)
+++ trunk/Source/WebKit2/Shared/Cocoa/APIObject.mm 2015-01-15 00:35:09 UTC (rev 178464)
</span><span class="lines">@@ -45,6 +45,7 @@
</span><span class="cx"> #import "WKNavigationInternal.h"
</span><span class="cx"> #import "WKProcessPoolInternal.h"
</span><span class="cx"> #import "WKUserContentControllerInternal.h"
</span><ins>+#import "WKUserScriptInternal.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">@@ -158,6 +159,10 @@
</span><span class="cx"> wrapper = [WKUserContentController alloc];
</span><span class="cx"> break;
</span><span class="cx">
</span><ins>+ case Type::UserScript:
+ wrapper = [WKUserScript 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="trunkSourceWebKit2UIProcessAPIAPIUserScripth"></a>
<div class="addfile"><h4>Added: trunk/Source/WebKit2/UIProcess/API/APIUserScript.h (0 => 178464)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/APIUserScript.h (rev 0)
+++ trunk/Source/WebKit2/UIProcess/API/APIUserScript.h 2015-01-15 00:35:09 UTC (rev 178464)
</span><span class="lines">@@ -0,0 +1,54 @@
</span><ins>+/*
+ * Copyright (C) 2015 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef APIUserScript_h
+#define APIUserScript_h
+
+#include "APIObject.h"
+#include <WebCore/UserScript.h>
+
+namespace API {
+
+class UserScript final : public ObjectImpl<Object::Type::UserScript> {
+public:
+ UserScript(WebCore::UserScript userScript)
+ : m_userScript(userScript)
+ {
+ }
+
+ ~UserScript()
+ {
+ }
+
+ WebCore::UserScript& userScript() { return m_userScript; }
+ const WebCore::UserScript& userScript() const { return m_userScript; }
+
+private:
+ WebCore::UserScript m_userScript;
+};
+
+} // namespace API
+
+#endif // APIUserScript_h
</ins></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKUserContentControllermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKUserContentController.mm (178463 => 178464)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKUserContentController.mm 2015-01-15 00:21:31 UTC (rev 178463)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKUserContentController.mm 2015-01-15 00:35:09 UTC (rev 178464)
</span><span class="lines">@@ -29,6 +29,7 @@
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span><span class="cx"> #import "WKFrameInfoInternal.h"
</span><ins>+#import "WKNSArray.h"
</ins><span class="cx"> #import "WKScriptMessageHandler.h"
</span><span class="cx"> #import "WKScriptMessageInternal.h"
</span><span class="cx"> #import "WKUserScriptInternal.h"
</span><span class="lines">@@ -38,12 +39,8 @@
</span><span class="cx"> #import <JavaScriptCore/JSContext.h>
</span><span class="cx"> #import <JavaScriptCore/JSValue.h>
</span><span class="cx"> #import <WebCore/SerializedScriptValue.h>
</span><del>-#import <WebCore/UserScript.h>
-#import <wtf/text/StringBuilder.h>
</del><span class="cx">
</span><del>-@implementation WKUserContentController {
- RetainPtr<NSMutableArray> _userScripts;
-}
</del><ins>+@implementation WKUserContentController
</ins><span class="cx">
</span><span class="cx"> - (instancetype)init
</span><span class="cx"> {
</span><span class="lines">@@ -51,7 +48,6 @@
</span><span class="cx"> return nil;
</span><span class="cx">
</span><span class="cx"> API::Object::constructInWrapper<WebKit::WebUserContentControllerProxy>(self);
</span><del>- _userScripts = adoptNS([[NSMutableArray alloc] init]);
</del><span class="cx">
</span><span class="cx"> return self;
</span><span class="cx"> }
</span><span class="lines">@@ -65,39 +61,16 @@
</span><span class="cx">
</span><span class="cx"> - (NSArray *)userScripts
</span><span class="cx"> {
</span><del>- return _userScripts.get();
</del><ins>+ return wrapper(_userContentControllerProxy->userScripts());
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-static WebCore::UserScriptInjectionTime toWebCoreUserScriptInjectionTime(WKUserScriptInjectionTime injectionTime)
-{
- switch (injectionTime) {
- case WKUserScriptInjectionTimeAtDocumentStart:
- return WebCore::InjectAtDocumentStart;
-
- case WKUserScriptInjectionTimeAtDocumentEnd:
- return WebCore::InjectAtDocumentEnd;
- }
-
- ASSERT_NOT_REACHED();
- return WebCore::InjectAtDocumentEnd;
-}
-
</del><span class="cx"> - (void)addUserScript:(WKUserScript *)userScript
</span><span class="cx"> {
</span><del>- [_userScripts addObject:userScript];
-
- StringBuilder urlStringBuilder;
- urlStringBuilder.append("user-script:");
- urlStringBuilder.appendNumber([_userScripts count]);
-
- WebCore::URL url { WebCore::URL { }, urlStringBuilder.toString() };
- _userContentControllerProxy->addUserScript(WebCore::UserScript { userScript->_source.get(), url, { }, { }, toWebCoreUserScriptInjectionTime(userScript->_injectionTime), userScript->_forMainFrameOnly ? WebCore::InjectInTopFrameOnly : WebCore::InjectInAllFrames });
</del><ins>+ _userContentControllerProxy->addUserScript(*userScript->_userScript);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)removeAllUserScripts
</span><span class="cx"> {
</span><del>- [_userScripts removeAllObjects];
-
</del><span class="cx"> _userContentControllerProxy->removeAllUserScripts();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKUserScriptmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKUserScript.mm (178463 => 178464)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKUserScript.mm 2015-01-15 00:21:31 UTC (rev 178463)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKUserScript.mm 2015-01-15 00:35:09 UTC (rev 178464)
</span><span class="lines">@@ -28,33 +28,45 @@
</span><span class="cx">
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span><ins>+#import <wtf/text/StringBuilder.h>
+
</ins><span class="cx"> @implementation WKUserScript
</span><span class="cx">
</span><ins>+static uint64_t generateIdentifier()
+{
+ static uint64_t identifier;
+
+ return ++identifier;
+}
+
</ins><span class="cx"> - (instancetype)initWithSource:(NSString *)source injectionTime:(WKUserScriptInjectionTime)injectionTime forMainFrameOnly:(BOOL)forMainFrameOnly
</span><span class="cx"> {
</span><span class="cx"> if (!(self = [super init]))
</span><span class="cx"> return nil;
</span><span class="cx">
</span><del>- _source = adoptNS([source copy]);
- _injectionTime = injectionTime;
- _forMainFrameOnly = forMainFrameOnly;
</del><ins>+ StringBuilder urlStringBuilder;
+ urlStringBuilder.append("user-script:");
+ urlStringBuilder.appendNumber(generateIdentifier());
+ WebCore::URL url { WebCore::URL { }, urlStringBuilder.toString() };
</ins><span class="cx">
</span><ins>+ API::Object::constructInWrapper<API::UserScript>(self, WebCore::UserScript { WTF::String(source), url, { }, { }, API::toWebCoreUserScriptInjectionTime(injectionTime), forMainFrameOnly ? WebCore::InjectInTopFrameOnly : WebCore::InjectInAllFrames });
+
</ins><span class="cx"> return self;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (NSString *)source
</span><span class="cx"> {
</span><del>- return _source.get();
</del><ins>+ return _userScript->userScript().source();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (WKUserScriptInjectionTime)injectionTime
</span><span class="cx"> {
</span><del>- return _injectionTime;
</del><ins>+ return API::toWKUserScriptInjectionTime(_userScript->userScript().injectionTime());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (BOOL)isForMainFrameOnly
</span><span class="cx"> {
</span><del>- return _forMainFrameOnly;
</del><ins>+ return _userScript->userScript().injectedFrames() == WebCore::InjectInTopFrameOnly;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (id)copyWithZone:(NSZone *)zone
</span><span class="lines">@@ -62,6 +74,13 @@
</span><span class="cx"> return [self retain];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#pragma mark WKObject protocol implementation
+
+- (API::Object&)_apiObject
+{
+ return *_userScript;
+}
+
</ins><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKUserScriptInternalh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKUserScriptInternal.h (178463 => 178464)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKUserScriptInternal.h 2015-01-15 00:21:31 UTC (rev 178463)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKUserScriptInternal.h 2015-01-15 00:35:09 UTC (rev 178464)
</span><span class="lines">@@ -27,15 +27,51 @@
</span><span class="cx">
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span><ins>+#import "APIUserScript.h"
</ins><span class="cx"> #import <wtf/RetainPtr.h>
</span><span class="cx">
</span><del>-@interface WKUserScript () {
</del><ins>+namespace API {
+
+inline WKUserScript *wrapper(UserScript& userScript)
+{
+ ASSERT([userScript.wrapper() isKindOfClass:[WKUserScript class]]);
+ return (WKUserScript *)userScript.wrapper();
+}
+
+inline WebCore::UserScriptInjectionTime toWebCoreUserScriptInjectionTime(WKUserScriptInjectionTime injectionTime)
+{
+ switch (injectionTime) {
+ case WKUserScriptInjectionTimeAtDocumentStart:
+ return WebCore::InjectAtDocumentStart;
+
+ case WKUserScriptInjectionTimeAtDocumentEnd:
+ return WebCore::InjectAtDocumentEnd;
+ }
+
+ ASSERT_NOT_REACHED();
+ return WebCore::InjectAtDocumentEnd;
+}
+
+inline WKUserScriptInjectionTime toWKUserScriptInjectionTime(WebCore::UserScriptInjectionTime injectionTime)
+{
+ switch (injectionTime) {
+ case WebCore::InjectAtDocumentStart:
+ return WKUserScriptInjectionTimeAtDocumentStart;
+
+ case WebCore::InjectAtDocumentEnd:
+ return WKUserScriptInjectionTimeAtDocumentEnd;
+ }
+
+ ASSERT_NOT_REACHED();
+ return WKUserScriptInjectionTimeAtDocumentEnd;
+}
+
+}
+
+@interface WKUserScript () <WKObject> {
</ins><span class="cx"> @package
</span><del>- RetainPtr<NSString> _source;
- WKUserScriptInjectionTime _injectionTime;
- BOOL _forMainFrameOnly;
</del><ins>+ API::ObjectStorage<API::UserScript> _userScript;
</ins><span class="cx"> }
</span><del>-
</del><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessUserContentWebUserContentControllerProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/UserContent/WebUserContentControllerProxy.cpp (178463 => 178464)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/UserContent/WebUserContentControllerProxy.cpp 2015-01-15 00:21:31 UTC (rev 178463)
+++ trunk/Source/WebKit2/UIProcess/UserContent/WebUserContentControllerProxy.cpp 2015-01-15 00:35:09 UTC (rev 178464)
</span><span class="lines">@@ -26,6 +26,8 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "WebUserContentControllerProxy.h"
</span><span class="cx">
</span><ins>+#include "APIArray.h"
+#include "APIUserScript.h"
</ins><span class="cx"> #include "DataReference.h"
</span><span class="cx"> #include "WebProcessProxy.h"
</span><span class="cx"> #include "WebScriptMessageHandler.h"
</span><span class="lines">@@ -44,6 +46,7 @@
</span><span class="cx">
</span><span class="cx"> WebUserContentControllerProxy::WebUserContentControllerProxy()
</span><span class="cx"> : m_identifier(generateIdentifier())
</span><ins>+ , m_userScripts(*API::Array::create())
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -62,7 +65,11 @@
</span><span class="cx">
</span><span class="cx"> webProcessProxy.addMessageReceiver(Messages::WebUserContentControllerProxy::messageReceiverName(), m_identifier, *this);
</span><span class="cx">
</span><del>- webProcessProxy.connection()->send(Messages::WebUserContentController::AddUserScripts(m_userScripts), m_identifier);
</del><ins>+ Vector<WebCore::UserScript> userScripts;
+ for (const auto& userScript : m_userScripts->elementsOfType<API::UserScript>())
+ userScripts.append(userScript->userScript());
+ webProcessProxy.connection()->send(Messages::WebUserContentController::AddUserScripts(userScripts), m_identifier);
+
</ins><span class="cx"> webProcessProxy.connection()->send(Messages::WebUserContentController::AddUserStyleSheets(m_userStyleSheets), m_identifier);
</span><span class="cx">
</span><span class="cx"> Vector<WebScriptMessageHandlerHandle> messageHandlerHandles;
</span><span class="lines">@@ -79,17 +86,17 @@
</span><span class="cx"> webProcessProxy.removeMessageReceiver(Messages::WebUserContentControllerProxy::messageReceiverName(), m_identifier);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebUserContentControllerProxy::addUserScript(WebCore::UserScript userScript)
</del><ins>+void WebUserContentControllerProxy::addUserScript(API::UserScript& userScript)
</ins><span class="cx"> {
</span><del>- m_userScripts.append(WTF::move(userScript));
</del><ins>+ m_userScripts->elements().append(&userScript);
</ins><span class="cx">
</span><span class="cx"> for (WebProcessProxy* process : m_processes)
</span><del>- process->connection()->send(Messages::WebUserContentController::AddUserScripts({ m_userScripts.last() }), m_identifier);
</del><ins>+ process->connection()->send(Messages::WebUserContentController::AddUserScripts({ userScript.userScript() }), m_identifier);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebUserContentControllerProxy::removeAllUserScripts()
</span><span class="cx"> {
</span><del>- m_userScripts.clear();
</del><ins>+ m_userScripts->elements().clear();
</ins><span class="cx">
</span><span class="cx"> for (WebProcessProxy* process : m_processes)
</span><span class="cx"> process->connection()->send(Messages::WebUserContentController::RemoveAllUserScripts(), m_identifier);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessUserContentWebUserContentControllerProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/UserContent/WebUserContentControllerProxy.h (178463 => 178464)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/UserContent/WebUserContentControllerProxy.h 2015-01-15 00:21:31 UTC (rev 178463)
+++ trunk/Source/WebKit2/UIProcess/UserContent/WebUserContentControllerProxy.h 2015-01-15 00:35:09 UTC (rev 178464)
</span><span class="lines">@@ -32,9 +32,15 @@
</span><span class="cx"> #include <wtf/HashMap.h>
</span><span class="cx"> #include <wtf/HashSet.h>
</span><span class="cx"> #include <wtf/PassRefPtr.h>
</span><ins>+#include <wtf/Ref.h>
</ins><span class="cx"> #include <wtf/RefCounted.h>
</span><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx">
</span><ins>+namespace API {
+class Array;
+class UserScript;
+}
+
</ins><span class="cx"> namespace IPC {
</span><span class="cx"> class DataReference;
</span><span class="cx"> }
</span><span class="lines">@@ -59,7 +65,8 @@
</span><span class="cx"> void addProcess(WebProcessProxy&);
</span><span class="cx"> void removeProcess(WebProcessProxy&);
</span><span class="cx">
</span><del>- void addUserScript(WebCore::UserScript);
</del><ins>+ API::Array& userScripts() { return m_userScripts.get(); }
+ void addUserScript(API::UserScript&);
</ins><span class="cx"> void removeAllUserScripts();
</span><span class="cx">
</span><span class="cx"> void addUserStyleSheet(WebCore::UserStyleSheet);
</span><span class="lines">@@ -76,9 +83,8 @@
</span><span class="cx"> void didPostMessage(IPC::Connection&, uint64_t pageID, uint64_t frameID, uint64_t messageHandlerID, const IPC::DataReference&);
</span><span class="cx">
</span><span class="cx"> uint64_t m_identifier;
</span><del>- HashSet<WebProcessProxy*> m_processes;
-
- Vector<WebCore::UserScript> m_userScripts;
</del><ins>+ HashSet<WebProcessProxy*> m_processes;
+ Ref<API::Array> m_userScripts;
</ins><span class="cx"> Vector<WebCore::UserStyleSheet> m_userStyleSheets;
</span><span class="cx"> HashMap<uint64_t, RefPtr<WebScriptMessageHandler>> m_scriptMessageHandlers;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (178463 => 178464)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2015-01-15 00:21:31 UTC (rev 178463)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2015-01-15 00:35:09 UTC (rev 178464)
</span><span class="lines">@@ -1069,6 +1069,7 @@
</span><span class="cx"> 7C85FD7C193415A8000177C4 /* WebPreferencesDefinitions.h in Headers */ = {isa = PBXBuildFile; fileRef = 7C85FD7B193415A8000177C4 /* WebPreferencesDefinitions.h */; };
</span><span class="cx"> 7C85FD7F19341665000177C4 /* WebPreferencesKeys.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C85FD7D19341665000177C4 /* WebPreferencesKeys.cpp */; };
</span><span class="cx"> 7C85FD8019341665000177C4 /* WebPreferencesKeys.h in Headers */ = {isa = PBXBuildFile; fileRef = 7C85FD7E19341665000177C4 /* WebPreferencesKeys.h */; };
</span><ins>+ 7C89D2941A67122F003A5FDE /* APIUserScript.h in Headers */ = {isa = PBXBuildFile; fileRef = 7C89D2921A67122F003A5FDE /* APIUserScript.h */; };
</ins><span class="cx"> 7C8EB11718DB6A19007917C2 /* WKPreferencesPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 7C8EB11618DB6A19007917C2 /* WKPreferencesPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 7C9D1537184584DA009D3918 /* WKBrowsingContextGroupInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 7C9D1536184584DA009D3918 /* WKBrowsingContextGroupInternal.h */; };
</span><span class="cx"> 7CA254EB182993CE00FC8A41 /* WKBrowsingContextPolicyDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 7CA254EA182993CE00FC8A41 /* WKBrowsingContextPolicyDelegate.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="lines">@@ -3176,6 +3177,7 @@
</span><span class="cx"> 7C85FD7B193415A8000177C4 /* WebPreferencesDefinitions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebPreferencesDefinitions.h; sourceTree = "<group>"; };
</span><span class="cx"> 7C85FD7D19341665000177C4 /* WebPreferencesKeys.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebPreferencesKeys.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 7C85FD7E19341665000177C4 /* WebPreferencesKeys.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebPreferencesKeys.h; sourceTree = "<group>"; };
</span><ins>+ 7C89D2921A67122F003A5FDE /* APIUserScript.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = APIUserScript.h; sourceTree = "<group>"; };
</ins><span class="cx"> 7C8EB11618DB6A19007917C2 /* WKPreferencesPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKPreferencesPrivate.h; sourceTree = "<group>"; };
</span><span class="cx"> 7C9D1536184584DA009D3918 /* WKBrowsingContextGroupInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKBrowsingContextGroupInternal.h; sourceTree = "<group>"; };
</span><span class="cx"> 7CA254EA182993CE00FC8A41 /* WKBrowsingContextPolicyDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKBrowsingContextPolicyDelegate.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -6056,6 +6058,7 @@
</span><span class="cx"> 1AFDE65F1954E9B100C48FFA /* APISessionState.cpp */,
</span><span class="cx"> 1AFDE6601954E9B100C48FFA /* APISessionState.h */,
</span><span class="cx"> 1A4D664718A2D91A00D82E21 /* APIUIClient.h */,
</span><ins>+ 7C89D2921A67122F003A5FDE /* APIUserScript.h */,
</ins><span class="cx"> 1A3635A71A3144A300ED6197 /* APIWebsiteDataStore.cpp */,
</span><span class="cx"> 1A3635A81A3144A300ED6197 /* APIWebsiteDataStore.h */,
</span><span class="cx"> );
</span><span class="lines">@@ -7618,6 +7621,7 @@
</span><span class="cx"> 1A60224D18C16B9F00C3E8C9 /* VisitedLinkProviderMessages.h in Headers */,
</span><span class="cx"> 1A0F29CC120B37160053D1B9 /* VisitedLinkTable.h in Headers */,
</span><span class="cx"> 1AF4CEF018BC481800BC2D34 /* VisitedLinkTableController.h in Headers */,
</span><ins>+ 7C89D2941A67122F003A5FDE /* APIUserScript.h in Headers */,
</ins><span class="cx"> 1A8E7D3D18C15149005A702A /* VisitedLinkTableControllerMessages.h in Headers */,
</span><span class="cx"> 1AA9BAE1184FFAC7003B6BC6 /* WeakObjCPtr.h in Headers */,
</span><span class="cx"> CEDA12E3152CD1B300D9E08D /* WebAlternativeTextClient.h in Headers */,
</span></span></pre>
</div>
</div>
</body>
</html>