Update To 11.40.268.0

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

diff --git a/src/third_party/WebKit/Source/core/workers/DedicatedWorkerGlobalScope.h b/src/third_party/WebKit/Source/core/workers/DedicatedWorkerGlobalScope.h
index 9fff948..9d30a48 100644 (file)
--- a/src/third_party/WebKit/Source/core/workers/DedicatedWorkerGlobalScope.h
+++ b/src/third_party/WebKit/Source/core/workers/DedicatedWorkerGlobalScope.h
@@ -41,22 +41,22 @@ namespace blink {
 class DedicatedWorkerThread;
 class WorkerThreadStartupData;
 
-class DedicatedWorkerGlobalScope FINAL : public WorkerGlobalScope {
+class DedicatedWorkerGlobalScope final : public WorkerGlobalScope {
     DEFINE_WRAPPERTYPEINFO();
 public:
     typedef WorkerGlobalScope Base;
     static PassRefPtrWillBeRawPtr<DedicatedWorkerGlobalScope> create(DedicatedWorkerThread*, PassOwnPtrWillBeRawPtr<WorkerThreadStartupData>, double timeOrigin);
     virtual ~DedicatedWorkerGlobalScope();
 
-    virtual bool isDedicatedWorkerGlobalScope() const OVERRIDE { return true; }
-    virtual void countFeature(UseCounter::Feature) const OVERRIDE;
-    virtual void countDeprecation(UseCounter::Feature) const OVERRIDE;
+    virtual bool isDedicatedWorkerGlobalScope() const override { return true; }
+    virtual void countFeature(UseCounter::Feature) const override;
+    virtual void countDeprecation(UseCounter::Feature) const override;
 
     // Overridden to allow us to check our pending activity after executing imported script.
-    virtual void importScripts(const Vector<String>& urls, ExceptionState&) OVERRIDE;
+    virtual void importScripts(const Vector<String>& urls, ExceptionState&) override;
 
     // EventTarget
-    virtual const AtomicString& interfaceName() const OVERRIDE;
+    virtual const AtomicString& interfaceName() const override;
 
     void postMessage(ExecutionContext*, PassRefPtr<SerializedScriptValue>, const MessagePortArray*, ExceptionState&);
 
@@ -64,10 +64,10 @@ public:
 
     DedicatedWorkerThread* thread() const;
 
-    virtual void trace(Visitor*) OVERRIDE;
+    virtual void trace(Visitor*) override;
 
 private:
-    DedicatedWorkerGlobalScope(const KURL&, const String& userAgent, DedicatedWorkerThread*, double timeOrigin, PassOwnPtrWillBeRawPtr<WorkerClients>);
+    DedicatedWorkerGlobalScope(const KURL&, const String& userAgent, DedicatedWorkerThread*, double timeOrigin, const SecurityOrigin*, PassOwnPtrWillBeRawPtr<WorkerClients>);
 };
 
 } // namespace blink