Imported QtWebKit TP3 (git b57bc6801f1876c3220d5a4bfea33d620d477443)

Change-Id: I3b1d8a2808782c9f34d50240000e20cb38d3680f
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>

1 files changed, 19 insertions, 6 deletions

diff --git a/Source/WebKit2/WebProcess/WebPage/WebPageGroupProxy.h b/Source/WebKit2/WebProcess/WebPage/WebPageGroupProxy.h
index 892f720f7..4da5255a0 100644
--- a/Source/WebKit2/WebProcess/WebPage/WebPageGroupProxy.h
+++ b/Source/WebKit2/WebProcess/WebPage/WebPageGroupProxy.h
@@ -30,32 +30,34 @@
 #include "WebPageGroupData.h"
 #include <wtf/PassRefPtr.h>
 
-namespace CoreIPC {
+namespace IPC {
 class Connection;
 class MessageDecoder;
 }
 
 namespace WebCore {
 class PageGroup;
+class UserContentController;
 }
 
 namespace WebKit {
 
-class WebPageGroupProxy : public TypedAPIObject<APIObject::TypeBundlePageGroup> {
+class WebCompiledContentExtensionData;
+
+class WebPageGroupProxy : public API::ObjectImpl<API::Object::Type::BundlePageGroup> {
 public:
     static PassRefPtr<WebPageGroupProxy> create(const WebPageGroupData&);
     virtual ~WebPageGroupProxy();
 
-    const String& identifier() const { return m_data.identifer; }
+    const String& identifier() const { return m_data.identifier; }
     uint64_t pageGroupID() const { return m_data.pageGroupID; }
     bool isVisibleToInjectedBundle() const { return m_data.visibleToInjectedBundle; }
     bool isVisibleToHistoryClient() const { return m_data.visibleToHistoryClient; }
     WebCore::PageGroup* corePageGroup() const { return m_pageGroup; }
 
-    void didReceiveMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&);
+    WebCore::UserContentController& userContentController();
 
-private:
-    WebPageGroupProxy(const WebPageGroupData&);
+    void didReceiveMessage(IPC::Connection&, IPC::MessageDecoder&);
 
     void addUserStyleSheet(const WebCore::UserStyleSheet&);
     void addUserScript(const WebCore::UserScript&);
@@ -63,8 +65,19 @@ private:
     void removeAllUserScripts();
     void removeAllUserContent();
 
+#if ENABLE(CONTENT_EXTENSIONS)
+    void addUserContentExtension(const String& name, WebCompiledContentExtensionData);
+    void removeUserContentExtension(const String& name);
+    void removeAllUserContentExtensions();
+#endif
+
+private:
+    WebPageGroupProxy(const WebPageGroupData&);
+
     WebPageGroupData m_data;
     WebCore::PageGroup* m_pageGroup;
+
+    RefPtr<WebCore::UserContentController> m_userContentController;
 };
 
 } // namespace WebKit