Modified: trunk/Source/WebKit/mac/ChangeLog (176541 => 176542)
--- trunk/Source/WebKit/mac/ChangeLog 2014-11-25 14:49:30 UTC (rev 176541)
+++ trunk/Source/WebKit/mac/ChangeLog 2014-11-25 16:16:15 UTC (rev 176542)
@@ -1,3 +1,43 @@
+2014-11-25 Anders Carlsson <[email protected]>
+
+ Add a user content controller to WebViewGroup and use it for user content
+ https://bugs.webkit.org/show_bug.cgi?id=139043
+
+ Reviewed by Antti Koivisto.
+
+ This is another tiny step towards getting rid of user content handling inside PageGroup.
+
+ * WebCoreSupport/WebViewGroup.h:
+ (WebViewGroup::userContentController):
+ Add a UserContentController member and getter.
+
+ * WebCoreSupport/WebViewGroup.mm:
+ (WebViewGroup::get):
+ Helper function that returns a WebViewGroup by its name (or null if it doesn't exist).
+
+ (WebViewGroup::WebViewGroup):
+ Create a user content controller.
+
+ * WebView/WebView.mm:
+ (-[WebView _commonInitializationWithFrameName:groupName:]):
+ Instead of calling -[WebView setGroupName:], create a WebViewGroup before creating the page, that way we can
+ set its user content controller in the PageConfiguration.
+
+ (-[WebView initSimpleHTMLDocumentWithStyle:frame:preferences:groupName:]):
+ Ditto.
+
+ (+[WebView _addUserScriptToGroup:world:source:url:whitelist:blacklist:injectionTime:injectedFrames:]):
+ (+[WebView _addUserStyleSheetToGroup:world:source:url:whitelist:blacklist:injectedFrames:]):
+ (+[WebView _removeUserScriptFromGroup:world:url:]):
+ (+[WebView _removeUserStyleSheetFromGroup:world:url:]):
+ (+[WebView _removeUserScriptsFromGroup:world:]):
+ (+[WebView _removeUserStyleSheetsFromGroup:world:]):
+ (+[WebView _removeAllUserContentFromGroup:]):
+ Instead of calling into the PageGroup, get the WebViewGroup's user content controller and call into that.
+
+ (-[WebView setGroupName:]):
+ Set the user content controller to the new WebViewGroup's user content controller.
+
2014-11-21 Jer Noble <[email protected]>
Support multiple signatures of diagnostic logging.
Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebViewGroup.mm (176541 => 176542)
--- trunk/Source/WebKit/mac/WebCoreSupport/WebViewGroup.mm 2014-11-25 14:49:30 UTC (rev 176541)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebViewGroup.mm 2014-11-25 16:16:15 UTC (rev 176542)
@@ -26,11 +26,11 @@
#import "WebViewGroup.h"
#import "WebView.h"
-#import <wtf/HashMap.h>
#import <wtf/NeverDestroyed.h>
-#import <wtf/RefPtr.h>
#import <wtf/text/StringHash.h>
+using namespace WebCore;
+
// Any named groups will live for the lifetime of the process, thanks to the reference held by the RefPtr.
static HashMap<String, RefPtr<WebViewGroup>>& webViewGroups()
{
@@ -51,8 +51,16 @@
return webViewGroup;
}
+WebViewGroup* WebViewGroup::get(const String& name)
+{
+ ASSERT(!name.isEmpty());
+
+ return webViewGroups().get(name);
+}
+
WebViewGroup::WebViewGroup(const String& name)
: m_name(name)
+ , m_userContentController(*UserContentController::create())
{
}
Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (176541 => 176542)
--- trunk/Source/WebKit/mac/WebView/WebView.mm 2014-11-25 14:49:30 UTC (rev 176541)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm 2014-11-25 16:16:15 UTC (rev 176542)
@@ -176,6 +176,7 @@
#import <WebCore/TextResourceDecoder.h>
#import <WebCore/ThreadCheck.h>
#import <WebCore/UserAgent.h>
+#import <WebCore/UserContentController.h>
#import <WebCore/WebCoreObjCExtras.h>
#import <WebCore/WebCoreView.h>
#import <WebCore/Widget.h>
@@ -919,6 +920,9 @@
didOneTimeInitialization = true;
}
+ _private->group = WebViewGroup::getOrCreate(groupName);
+ _private->group->addWebView(self);
+
PageConfiguration pageConfiguration;
#if !PLATFORM(IOS)
pageConfiguration.chromeClient = new WebChromeClient(self);
@@ -935,7 +939,11 @@
pageConfiguration.alternativeTextClient = new WebAlternativeTextClient(self);
pageConfiguration.loaderClientForMainFrame = new WebFrameLoaderClient;
pageConfiguration.progressTrackerClient = new WebProgressTrackerClient(self);
+ pageConfiguration.userContentController = &_private->group->userContentController();
_private->page = new Page(pageConfiguration);
+
+ _private->page->setGroupName(groupName);
+
#if ENABLE(GEOLOCATION)
WebCore::provideGeolocationTo(_private->page, new WebGeolocationClient(self));
#endif
@@ -992,7 +1000,6 @@
#endif
[self _addToAllWebViewsSet];
- [self setGroupName:groupName];
// If there's already a next key view (e.g., from a nib), wire it up to our
// contained frame view. In any case, wire our next key view up to the our
@@ -1155,7 +1162,9 @@
[self addSubview:frameView];
[frameView release];
-
+ _private->group = WebViewGroup::getOrCreate(groupName);
+ _private->group->addWebView(self);
+
PageConfiguration pageConfiguration;
pageConfiguration.chromeClient = new WebChromeClientIOS(self);
#if ENABLE(DRAG_SUPPORT)
@@ -1165,6 +1174,8 @@
pageConfiguration.inspectorClient = new WebInspectorClient(self);
pageConfiguration.loaderClientForMainFrame = new WebFrameLoaderClient;
pageConfiguration.progressTrackerClient = new WebProgressTrackerClient(self);
+ pageConfiguration.userContentController = &_private->group->userContentController();
+
_private->page = new Page(pageConfiguration);
[self setSmartInsertDeleteEnabled:YES];
@@ -1192,7 +1203,7 @@
// FIXME: this is a workaround for <rdar://problem/11820090> Quoted text changes in size when replying to certain email
_private->page->settings().setMinimumFontSize([_private->preferences minimumFontSize]);
- [self setGroupName:groupName];
+ _private->page->setGroupName(groupName);
#if ENABLE(REMOTE_INSPECTOR)
_private->page->setRemoteInspectionAllowed(isInternalInstall());
@@ -3995,17 +4006,16 @@
String group(groupName);
if (group.isEmpty())
return;
-
- PageGroup* pageGroup = PageGroup::pageGroup(group);
- if (!pageGroup)
+
+ auto* viewGroup = WebViewGroup::get(group);
+ if (!viewGroup)
return;
if (!world)
return;
- pageGroup->addUserScriptToWorld(*core(world), source, url, toStringVector(whitelist), toStringVector(blacklist),
- injectionTime == WebInjectAtDocumentStart ? InjectAtDocumentStart : InjectAtDocumentEnd,
- injectedFrames == WebInjectInAllFrames ? InjectInAllFrames : InjectInTopFrameOnly);
+ auto userScript = std::make_unique<UserScript>(source, url, toStringVector(whitelist), toStringVector(blacklist), injectionTime == WebInjectAtDocumentStart ? InjectAtDocumentStart : InjectAtDocumentEnd, injectedFrames == WebInjectInAllFrames ? InjectInAllFrames : InjectInTopFrameOnly);
+ viewGroup->userContentController().addUserScript(*core(world), WTF::move(userScript));
}
+ (void)_addUserStyleSheetToGroup:(NSString *)groupName world:(WebScriptWorld *)world source:(NSString *)source url:(NSURL *)url
@@ -4021,15 +4031,16 @@
String group(groupName);
if (group.isEmpty())
return;
-
- PageGroup* pageGroup = PageGroup::pageGroup(group);
- if (!pageGroup)
+
+ auto* viewGroup = WebViewGroup::get(group);
+ if (!viewGroup)
return;
if (!world)
return;
- pageGroup->addUserStyleSheetToWorld(*core(world), source, url, toStringVector(whitelist), toStringVector(blacklist), injectedFrames == WebInjectInAllFrames ? InjectInAllFrames : InjectInTopFrameOnly);
+ auto styleSheet = std::make_unique<UserStyleSheet>(source, url, toStringVector(whitelist), toStringVector(blacklist), injectedFrames == WebInjectInAllFrames ? InjectInAllFrames : InjectInTopFrameOnly, UserStyleUserLevel);
+ viewGroup->userContentController().addUserStyleSheet(*core(world), WTF::move(styleSheet), InjectInExistingDocuments);
}
+ (void)_removeUserScriptFromGroup:(NSString *)groupName world:(WebScriptWorld *)world url:(NSURL *)url
@@ -4037,15 +4048,15 @@
String group(groupName);
if (group.isEmpty())
return;
-
- PageGroup* pageGroup = PageGroup::pageGroup(group);
- if (!pageGroup)
+
+ auto* viewGroup = WebViewGroup::get(group);
+ if (!viewGroup)
return;
if (!world)
return;
- pageGroup->removeUserScriptFromWorld(*core(world), url);
+ viewGroup->userContentController().removeUserScript(*core(world), url);
}
+ (void)_removeUserStyleSheetFromGroup:(NSString *)groupName world:(WebScriptWorld *)world url:(NSURL *)url
@@ -4053,15 +4064,15 @@
String group(groupName);
if (group.isEmpty())
return;
-
- PageGroup* pageGroup = PageGroup::pageGroup(group);
- if (!pageGroup)
+
+ auto* viewGroup = WebViewGroup::get(group);
+ if (!viewGroup)
return;
if (!world)
return;
- pageGroup->removeUserStyleSheetFromWorld(*core(world), url);
+ viewGroup->userContentController().removeUserStyleSheet(*core(world), url);
}
+ (void)_removeUserScriptsFromGroup:(NSString *)groupName world:(WebScriptWorld *)world
@@ -4069,15 +4080,15 @@
String group(groupName);
if (group.isEmpty())
return;
-
- PageGroup* pageGroup = PageGroup::pageGroup(group);
- if (!pageGroup)
+
+ auto* viewGroup = WebViewGroup::get(group);
+ if (!viewGroup)
return;
if (!world)
return;
- pageGroup->removeUserScriptsFromWorld(*core(world));
+ viewGroup->userContentController().removeUserScripts(*core(world));
}
+ (void)_removeUserStyleSheetsFromGroup:(NSString *)groupName world:(WebScriptWorld *)world
@@ -4085,15 +4096,15 @@
String group(groupName);
if (group.isEmpty())
return;
-
- PageGroup* pageGroup = PageGroup::pageGroup(group);
- if (!pageGroup)
+
+ auto* viewGroup = WebViewGroup::get(group);
+ if (!viewGroup)
return;
if (!world)
return;
- pageGroup->removeUserStyleSheetsFromWorld(*core(world));
+ viewGroup->userContentController().removeUserStyleSheets(*core(world));
}
+ (void)_removeAllUserContentFromGroup:(NSString *)groupName
@@ -4101,12 +4112,12 @@
String group(groupName);
if (group.isEmpty())
return;
-
- PageGroup* pageGroup = PageGroup::pageGroup(group);
- if (!pageGroup)
+
+ auto* viewGroup = WebViewGroup::get(group);
+ if (!viewGroup)
return;
-
- pageGroup->removeAllUserContent();
+
+ viewGroup->userContentController().removeAllUserContent();
}
- (BOOL)allowsNewCSSAnimationsWhileSuspended
@@ -6102,6 +6113,8 @@
if (!_private->page)
return;
+
+ _private->page->setUserContentController(&_private->group->userContentController());
_private->page->setGroupName(groupName);
}
