webkitgtk-2.16.5HEADwebkitgtk-2.16.5master

1 files changed, 12 insertions, 33 deletions

diff --git a/Source/WebKit2/WebProcess/WebPage/WebPageGroupProxy.cpp b/Source/WebKit2/WebProcess/WebPage/WebPageGroupProxy.cpp
index 9164f480e..c6fb72196 100644
--- a/Source/WebKit2/WebProcess/WebPage/WebPageGroupProxy.cpp
+++ b/Source/WebKit2/WebProcess/WebPage/WebPageGroupProxy.cpp
@@ -26,60 +26,39 @@
 #include "config.h"
 #include "WebPageGroupProxy.h"
 
-#include "WebProcess.h"
 #include "InjectedBundle.h"
+#include "WebProcess.h"
+#include "WebUserContentController.h"
 #include <WebCore/DOMWrapperWorld.h>
 #include <WebCore/PageGroup.h>
+#include <WebCore/UserContentController.h>
 
 namespace WebKit {
 
 PassRefPtr<WebPageGroupProxy> WebPageGroupProxy::create(const WebPageGroupData& data)
 {
-    RefPtr<WebPageGroupProxy> pageGroup = adoptRef(new WebPageGroupProxy(data));
-    
-    if (pageGroup->isVisibleToInjectedBundle() && WebProcess::shared().injectedBundle())
-        WebProcess::shared().injectedBundle()->didInitializePageGroup(pageGroup.get());
+    auto pageGroup = adoptRef(*new WebPageGroupProxy(data));
 
-    return pageGroup.release();
-}
+    if (pageGroup->isVisibleToInjectedBundle() && WebProcess::singleton().injectedBundle())
+        WebProcess::singleton().injectedBundle()->didInitializePageGroup(pageGroup.ptr());
 
-WebPageGroupProxy::~WebPageGroupProxy()
-{
+    return WTFMove(pageGroup);
 }
 
 WebPageGroupProxy::WebPageGroupProxy(const WebPageGroupData& data)
     : m_data(data)
-    , m_pageGroup(WebCore::PageGroup::pageGroup(m_data.identifer))
-{
-    for (size_t i = 0; i < data.userStyleSheets.size(); ++i)
-        addUserStyleSheet(data.userStyleSheets[i]);
-    for (size_t i = 0; i < data.userScripts.size(); ++i)
-        addUserScript(data.userScripts[i]);
-}
-
-void WebPageGroupProxy::addUserStyleSheet(const WebCore::UserStyleSheet& userStyleSheet)
+    , m_pageGroup(WebCore::PageGroup::pageGroup(m_data.identifier))
+    , m_userContentController(WebUserContentController::getOrCreate(m_data.userContentControllerIdentifier))
 {
-    m_pageGroup->addUserStyleSheetToWorld(WebCore::mainThreadNormalWorld(), userStyleSheet.source(), userStyleSheet.url(), userStyleSheet.whitelist(), userStyleSheet.blacklist(), userStyleSheet.injectedFrames(), userStyleSheet.level());
 }
 
-void WebPageGroupProxy::addUserScript(const WebCore::UserScript& userScript)
-{
-    m_pageGroup->addUserScriptToWorld(WebCore::mainThreadNormalWorld(), userScript.source(), userScript.url(), userScript.whitelist(), userScript.blacklist(), userScript.injectionTime(), userScript.injectedFrames());
-}
-
-void WebPageGroupProxy::removeAllUserStyleSheets()
-{
-    m_pageGroup->removeUserStyleSheetsFromWorld(WebCore::mainThreadNormalWorld());
-}
-
-void WebPageGroupProxy::removeAllUserScripts()
+WebPageGroupProxy::~WebPageGroupProxy()
 {
-    m_pageGroup->removeUserScriptsFromWorld(WebCore::mainThreadNormalWorld());
 }
 
-void WebPageGroupProxy::removeAllUserContent()
+WebUserContentController& WebPageGroupProxy::userContentController()
 {
-    m_pageGroup->removeAllUserContent();
+    return m_userContentController;
 }
 
 } // namespace WebKit