webkitgtk-2.16.5HEADwebkitgtk-2.16.5master

1 files changed, 20 insertions, 38 deletions

diff --git a/Source/WebCore/workers/WorkerGlobalScopeProxy.h b/Source/WebCore/workers/WorkerGlobalScopeProxy.h
index 0a300710a..1cff6b7dc 100644
--- a/Source/WebCore/workers/WorkerGlobalScopeProxy.h
+++ b/Source/WebCore/workers/WorkerGlobalScopeProxy.h
@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2009 Google Inc. All rights reserved.
+ * Copyright (C) 2017 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
@@ -28,50 +29,31 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef WorkerGlobalScopeProxy_h
-#define WorkerGlobalScopeProxy_h
+#pragma once
 
-#include "MessagePort.h"
-#include "WorkerThread.h"
-#include <wtf/Forward.h>
-#include <wtf/PassOwnPtr.h>
+#include "MessagePortChannel.h"
+#include <runtime/RuntimeFlags.h>
 
 namespace WebCore {
 
-    class URL;
-    class Worker;
+class ContentSecurityPolicyResponseHeaders;
+class URL;
+class Worker;
 
-    // A proxy to talk to the worker context.
-    class WorkerGlobalScopeProxy {
-    public:
-        static WorkerGlobalScopeProxy* create(Worker*);
+// A proxy to talk to the worker context.
+class WorkerGlobalScopeProxy {
+public:
+    static WorkerGlobalScopeProxy& create(Worker&);
 
-        virtual ~WorkerGlobalScopeProxy() { }
+    virtual void startWorkerGlobalScope(const URL& scriptURL, const String& userAgent, const String& sourceCode, const ContentSecurityPolicyResponseHeaders&, bool shouldBypassMainWorldContentSecurityPolicy, MonotonicTime timeOrigin, JSC::RuntimeFlags) = 0;
+    virtual void terminateWorkerGlobalScope() = 0;
+    virtual void postMessageToWorkerGlobalScope(RefPtr<SerializedScriptValue>&&, std::unique_ptr<MessagePortChannelArray>) = 0;
+    virtual bool hasPendingActivity() const = 0;
+    virtual void workerObjectDestroyed() = 0;
+    virtual void notifyNetworkStateChange(bool isOnline) = 0;
 
-        virtual void startWorkerGlobalScope(const URL& scriptURL, const String& userAgent, const String& sourceCode, WorkerThreadStartMode) = 0;
-
-        virtual void terminateWorkerGlobalScope() = 0;
-
-        virtual void postMessageToWorkerGlobalScope(PassRefPtr<SerializedScriptValue>, PassOwnPtr<MessagePortChannelArray>) = 0;
-
-        virtual bool hasPendingActivity() const = 0;
-
-        virtual void workerObjectDestroyed() = 0;
-
-        virtual void notifyNetworkStateChange(bool isOnline) = 0;
-
-#if ENABLE(INSPECTOR)
-        class PageInspector {
-        public:
-            virtual ~PageInspector() { }
-            virtual void dispatchMessageFromWorker(const String&) = 0;
-        };
-        virtual void connectToInspector(PageInspector*) { }
-        virtual void disconnectFromInspector() { }
-        virtual void sendMessageToInspector(const String&) { }
-#endif
-    };
+protected:
+    virtual ~WorkerGlobalScopeProxy() { }
+};
 
 } // namespace WebCore
-
-#endif // WorkerGlobalScopeProxy_h