Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / core / workers / SharedWorkerGlobalScope.h

diff --git a/src/third_party/WebKit/Source/core/workers/SharedWorkerGlobalScope.h b/src/third_party/WebKit/Source/core/workers/SharedWorkerGlobalScope.h
index a87e0a6..ec90b70 100644 (file)
--- a/src/third_party/WebKit/Source/core/workers/SharedWorkerGlobalScope.h
+++ b/src/third_party/WebKit/Source/core/workers/SharedWorkerGlobalScope.h
@@ -31,41 +31,44 @@
 #ifndef SharedWorkerGlobalScope_h
 #define SharedWorkerGlobalScope_h
 
-#include "core/frame/ContentSecurityPolicy.h"
+#include "core/frame/csp/ContentSecurityPolicy.h"
 #include "core/workers/WorkerGlobalScope.h"
 #include "core/workers/WorkerThreadStartupData.h"
+#include "platform/heap/Handle.h"
 
-namespace WebCore {
+namespace blink {
 
-    class MessageEvent;
-    class SharedWorkerThread;
+class MessageEvent;
+class SharedWorkerThread;
 
-    class SharedWorkerGlobalScope : public WorkerGlobalScope {
-    public:
-        typedef WorkerGlobalScope Base;
-        static PassRefPtr<SharedWorkerGlobalScope> create(const String& name, SharedWorkerThread*, PassOwnPtr<WorkerThreadStartupData>);
-        virtual ~SharedWorkerGlobalScope();
+class SharedWorkerGlobalScope FINAL : public WorkerGlobalScope {
+public:
+    typedef WorkerGlobalScope Base;
+    static PassRefPtrWillBeRawPtr<SharedWorkerGlobalScope> create(const String& name, SharedWorkerThread*, PassOwnPtrWillBeRawPtr<WorkerThreadStartupData>);
+    virtual ~SharedWorkerGlobalScope();
 
-        virtual bool isSharedWorkerGlobalScope() const OVERRIDE { return true; }
+    virtual bool isSharedWorkerGlobalScope() const OVERRIDE { return true; }
 
-        // EventTarget
-        virtual const AtomicString& interfaceName() const OVERRIDE;
+    // EventTarget
+    virtual const AtomicString& interfaceName() const OVERRIDE;
 
-        // Setters/Getters for attributes in SharedWorkerGlobalScope.idl
-        DEFINE_ATTRIBUTE_EVENT_LISTENER(connect);
-        String name() const { return m_name; }
+    // Setters/Getters for attributes in SharedWorkerGlobalScope.idl
+    DEFINE_ATTRIBUTE_EVENT_LISTENER(connect);
+    String name() const { return m_name; }
 
-        SharedWorkerThread* thread();
+    SharedWorkerThread* thread();
 
-    private:
-        SharedWorkerGlobalScope(const String& name, const KURL&, const String& userAgent, SharedWorkerThread*, PassOwnPtr<WorkerClients>);
-        virtual void logExceptionToConsole(const String& errorMessage, const String& sourceURL, int lineNumber, int columnNumber, PassRefPtr<ScriptCallStack>) OVERRIDE;
+    virtual void trace(Visitor*) OVERRIDE;
 
-        String m_name;
-    };
+private:
+    SharedWorkerGlobalScope(const String& name, const KURL&, const String& userAgent, SharedWorkerThread*, PassOwnPtrWillBeRawPtr<WorkerClients>);
+    virtual void logExceptionToConsole(const String& errorMessage, const String& sourceURL, int lineNumber, int columnNumber, PassRefPtrWillBeRawPtr<ScriptCallStack>) OVERRIDE;
 
-    PassRefPtr<MessageEvent> createConnectEvent(PassRefPtr<MessagePort>);
+    String m_name;
+};
 
-} // namespace WebCore
+PassRefPtrWillBeRawPtr<MessageEvent> createConnectEvent(PassRefPtrWillBeRawPtr<MessagePort>);
+
+} // namespace blink
 
 #endif // SharedWorkerGlobalScope_h