Diff
Modified: trunk/Source/WebKit2/ChangeLog (197301 => 197302)
--- trunk/Source/WebKit2/ChangeLog 2016-02-28 21:00:15 UTC (rev 197301)
+++ trunk/Source/WebKit2/ChangeLog 2016-02-28 21:56:44 UTC (rev 197302)
@@ -1,3 +1,69 @@
+2016-02-28 Sam Weinig <s...@webkit.org>
+
+ Bind _WKUserStyleSheets to _WKUserContentWorlds to allow for grouping of user content by associating to a world
+ https://bugs.webkit.org/show_bug.cgi?id=154798
+
+ Reviewed by Dan Bernstein.
+
+ Treat _WKUserStyleSheets like WKUserScripts and allow them to be bound to a _WKUserContentWorld.
+ The immediate benefit of this is allowing a client to bind a set of user content (scripts and stylesheets
+ for now) to a world and have them easily remove all user content associated with that world easily.
+
+ * Shared/API/APIArray.h:
+ Add helpers removeAllMatching and removeAllOfTypeMatching.
+
+ * UIProcess/API/APIUserStyleSheet.h:
+ Add API::UserContentWorld member.
+
+ * UIProcess/API/Cocoa/WKUserContentController.mm:
+ (-[WKUserContentController _removeAllUserScriptsAssociatedWithUserContentWorld:]):
+ (-[WKUserContentController _removeAllUserStyleSheetsAssociatedWithUserContentWorld:]):
+ * UIProcess/API/Cocoa/WKUserContentControllerPrivate.h:
+ Add _removeAllUserScriptsAssociatedWithUserContentWorld and _removeAllUserStyleSheetsAssociatedWithUserContentWorld.
+
+ * UIProcess/API/Cocoa/WKUserScript.mm:
+ (-[WKUserScript _initWithSource:injectionTime:forMainFrameOnly:legacyWhitelist:legacyBlacklist:userContentWorld:]):
+ (toStringVector): Deleted.
+ * UIProcess/API/Cocoa/_WKUserContentWorldInternal.h:
+ (API::toStringVector):
+ Move toStringVector to a location where it can be shared.
+
+ * UIProcess/API/Cocoa/_WKUserStyleSheet.h:
+ * UIProcess/API/Cocoa/_WKUserStyleSheet.mm:
+ (-[_WKUserStyleSheet initWithSource:forMainFrameOnly:legacyWhitelist:legacyBlacklist:userContentWorld:]):
+ Add new initializer which has a world to be bound to. While here, match WKUserScript and add support for the
+ legacy whitelist and blacklists.
+
+ * UIProcess/UserContent/WebUserContentControllerProxy.cpp:
+ (WebKit::WebUserContentControllerProxy::addProcess):
+ (WebKit::WebUserContentControllerProxy::removeProcess):
+ (WebKit::WebUserContentControllerProxy::addUserContentWorldUse):
+ (WebKit::WebUserContentControllerProxy::shouldSendRemoveUserContentWorldsMessage):
+ (WebKit::WebUserContentControllerProxy::removeUserContentWorldUses):
+ (WebKit::WebUserContentControllerProxy::addUserScript):
+ (WebKit::WebUserContentControllerProxy::removeUserScript):
+ (WebKit::WebUserContentControllerProxy::removeAllUserScripts):
+ (WebKit::WebUserContentControllerProxy::addUserStyleSheet):
+ (WebKit::WebUserContentControllerProxy::removeUserStyleSheet):
+ (WebKit::WebUserContentControllerProxy::removeAllUserStyleSheets):
+ * UIProcess/UserContent/WebUserContentControllerProxy.h:
+ Refactor to share the code which decides whether to send AddUserContentWorlds/RemoveUserContentWorlds
+ messages.
+
+ * WebProcess/UserContent/WebUserContentController.cpp:
+ (WebKit::WebUserContentController::addUserContentWorlds):
+ (WebKit::WebUserContentController::removeUserContentWorlds):
+ (WebKit::WebUserContentController::addUserScripts):
+ (WebKit::WebUserContentController::removeUserScript):
+ (WebKit::WebUserContentController::removeAllUserScripts):
+ (WebKit::WebUserContentController::addUserStyleSheets):
+ (WebKit::WebUserContentController::removeUserStyleSheet):
+ (WebKit::WebUserContentController::removeAllUserStyleSheets):
+ * WebProcess/UserContent/WebUserContentController.h:
+ * WebProcess/UserContent/WebUserContentController.messages.in:
+ Add support for binding stylesheets to worlds and allow removing all the scripts/stylesheets from a
+ set of worlds at once by passing Vectors of world identifiers in the remove messages.
+
2016-02-27 Commit Queue <commit-qu...@webkit.org>
Unreviewed, rolling out r197204, r197207, r197211, r197217,
Modified: trunk/Source/WebKit2/Shared/API/APIArray.h (197301 => 197302)
--- trunk/Source/WebKit2/Shared/API/APIArray.h 2016-02-28 21:00:15 UTC (rev 197301)
+++ trunk/Source/WebKit2/Shared/API/APIArray.h 2016-02-28 21:56:44 UTC (rev 197302)
@@ -82,7 +82,22 @@
);
}
+ template<typename MatchFunction>
+ unsigned removeAllMatching(const MatchFunction& matchFunction)
+ {
+ return m_elements.removeAllMatching(matchFunction);
+ }
+ template<typename T, typename MatchFunction>
+ unsigned removeAllOfTypeMatching(const MatchFunction& matchFunction)
+ {
+ return m_elements.removeAllMatching([&] (const RefPtr<Object>& object) -> bool {
+ if (object->type() != T::APIType)
+ return false;
+ return matchFunction(static_pointer_cast<T>(object));
+ });
+ }
+
private:
explicit Array(Vector<RefPtr<Object>>&& elements)
: m_elements(WTFMove(elements))
Modified: trunk/Source/WebKit2/UIProcess/API/APIUserStyleSheet.h (197301 => 197302)
--- trunk/Source/WebKit2/UIProcess/API/APIUserStyleSheet.h 2016-02-28 21:00:15 UTC (rev 197301)
+++ trunk/Source/WebKit2/UIProcess/API/APIUserStyleSheet.h 2016-02-28 21:56:44 UTC (rev 197302)
@@ -27,6 +27,7 @@
#define APIUserStyleSheet_h
#include "APIObject.h"
+#include "APIUserContentWorld.h"
#include <WebCore/UserStyleSheet.h>
namespace API {
@@ -35,15 +36,25 @@
public:
static WebCore::URL generateUniqueURL();
- UserStyleSheet(WebCore::UserStyleSheet userStyleSheet)
+ static Ref<UserStyleSheet> create(WebCore::UserStyleSheet userStyleSheet, API::UserContentWorld& world)
+ {
+ return adoptRef(*new UserStyleSheet(WTFMove(userStyleSheet), world));
+ }
+
+ UserStyleSheet(WebCore::UserStyleSheet userStyleSheet, API::UserContentWorld& world)
: m_userStyleSheet(userStyleSheet)
+ , m_world(world)
{
}
const WebCore::UserStyleSheet& userStyleSheet() const { return m_userStyleSheet; }
+ UserContentWorld& userContentWorld() { return m_world; }
+ const UserContentWorld& userContentWorld() const { return m_world; }
+
private:
WebCore::UserStyleSheet m_userStyleSheet;
+ Ref<UserContentWorld> m_world;
};
} // namespace API
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKUserContentController.mm (197301 => 197302)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKUserContentController.mm 2016-02-28 21:00:15 UTC (rev 197301)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKUserContentController.mm 2016-02-28 21:56:44 UTC (rev 197302)
@@ -38,6 +38,7 @@
#import "WebScriptMessageHandler.h"
#import "WebUserContentControllerProxy.h"
#import "_WKUserContentFilterInternal.h"
+#import "_WKUserContentWorldInternal.h"
#import "_WKUserStyleSheetInternal.h"
#import <WebCore/SecurityOrigin.h>
#import <WebCore/SecurityOriginData.h>
@@ -143,6 +144,11 @@
_userContentControllerProxy->removeUserScript(*userScript->_userScript);
}
+- (void)_removeAllUserScriptsAssociatedWithUserContentWorld:(_WKUserContentWorld *)userContentWorld
+{
+ _userContentControllerProxy->removeAllUserScripts(*userContentWorld->_userContentWorld);
+}
+
- (void)_addUserContentFilter:(_WKUserContentFilter *)userContentFilter
{
#if ENABLE(CONTENT_EXTENSIONS)
@@ -184,6 +190,11 @@
_userContentControllerProxy->removeAllUserStyleSheets();
}
+- (void)_removeAllUserStyleSheetsAssociatedWithUserContentWorld:(_WKUserContentWorld *)userContentWorld
+{
+ _userContentControllerProxy->removeAllUserStyleSheets(*userContentWorld->_userContentWorld);
+}
+
@end
#endif
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKUserContentControllerPrivate.h (197301 => 197302)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKUserContentControllerPrivate.h 2016-02-28 21:00:15 UTC (rev 197301)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKUserContentControllerPrivate.h 2016-02-28 21:56:44 UTC (rev 197302)
@@ -29,11 +29,13 @@
@class WKUserScript;
@class _WKUserContentFilter;
+@class _WKUserContentWorld;
@class _WKUserStyleSheet;
@interface WKUserContentController (WKPrivate)
- (void)_removeUserScript:(WKUserScript *)userScript WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
+- (void)_removeAllUserScriptsAssociatedWithUserContentWorld:(_WKUserContentWorld *)userContentWorld WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
- (void)_addUserContentFilter:(_WKUserContentFilter *)userContentFilter WK_AVAILABLE(10_11, 9_0);
- (void)_removeUserContentFilter:(NSString *)userContentFilterName WK_AVAILABLE(10_11, 9_0);
@@ -43,6 +45,7 @@
- (void)_addUserStyleSheet:(_WKUserStyleSheet *)userStyleSheet WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
- (void)_removeUserStyleSheet:(_WKUserStyleSheet *)userStyleSheet WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
- (void)_removeAllUserStyleSheets WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
+- (void)_removeAllUserStyleSheetsAssociatedWithUserContentWorld:(_WKUserContentWorld *)userContentWorld WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
@end
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKUserScript.mm (197301 => 197302)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKUserScript.mm 2016-02-28 21:00:15 UTC (rev 197301)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKUserScript.mm 2016-02-28 21:56:44 UTC (rev 197302)
@@ -73,28 +73,12 @@
@implementation WKUserScript (WKPrivate)
-static Vector<WTF::String> toStringVector(NSArray *input)
-{
- Vector<WTF::String> vector;
-
- NSUInteger size = input.count;
- if (!size)
- return vector;
-
- vector.reserveInitialCapacity(size);
- for (id string : input) {
- if ([string isKindOfClass:[NSString class]])
- vector.uncheckedAppend(string);
- }
- return vector;
-}
-
- (instancetype)_initWithSource:(NSString *)source injectionTime:(WKUserScriptInjectionTime)injectionTime forMainFrameOnly:(BOOL)forMainFrameOnly legacyWhitelist:(NSArray *)legacyWhitelist legacyBlacklist:(NSArray *)legacyBlacklist userContentWorld:(_WKUserContentWorld *)userContentWorld
{
if (!(self = [super init]))
return nil;
- API::Object::constructInWrapper<API::UserScript>(self, WebCore::UserScript { WTF::String(source), API::UserScript::generateUniqueURL(), toStringVector(legacyWhitelist), toStringVector(legacyBlacklist), API::toWebCoreUserScriptInjectionTime(injectionTime), forMainFrameOnly ? WebCore::InjectInTopFrameOnly : WebCore::InjectInAllFrames }, *userContentWorld->_userContentWorld);
+ API::Object::constructInWrapper<API::UserScript>(self, WebCore::UserScript { WTF::String(source), API::UserScript::generateUniqueURL(), API::toStringVector(legacyWhitelist), API::toStringVector(legacyBlacklist), API::toWebCoreUserScriptInjectionTime(injectionTime), forMainFrameOnly ? WebCore::InjectInTopFrameOnly : WebCore::InjectInAllFrames }, *userContentWorld->_userContentWorld);
return self;
}
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKUserContentWorldInternal.h (197301 => 197302)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKUserContentWorldInternal.h 2016-02-28 21:00:15 UTC (rev 197301)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKUserContentWorldInternal.h 2016-02-28 21:56:44 UTC (rev 197302)
@@ -29,6 +29,8 @@
#import "APIUserContentWorld.h"
#import "WKObject.h"
+#import <wtf/Vector.h>
+#import <wtf/text/WTFString.h>
namespace API {
@@ -38,8 +40,24 @@
return (_WKUserContentWorld *)userContentWorld.wrapper();
}
+inline Vector<WTF::String> toStringVector(NSArray *input)
+{
+ Vector<WTF::String> vector;
+
+ NSUInteger size = input.count;
+ if (!size)
+ return vector;
+
+ vector.reserveInitialCapacity(size);
+ for (id string : input) {
+ if ([string isKindOfClass:[NSString class]])
+ vector.uncheckedAppend(string);
+ }
+ return vector;
}
+}
+
@interface _WKUserContentWorld () <WKObject> {
@package
API::ObjectStorage<API::UserContentWorld> _userContentWorld;
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKUserStyleSheet.h (197301 => 197302)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKUserStyleSheet.h 2016-02-28 21:00:15 UTC (rev 197301)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKUserStyleSheet.h 2016-02-28 21:56:44 UTC (rev 197302)
@@ -31,6 +31,8 @@
NS_ASSUME_NONNULL_BEGIN
+@class _WKUserContentWorld;
+
WK_CLASS_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA)
@interface _WKUserStyleSheet : NSObject <NSCopying>
@@ -40,6 +42,8 @@
- (instancetype)initWithSource:(NSString *)source forMainFrameOnly:(BOOL)forMainFrameOnly;
+- (instancetype)initWithSource:(NSString *)source forMainFrameOnly:(BOOL)forMainFrameOnly legacyWhitelist:(WK_ARRAY(NSString *) *)legacyWhitelist legacyBlacklist:(WK_ARRAY(NSString *) *)legacyBlacklist userContentWorld:(_WKUserContentWorld *)userContentWorld;
+
@end
NS_ASSUME_NONNULL_END
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKUserStyleSheet.mm (197301 => 197302)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKUserStyleSheet.mm 2016-02-28 21:00:15 UTC (rev 197301)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKUserStyleSheet.mm 2016-02-28 21:56:44 UTC (rev 197302)
@@ -29,6 +29,7 @@
#import "APIArray.h"
#import "WKNSArray.h"
#import "WebKit2Initialize.h"
+#import "_WKUserContentWorldInternal.h"
#if WK_API_ENABLED
@@ -42,11 +43,24 @@
// FIXME: In the API test, we can use generateUniqueURL below before the API::Object constructor has done this... where should this really be?
WebKit::InitializeWebKit2();
- API::Object::constructInWrapper<API::UserStyleSheet>(self, WebCore::UserStyleSheet { WTF::String(source), API::UserStyleSheet::generateUniqueURL(), { }, { }, forMainFrameOnly ? WebCore::InjectInTopFrameOnly : WebCore::InjectInAllFrames, WebCore::UserStyleUserLevel });
+ API::Object::constructInWrapper<API::UserStyleSheet>(self, WebCore::UserStyleSheet { WTF::String(source), API::UserStyleSheet::generateUniqueURL(), { }, { }, forMainFrameOnly ? WebCore::InjectInTopFrameOnly : WebCore::InjectInAllFrames, WebCore::UserStyleUserLevel }, API::UserContentWorld::normalWorld());
return self;
}
+- (instancetype)initWithSource:(NSString *)source forMainFrameOnly:(BOOL)forMainFrameOnly legacyWhitelist:(WK_ARRAY(NSString *) *)legacyWhitelist legacyBlacklist:(WK_ARRAY(NSString *) *)legacyBlacklist userContentWorld:(_WKUserContentWorld *)userContentWorld
+{
+ if (!(self = [super init]))
+ return nil;
+
+ // FIXME: In the API test, we can use generateUniqueURL below before the API::Object constructor has done this... where should this really be?
+ WebKit::InitializeWebKit2();
+
+ API::Object::constructInWrapper<API::UserStyleSheet>(self, WebCore::UserStyleSheet { WTF::String(source), API::UserStyleSheet::generateUniqueURL(), API::toStringVector(legacyWhitelist), API::toStringVector(legacyBlacklist), forMainFrameOnly ? WebCore::InjectInTopFrameOnly : WebCore::InjectInAllFrames, WebCore::UserStyleUserLevel }, *userContentWorld->_userContentWorld);
+
+ return self;
+}
+
- (NSString *)source
{
return _userStyleSheet->userStyleSheet().source();
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitUserContent.cpp (197301 => 197302)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitUserContent.cpp 2016-02-28 21:00:15 UTC (rev 197301)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitUserContent.cpp 2016-02-28 21:56:44 UTC (rev 197302)
@@ -93,7 +93,7 @@
String::fromUTF8(source), URL { },
toStringVector(whitelist), toStringVector(blacklist),
toUserContentInjectedFrames(injectedFrames),
- toUserStyleLevel(level) })))
+ toUserStyleLevel(level) }, API::UserContentWorld::normalWorld())))
, referenceCount(1)
{
}
Modified: trunk/Source/WebKit2/UIProcess/UserContent/WebUserContentControllerProxy.cpp (197301 => 197302)
--- trunk/Source/WebKit2/UIProcess/UserContent/WebUserContentControllerProxy.cpp 2016-02-28 21:00:15 UTC (rev 197301)
+++ trunk/Source/WebKit2/UIProcess/UserContent/WebUserContentControllerProxy.cpp 2016-02-28 21:56:44 UTC (rev 197302)
@@ -85,9 +85,9 @@
userScripts.append(std::make_pair(userScript->userContentWorld().identifier(), userScript->userScript()));
webProcessProxy.connection()->send(Messages::WebUserContentController::AddUserScripts(userScripts), m_identifier);
- Vector<WebCore::UserStyleSheet> userStyleSheets;
+ Vector<std::pair<uint64_t, WebCore::UserStyleSheet>> userStyleSheets;
for (const auto& userStyleSheet : m_userStyleSheets->elementsOfType<API::UserStyleSheet>())
- userStyleSheets.append(userStyleSheet->userStyleSheet());
+ userStyleSheets.append(std::make_pair(userStyleSheet->userContentWorld().identifier(), userStyleSheet->userStyleSheet()));
webProcessProxy.connection()->send(Messages::WebUserContentController::AddUserStyleSheets(userStyleSheets), m_identifier);
Vector<WebScriptMessageHandlerHandle> messageHandlerHandles;
@@ -111,18 +111,60 @@
webProcessProxy.removeMessageReceiver(Messages::WebUserContentControllerProxy::messageReceiverName(), m_identifier);
}
-void WebUserContentControllerProxy::addUserScript(API::UserScript& userScript)
+void WebUserContentControllerProxy::addUserContentWorldUse(API::UserContentWorld& world)
{
- Ref<API::UserContentWorld> world = userScript.userContentWorld();
+ if (&world == &API::UserContentWorld::normalWorld())
+ return;
- if (world.ptr() != &API::UserContentWorld::normalWorld()) {
- auto addResult = m_userContentWorlds.add(world.ptr());
- if (addResult.isNewEntry) {
- for (WebProcessProxy* process : m_processes)
- process->connection()->send(Messages::WebUserContentController::AddUserContentWorlds({ std::make_pair(world->identifier(), world->name()) }), m_identifier);
+ auto addResult = m_userContentWorlds.add(&world);
+ if (addResult.isNewEntry) {
+ for (WebProcessProxy* process : m_processes)
+ process->connection()->send(Messages::WebUserContentController::AddUserContentWorlds({ std::make_pair(world.identifier(), world.name()) }), m_identifier);
+ }
+}
+
+bool WebUserContentControllerProxy::shouldSendRemoveUserContentWorldsMessage(API::UserContentWorld& world, unsigned numberOfUsesToRemove)
+{
+ if (&world == &API::UserContentWorld::normalWorld())
+ return false;
+
+ auto it = m_userContentWorlds.find(&world);
+ for (unsigned i = 0; i < numberOfUsesToRemove; ++i) {
+ if (m_userContentWorlds.remove(it)) {
+ ASSERT(i == (numberOfUsesToRemove - 1));
+ return true;
}
}
+
+ return false;
+}
+void WebUserContentControllerProxy::removeUserContentWorldUses(API::UserContentWorld& world, unsigned numberOfUsesToRemove)
+{
+ if (shouldSendRemoveUserContentWorldsMessage(world, numberOfUsesToRemove)) {
+ for (WebProcessProxy* process : m_processes)
+ process->connection()->send(Messages::WebUserContentController::RemoveUserContentWorlds({ world.identifier() }), m_identifier);
+ }
+}
+
+void WebUserContentControllerProxy::removeUserContentWorldUses(HashCountedSet<RefPtr<API::UserContentWorld>>& worlds)
+{
+ Vector<uint64_t> worldsToRemove;
+ for (auto& worldUsePair : worlds) {
+ if (shouldSendRemoveUserContentWorldsMessage(*worldUsePair.key.get(), worldUsePair.value))
+ worldsToRemove.append(worldUsePair.key->identifier());
+ }
+
+ for (WebProcessProxy* process : m_processes)
+ process->connection()->send(Messages::WebUserContentController::RemoveUserContentWorlds(worldsToRemove), m_identifier);
+}
+
+void WebUserContentControllerProxy::addUserScript(API::UserScript& userScript)
+{
+ Ref<API::UserContentWorld> world = userScript.userContentWorld();
+
+ addUserContentWorldUse(world.get());
+
m_userScripts->elements().append(&userScript);
for (WebProcessProxy* process : m_processes)
@@ -138,44 +180,93 @@
m_userScripts->elements().removeAll(&userScript);
- if (world.ptr() != &API::UserContentWorld::normalWorld()) {
- if (m_userContentWorlds.remove(&userScript.userContentWorld())) {
- for (WebProcessProxy* process : m_processes)
- process->connection()->send(Messages::WebUserContentController::RemoveUserContentWorld(world->identifier()), m_identifier);
- }
- }
+ removeUserContentWorldUses(world.get(), 1);
}
+void WebUserContentControllerProxy::removeAllUserScripts(API::UserContentWorld& world)
+{
+ for (WebProcessProxy* process : m_processes)
+ process->connection()->send(Messages::WebUserContentController::RemoveAllUserScripts({ world.identifier() }), m_identifier);
+
+ unsigned userScriptsRemoved = m_userScripts->removeAllOfTypeMatching<API::UserScript>([&] (const RefPtr<API::UserScript>& userScript) -> bool {
+ return &userScript->userContentWorld() == &world;
+ });
+
+ removeUserContentWorldUses(world, userScriptsRemoved);
+}
+
void WebUserContentControllerProxy::removeAllUserScripts()
{
+ HashCountedSet<RefPtr<API::UserContentWorld>> worlds;
+ for (const auto& userScript : m_userScripts->elementsOfType<API::UserScript>())
+ worlds.add(const_cast<API::UserContentWorld*>(&userScript->userContentWorld()));
+
+ Vector<uint64_t> worldIdentifiers;
+ worldIdentifiers.reserveInitialCapacity(worlds.size());
+ for (const auto& worldCountPair : worlds)
+ worldIdentifiers.uncheckedAppend(worldCountPair.key->identifier());
+
for (WebProcessProxy* process : m_processes)
- process->connection()->send(Messages::WebUserContentController::RemoveAllUserScripts(API::UserContentWorld::normalWorld().identifier()), m_identifier);
+ process->connection()->send(Messages::WebUserContentController::RemoveAllUserScripts(worldIdentifiers), m_identifier);
m_userScripts->elements().clear();
+
+ removeUserContentWorldUses(worlds);
}
void WebUserContentControllerProxy::addUserStyleSheet(API::UserStyleSheet& userStyleSheet)
{
+ Ref<API::UserContentWorld> world = userStyleSheet.userContentWorld();
+
+ addUserContentWorldUse(world.get());
+
m_userStyleSheets->elements().append(&userStyleSheet);
for (WebProcessProxy* process : m_processes)
- process->connection()->send(Messages::WebUserContentController::AddUserStyleSheets({ userStyleSheet.userStyleSheet() }), m_identifier);
+ process->connection()->send(Messages::WebUserContentController::AddUserStyleSheets({ std::make_pair(world->identifier(), userStyleSheet.userStyleSheet()) }), m_identifier);
}
-void WebUserContentControllerProxy::removeUserStyleSheet(const API::UserStyleSheet& userStyleSheet)
+void WebUserContentControllerProxy::removeUserStyleSheet(API::UserStyleSheet& userStyleSheet)
{
+ Ref<API::UserContentWorld> world = userStyleSheet.userContentWorld();
+
for (WebProcessProxy* process : m_processes)
- process->connection()->send(Messages::WebUserContentController::RemoveUserStyleSheet({ userStyleSheet.userStyleSheet().url().string() }), m_identifier);
+ process->connection()->send(Messages::WebUserContentController::RemoveUserStyleSheet(world->identifier(), userStyleSheet.userStyleSheet().url().string()), m_identifier);
m_userStyleSheets->elements().removeAll(&userStyleSheet);
+
+ removeUserContentWorldUses(world.get(), 1);
}
+void WebUserContentControllerProxy::removeAllUserStyleSheets(API::UserContentWorld& world)
+{
+ for (WebProcessProxy* process : m_processes)
+ process->connection()->send(Messages::WebUserContentController::RemoveAllUserStyleSheets({ world.identifier() }), m_identifier);
+
+ unsigned userStyleSheetsRemoved = m_userStyleSheets->removeAllOfTypeMatching<API::UserStyleSheet>([&] (const RefPtr<API::UserStyleSheet>& userStyleSheet) -> bool {
+ return &userStyleSheet->userContentWorld() == &world;
+ });
+
+ removeUserContentWorldUses(world, userStyleSheetsRemoved);
+}
+
void WebUserContentControllerProxy::removeAllUserStyleSheets()
{
+ HashCountedSet<RefPtr<API::UserContentWorld>> worlds;
+ for (const auto& userStyleSheet : m_userStyleSheets->elementsOfType<API::UserStyleSheet>())
+ worlds.add(const_cast<API::UserContentWorld*>(&userStyleSheet->userContentWorld()));
+
+ Vector<uint64_t> worldIdentifiers;
+ worldIdentifiers.reserveInitialCapacity(worlds.size());
+ for (const auto& worldCountPair : worlds)
+ worldIdentifiers.uncheckedAppend(worldCountPair.key->identifier());
+
+ for (WebProcessProxy* process : m_processes)
+ process->connection()->send(Messages::WebUserContentController::RemoveAllUserStyleSheets(worldIdentifiers), m_identifier);
+
m_userStyleSheets->elements().clear();
- for (WebProcessProxy* process : m_processes)
- process->connection()->send(Messages::WebUserContentController::RemoveAllUserStyleSheets(), m_identifier);
+ removeUserContentWorldUses(worlds);
}
bool WebUserContentControllerProxy::addUserScriptMessageHandler(WebScriptMessageHandler* handler)
Modified: trunk/Source/WebKit2/UIProcess/UserContent/WebUserContentControllerProxy.h (197301 => 197302)
--- trunk/Source/WebKit2/UIProcess/UserContent/WebUserContentControllerProxy.h 2016-02-28 21:00:15 UTC (rev 197301)
+++ trunk/Source/WebKit2/UIProcess/UserContent/WebUserContentControllerProxy.h 2016-02-28 21:56:44 UTC (rev 197302)
@@ -76,13 +76,17 @@
API::Array& userScripts() { return m_userScripts.get(); }
void addUserScript(API::UserScript&);
void removeUserScript(API::UserScript&);
+ void removeAllUserScripts(API::UserContentWorld&);
void removeAllUserScripts();
API::Array& userStyleSheets() { return m_userStyleSheets.get(); }
void addUserStyleSheet(API::UserStyleSheet&);
- void removeUserStyleSheet(const API::UserStyleSheet&);
+ void removeUserStyleSheet(API::UserStyleSheet&);
+ void removeAllUserStyleSheets(API::UserContentWorld&);
void removeAllUserStyleSheets();
+ void removeAllUserContent(API::UserContentWorld&);
+
// Returns false if there was a name conflict.
bool addUserScriptMessageHandler(WebScriptMessageHandler*);
void removeUserMessageHandlerForName(const String&);
@@ -99,6 +103,11 @@
void didPostMessage(IPC::Connection&, uint64_t pageID, uint64_t frameID, const WebCore::SecurityOriginData&, uint64_t messageHandlerID, const IPC::DataReference&);
+ void addUserContentWorldUse(API::UserContentWorld&);
+ void removeUserContentWorldUses(API::UserContentWorld&, unsigned numberOfUsesToRemove);
+ void removeUserContentWorldUses(HashCountedSet<RefPtr<API::UserContentWorld>>&);
+ bool shouldSendRemoveUserContentWorldsMessage(API::UserContentWorld&, unsigned numberOfUsesToRemove);
+
uint64_t m_identifier;
HashSet<WebProcessProxy*> m_processes;
Ref<API::Array> m_userScripts;
Modified: trunk/Source/WebKit2/WebProcess/UserContent/WebUserContentController.cpp (197301 => 197302)
--- trunk/Source/WebKit2/WebProcess/UserContent/WebUserContentController.cpp 2016-02-28 21:00:15 UTC (rev 197301)
+++ trunk/Source/WebKit2/WebProcess/UserContent/WebUserContentController.cpp 2016-02-28 21:56:44 UTC (rev 197302)
@@ -105,21 +105,23 @@
}
}
-void WebUserContentController::removeUserContentWorld(uint64_t worldIdentifier)
+void WebUserContentController::removeUserContentWorlds(const Vector<uint64_t>& worldIdentifiers)
{
- ASSERT(worldIdentifier);
- ASSERT(worldIdentifier != 1);
+ for (auto& worldIdentifier : worldIdentifiers) {
+ ASSERT(worldIdentifier);
+ ASSERT(worldIdentifier != 1);
- auto it = worldMap().find(worldIdentifier);
- if (it == worldMap().end()) {
- WTFLogAlways("Trying to remove a UserContentWorld (id=%" PRIu64 ") that does not exist.", worldIdentifier);
- return;
+ auto it = worldMap().find(worldIdentifier);
+ if (it == worldMap().end()) {
+ WTFLogAlways("Trying to remove a UserContentWorld (id=%" PRIu64 ") that is does not exist.", worldIdentifier);
+ return;
+ }
+
+ it->value.second--;
+
+ if (!it->value.second)
+ worldMap().remove(it);
}
-
- it->value.second--;
-
- if (!it->value.second)
- worldMap().remove(it);
}
void WebUserContentController::addUserScripts(const Vector<std::pair<uint64_t, WebCore::UserScript>>& userScripts)
@@ -146,33 +148,54 @@
m_userContentController->removeUserScript(it->value.first->coreWorld(), URL(URL(), urlString));
}
-void WebUserContentController::removeAllUserScripts(uint64_t worldIdentifier)
+void WebUserContentController::removeAllUserScripts(const Vector<uint64_t>& worldIdentifiers)
{
- auto it = worldMap().find(worldIdentifier);
- if (it == worldMap().end()) {
- WTFLogAlways("Trying to remove all UserScripts from a UserContentWorld (id=%" PRIu64 ") that does not exist.", worldIdentifier);
- return;
+ for (auto& worldIdentifier : worldIdentifiers) {
+ auto it = worldMap().find(worldIdentifier);
+ if (it == worldMap().end()) {
+ WTFLogAlways("Trying to remove all UserScripts from a UserContentWorld (id=%" PRIu64 ") that does not exist.", worldIdentifier);
+ return;
+ }
+
+ m_userContentController->removeUserScripts(it->value.first->coreWorld());
}
-
- m_userContentController->removeUserScripts(it->value.first->coreWorld());
}
-void WebUserContentController::addUserStyleSheets(const Vector<WebCore::UserStyleSheet>& userStyleSheets)
+void WebUserContentController::addUserStyleSheets(const Vector<std::pair<uint64_t, WebCore::UserStyleSheet>>& userStyleSheets)
{
- for (const auto& userStyleSheet : userStyleSheets) {
- m_userContentController->addUserStyleSheet(mainThreadNormalWorld(),
- std::make_unique<WebCore::UserStyleSheet>(userStyleSheet), InjectInExistingDocuments);
+ for (const auto& userStyleSheetWorldPair : userStyleSheets) {
+ auto it = worldMap().find(userStyleSheetWorldPair.first);
+ if (it == worldMap().end()) {
+ WTFLogAlways("Trying to add a UserStyleSheet to a UserContentWorld (id=%" PRIu64 ") that does not exist.", userStyleSheetWorldPair.first);
+ continue;
+ }
+
+ m_userContentController->addUserStyleSheet(it->value.first->coreWorld(), std::make_unique<WebCore::UserStyleSheet>(userStyleSheetWorldPair.second), InjectInExistingDocuments);
}
}
-void WebUserContentController::removeUserStyleSheet(const String& urlString)
+void WebUserContentController::removeUserStyleSheet(uint64_t worldIdentifier, const String& urlString)
{
- m_userContentController->removeUserStyleSheet(mainThreadNormalWorld(), URL(URL(), urlString));
+ auto it = worldMap().find(worldIdentifier);
+ if (it == worldMap().end()) {
+ WTFLogAlways("Trying to remove a UserStyleSheet from a UserContentWorld (id=%" PRIu64 ") that does not exist.", worldIdentifier);
+ return;
+ }
+
+ m_userContentController->removeUserStyleSheet(it->value.first->coreWorld(), URL(URL(), urlString));
}
-void WebUserContentController::removeAllUserStyleSheets()
+void WebUserContentController::removeAllUserStyleSheets(const Vector<uint64_t>& worldIdentifiers)
{
- m_userContentController->removeUserStyleSheets(mainThreadNormalWorld());
+ for (auto& worldIdentifier : worldIdentifiers) {
+ auto it = worldMap().find(worldIdentifier);
+ if (it == worldMap().end()) {
+ WTFLogAlways("Trying to remove all UserStyleSheets from a UserContentWorld (id=%" PRIu64 ") that does not exist.", worldIdentifier);
+ return;
+ }
+
+ m_userContentController->removeUserStyleSheets(it->value.first->coreWorld());
+ }
}
#if ENABLE(USER_MESSAGE_HANDLERS)
Modified: trunk/Source/WebKit2/WebProcess/UserContent/WebUserContentController.h (197301 => 197302)
--- trunk/Source/WebKit2/WebProcess/UserContent/WebUserContentController.h 2016-02-28 21:00:15 UTC (rev 197301)
+++ trunk/Source/WebKit2/WebProcess/UserContent/WebUserContentController.h 2016-02-28 21:56:44 UTC (rev 197302)
@@ -54,15 +54,15 @@
virtual void didReceiveMessage(IPC::Connection&, IPC::MessageDecoder&) override;
void addUserContentWorlds(const Vector<std::pair<uint64_t, String>>&);
- void removeUserContentWorld(uint64_t);
+ void removeUserContentWorlds(const Vector<uint64_t>&);
void addUserScripts(const Vector<std::pair<uint64_t, WebCore::UserScript>>&);
void removeUserScript(uint64_t worldIdentifier, const String& urlString);
- void removeAllUserScripts(uint64_t worldIdentifier);
+ void removeAllUserScripts(const Vector<uint64_t>&);
- void addUserStyleSheets(const Vector<WebCore::UserStyleSheet>&);
- void removeUserStyleSheet(const String& urlString);
- void removeAllUserStyleSheets();
+ void addUserStyleSheets(const Vector<std::pair<uint64_t, WebCore::UserStyleSheet>>&);
+ void removeUserStyleSheet(uint64_t worldIdentifier, const String& urlString);
+ void removeAllUserStyleSheets(const Vector<uint64_t>&);
void addUserScriptMessageHandlers(const Vector<WebScriptMessageHandlerHandle>&);
void removeUserScriptMessageHandler(uint64_t);
Modified: trunk/Source/WebKit2/WebProcess/UserContent/WebUserContentController.messages.in (197301 => 197302)
--- trunk/Source/WebKit2/WebProcess/UserContent/WebUserContentController.messages.in 2016-02-28 21:00:15 UTC (rev 197301)
+++ trunk/Source/WebKit2/WebProcess/UserContent/WebUserContentController.messages.in 2016-02-28 21:56:44 UTC (rev 197302)
@@ -25,15 +25,15 @@
messages -> WebUserContentController {
AddUserContentWorlds(Vector<std::pair<uint64_t, String>> worlds);
- RemoveUserContentWorld(uint64_t worldIdentifier);
+ RemoveUserContentWorlds(Vector<uint64_t> worldIdentifiers);
AddUserScripts(Vector<std::pair<uint64_t, WebCore::UserScript>> userScripts);
RemoveUserScript(uint64_t worldIdentifier, String url);
- RemoveAllUserScripts(uint64_t worldIdentifier);
+ RemoveAllUserScripts(Vector<uint64_t> worldIdentifiers);
- AddUserStyleSheets(Vector<WebCore::UserStyleSheet> userStyleSheets);
- RemoveUserStyleSheet(String url);
- RemoveAllUserStyleSheets();
+ AddUserStyleSheets(Vector<std::pair<uint64_t, WebCore::UserStyleSheet>> userStyleSheets);
+ RemoveUserStyleSheet(uint64_t worldIdentifier, String url);
+ RemoveAllUserStyleSheets(Vector<uint64_t> worldIdentifiers);
AddUserScriptMessageHandlers(Vector<WebKit::WebScriptMessageHandlerHandle> scriptMessageHandlers);
RemoveUserScriptMessageHandler(uint64_t identifier);
Modified: trunk/Tools/ChangeLog (197301 => 197302)
--- trunk/Tools/ChangeLog 2016-02-28 21:00:15 UTC (rev 197301)
+++ trunk/Tools/ChangeLog 2016-02-28 21:56:44 UTC (rev 197302)
@@ -1,3 +1,13 @@
+2016-02-28 Sam Weinig <s...@webkit.org>
+
+ Bind _WKUserStyleSheets to WKUserContentWorlds to allow for grouping of user content by associating to a world
+ https://bugs.webkit.org/show_bug.cgi?id=154798
+
+ Reviewed by Dan Bernstein.
+
+ * TestWebKitAPI/Tests/WebKit2Cocoa/UserContentController.mm:
+ Add tests for removing _WKUserStyleSheets and WKUserScripts
+
2016-02-27 Alexey Proskuryakov <a...@apple.com>
Silence leaks under TextCodecICU::registerCodecs
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/UserContentController.mm (197301 => 197302)
--- trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/UserContentController.mm 2016-02-28 21:00:15 UTC (rev 197301)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/UserContentController.mm 2016-02-28 21:56:44 UTC (rev 197302)
@@ -27,11 +27,15 @@
#import "PlatformUtilities.h"
#import "Test.h"
-#import <WebKit/WebKit.h>
#import <WebKit/WKProcessPoolPrivate.h>
#import <WebKit/WKUserContentControllerPrivate.h>
+#import <WebKit/WKUserScript.h>
+#import <WebKit/WKUserScriptPrivate.h>
+#import <WebKit/WebKit.h>
#import <WebKit/_WKProcessPoolConfiguration.h>
+#import <WebKit/_WKUserContentWorld.h>
#import <WebKit/_WKUserStyleSheet.h>
+#import <WebKit/_WKUserStyleSheet.h>
#import <wtf/RetainPtr.h>
#if WK_API_ENABLED
@@ -365,4 +369,176 @@
expectScriptEvaluatesToColor(webView.get(), frameBackgroundColorScript, greenInRGB);
}
+TEST(WKUserContentController, UserStyleSheetRemove)
+{
+ RetainPtr<WKUserContentController> userContentController = adoptNS([[WKUserContentController alloc] init]);
+ RetainPtr<_WKUserStyleSheet> styleSheet = adoptNS([[_WKUserStyleSheet alloc] initWithSource:styleSheetSource forMainFrameOnly:NO]);
+ [userContentController _addUserStyleSheet:styleSheet.get()];
+
+ EXPECT_EQ(1u, [userContentController _userStyleSheets].count);
+ EXPECT_EQ(styleSheet.get(), [userContentController _userStyleSheets][0]);
+
+ [userContentController _removeUserStyleSheet:styleSheet.get()];
+
+ EXPECT_EQ(0u, [userContentController _userStyleSheets].count);
+}
+
+TEST(WKUserContentController, UserStyleSheetRemoveAll)
+{
+ RetainPtr<WKUserContentController> userContentController = adoptNS([[WKUserContentController alloc] init]);
+
+ RetainPtr<_WKUserContentWorld> world = adoptNS([_WKUserContentWorld worldWithName:@"TestWorld"]);
+
+ RetainPtr<_WKUserStyleSheet> styleSheet = adoptNS([[_WKUserStyleSheet alloc] initWithSource:styleSheetSource forMainFrameOnly:NO]);
+ RetainPtr<_WKUserStyleSheet> styleSheetAssociatedWithWorld = adoptNS([[_WKUserStyleSheet alloc] initWithSource:styleSheetSource forMainFrameOnly:NO legacyWhitelist:@[] legacyBlacklist:@[] userContentWorld:world.get()]);
+
+ [userContentController _addUserStyleSheet:styleSheet.get()];
+ [userContentController _addUserStyleSheet:styleSheetAssociatedWithWorld.get()];
+
+ EXPECT_EQ(2u, [userContentController _userStyleSheets].count);
+ EXPECT_EQ(styleSheet.get(), [userContentController _userStyleSheets][0]);
+ EXPECT_EQ(styleSheetAssociatedWithWorld.get(), [userContentController _userStyleSheets][1]);
+
+ [userContentController _removeAllUserStyleSheets];
+
+ EXPECT_EQ(0u, [userContentController _userStyleSheets].count);
+}
+
+TEST(WKUserContentController, UserStyleSheetRemoveAllByWorld)
+{
+ RetainPtr<WKUserContentController> userContentController = adoptNS([[WKUserContentController alloc] init]);
+
+ RetainPtr<_WKUserContentWorld> world = adoptNS([_WKUserContentWorld worldWithName:@"TestWorld"]);
+
+ RetainPtr<_WKUserStyleSheet> styleSheet = adoptNS([[_WKUserStyleSheet alloc] initWithSource:styleSheetSource forMainFrameOnly:NO]);
+ RetainPtr<_WKUserStyleSheet> styleSheetAssociatedWithWorld = adoptNS([[_WKUserStyleSheet alloc] initWithSource:styleSheetSource forMainFrameOnly:NO legacyWhitelist:@[] legacyBlacklist:@[] userContentWorld:world.get()]);
+ RetainPtr<_WKUserStyleSheet> styleSheetAssociatedWithWorld2 = adoptNS([[_WKUserStyleSheet alloc] initWithSource:styleSheetSource forMainFrameOnly:NO legacyWhitelist:@[] legacyBlacklist:@[] userContentWorld:world.get()]);
+
+ [userContentController _addUserStyleSheet:styleSheet.get()];
+ [userContentController _addUserStyleSheet:styleSheetAssociatedWithWorld.get()];
+ [userContentController _addUserStyleSheet:styleSheetAssociatedWithWorld2.get()];
+
+ EXPECT_EQ(3u, [userContentController _userStyleSheets].count);
+ EXPECT_EQ(styleSheet.get(), [userContentController _userStyleSheets][0]);
+ EXPECT_EQ(styleSheetAssociatedWithWorld.get(), [userContentController _userStyleSheets][1]);
+ EXPECT_EQ(styleSheetAssociatedWithWorld2.get(), [userContentController _userStyleSheets][2]);
+
+ [userContentController _removeAllUserStyleSheetsAssociatedWithUserContentWorld:world.get()];
+
+ EXPECT_EQ(1u, [userContentController _userStyleSheets].count);
+ EXPECT_EQ(styleSheet.get(), [userContentController _userStyleSheets][0]);
+}
+
+TEST(WKUserContentController, UserStyleSheetRemoveAllByNormalWorld)
+{
+ RetainPtr<WKUserContentController> userContentController = adoptNS([[WKUserContentController alloc] init]);
+
+ RetainPtr<_WKUserContentWorld> world = adoptNS([_WKUserContentWorld worldWithName:@"TestWorld"]);
+
+ RetainPtr<_WKUserStyleSheet> styleSheet = adoptNS([[_WKUserStyleSheet alloc] initWithSource:styleSheetSource forMainFrameOnly:NO]);
+ RetainPtr<_WKUserStyleSheet> styleSheetAssociatedWithWorld = adoptNS([[_WKUserStyleSheet alloc] initWithSource:styleSheetSource forMainFrameOnly:NO legacyWhitelist:@[] legacyBlacklist:@[] userContentWorld:world.get()]);
+ RetainPtr<_WKUserStyleSheet> styleSheetAssociatedWithWorld2 = adoptNS([[_WKUserStyleSheet alloc] initWithSource:styleSheetSource forMainFrameOnly:NO legacyWhitelist:@[] legacyBlacklist:@[] userContentWorld:world.get()]);
+
+ [userContentController _addUserStyleSheet:styleSheet.get()];
+ [userContentController _addUserStyleSheet:styleSheetAssociatedWithWorld.get()];
+ [userContentController _addUserStyleSheet:styleSheetAssociatedWithWorld2.get()];
+
+ EXPECT_EQ(3u, [userContentController _userStyleSheets].count);
+ EXPECT_EQ(styleSheet.get(), [userContentController _userStyleSheets][0]);
+ EXPECT_EQ(styleSheetAssociatedWithWorld.get(), [userContentController _userStyleSheets][1]);
+ EXPECT_EQ(styleSheetAssociatedWithWorld2.get(), [userContentController _userStyleSheets][2]);
+
+ [userContentController _removeAllUserStyleSheetsAssociatedWithUserContentWorld:[_WKUserContentWorld normalWorld]];
+
+ EXPECT_EQ(2u, [userContentController _userStyleSheets].count);
+ EXPECT_EQ(styleSheetAssociatedWithWorld.get(), [userContentController _userStyleSheets][0]);
+ EXPECT_EQ(styleSheetAssociatedWithWorld2.get(), [userContentController _userStyleSheets][1]);
+}
+
+TEST(WKUserContentController, UserScriptRemove)
+{
+ RetainPtr<WKUserContentController> userContentController = adoptNS([[WKUserContentController alloc] init]);
+ RetainPtr<WKUserScript> userScript = adoptNS([[WKUserScript alloc] initWithSource:@"" injectionTime:WKUserScriptInjectionTimeAtDocumentStart forMainFrameOnly:NO]);
+ [userContentController addUserScript:userScript.get()];
+
+ EXPECT_EQ(1u, [userContentController userScripts].count);
+ EXPECT_EQ(userScript.get(), [userContentController userScripts][0]);
+
+ [userContentController _removeUserScript:userScript.get()];
+
+ EXPECT_EQ(0u, [userContentController userScripts].count);
+}
+
+TEST(WKUserContentController, UserScriptRemoveAll)
+{
+ RetainPtr<WKUserContentController> userContentController = adoptNS([[WKUserContentController alloc] init]);
+
+ RetainPtr<_WKUserContentWorld> world = adoptNS([_WKUserContentWorld worldWithName:@"TestWorld"]);
+
+ RetainPtr<WKUserScript> userScript = adoptNS([[WKUserScript alloc] initWithSource:@"" injectionTime:WKUserScriptInjectionTimeAtDocumentStart forMainFrameOnly:NO]);
+ RetainPtr<WKUserScript> userScriptAssociatedWithWorld = adoptNS([[WKUserScript alloc] _initWithSource:@"" injectionTime:WKUserScriptInjectionTimeAtDocumentStart forMainFrameOnly:NO legacyWhitelist:@[] legacyBlacklist:@[] userContentWorld:world.get()]);
+
+ [userContentController addUserScript:userScript.get()];
+ [userContentController addUserScript:userScriptAssociatedWithWorld.get()];
+
+ EXPECT_EQ(2u, [userContentController userScripts].count);
+ EXPECT_EQ(userScript.get(), [userContentController userScripts][0]);
+ EXPECT_EQ(userScriptAssociatedWithWorld.get(), [userContentController userScripts][1]);
+
+ [userContentController removeAllUserScripts];
+
+ EXPECT_EQ(0u, [userContentController userScripts].count);
+}
+
+TEST(WKUserContentController, UserScriptRemoveAllByWorld)
+{
+ RetainPtr<WKUserContentController> userContentController = adoptNS([[WKUserContentController alloc] init]);
+
+ RetainPtr<_WKUserContentWorld> world = adoptNS([_WKUserContentWorld worldWithName:@"TestWorld"]);
+
+ RetainPtr<WKUserScript> userScript = adoptNS([[WKUserScript alloc] initWithSource:@"" injectionTime:WKUserScriptInjectionTimeAtDocumentStart forMainFrameOnly:NO]);
+ RetainPtr<WKUserScript> userScriptAssociatedWithWorld = adoptNS([[WKUserScript alloc] _initWithSource:@"" injectionTime:WKUserScriptInjectionTimeAtDocumentStart forMainFrameOnly:NO legacyWhitelist:@[] legacyBlacklist:@[] userContentWorld:world.get()]);
+ RetainPtr<WKUserScript> userScriptAssociatedWithWorld2 = adoptNS([[WKUserScript alloc] _initWithSource:@"" injectionTime:WKUserScriptInjectionTimeAtDocumentStart forMainFrameOnly:NO legacyWhitelist:@[] legacyBlacklist:@[] userContentWorld:world.get()]);
+
+ [userContentController addUserScript:userScript.get()];
+ [userContentController addUserScript:userScriptAssociatedWithWorld.get()];
+ [userContentController addUserScript:userScriptAssociatedWithWorld2.get()];
+
+ EXPECT_EQ(3u, [userContentController userScripts].count);
+ EXPECT_EQ(userScript.get(), [userContentController userScripts][0]);
+ EXPECT_EQ(userScriptAssociatedWithWorld.get(), [userContentController userScripts][1]);
+ EXPECT_EQ(userScriptAssociatedWithWorld2.get(), [userContentController userScripts][2]);
+
+ [userContentController _removeAllUserScriptsAssociatedWithUserContentWorld:world.get()];
+
+ EXPECT_EQ(1u, [userContentController userScripts].count);
+ EXPECT_EQ(userScript.get(), [userContentController userScripts][0]);
+}
+
+TEST(WKUserContentController, UserScriptRemoveAllByNormalWorld)
+{
+ RetainPtr<WKUserContentController> userContentController = adoptNS([[WKUserContentController alloc] init]);
+
+ RetainPtr<_WKUserContentWorld> world = adoptNS([_WKUserContentWorld worldWithName:@"TestWorld"]);
+
+ RetainPtr<WKUserScript> userScript = adoptNS([[WKUserScript alloc] initWithSource:@"" injectionTime:WKUserScriptInjectionTimeAtDocumentStart forMainFrameOnly:NO]);
+ RetainPtr<WKUserScript> userScriptAssociatedWithWorld = adoptNS([[WKUserScript alloc] _initWithSource:@"" injectionTime:WKUserScriptInjectionTimeAtDocumentStart forMainFrameOnly:NO legacyWhitelist:@[] legacyBlacklist:@[] userContentWorld:world.get()]);
+ RetainPtr<WKUserScript> userScriptAssociatedWithWorld2 = adoptNS([[WKUserScript alloc] _initWithSource:@"" injectionTime:WKUserScriptInjectionTimeAtDocumentStart forMainFrameOnly:NO legacyWhitelist:@[] legacyBlacklist:@[] userContentWorld:world.get()]);
+
+ [userContentController addUserScript:userScript.get()];
+ [userContentController addUserScript:userScriptAssociatedWithWorld.get()];
+ [userContentController addUserScript:userScriptAssociatedWithWorld2.get()];
+
+ EXPECT_EQ(3u, [userContentController userScripts].count);
+ EXPECT_EQ(userScript.get(), [userContentController userScripts][0]);
+ EXPECT_EQ(userScriptAssociatedWithWorld.get(), [userContentController userScripts][1]);
+ EXPECT_EQ(userScriptAssociatedWithWorld2.get(), [userContentController userScripts][2]);
+
+ [userContentController _removeAllUserScriptsAssociatedWithUserContentWorld:[_WKUserContentWorld normalWorld]];
+
+ EXPECT_EQ(2u, [userContentController userScripts].count);
+ EXPECT_EQ(userScriptAssociatedWithWorld.get(), [userContentController userScripts][0]);
+ EXPECT_EQ(userScriptAssociatedWithWorld2.get(), [userContentController userScripts][1]);
+}
+
#endif
