Update To 11.40.268.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 94b50c6..201e4f3 100644 (file)
--- a/src/third_party/WebKit/Source/core/workers/SharedWorkerGlobalScope.h
+++ b/src/third_party/WebKit/Source/core/workers/SharedWorkerGlobalScope.h
@@ -41,17 +41,17 @@ namespace blink {
 class MessageEvent;
 class SharedWorkerThread;
 
-class SharedWorkerGlobalScope FINAL : public WorkerGlobalScope {
+class SharedWorkerGlobalScope final : public WorkerGlobalScope {
     DEFINE_WRAPPERTYPEINFO();
 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;
+    virtual const AtomicString& interfaceName() const override;
 
     // Setters/Getters for attributes in SharedWorkerGlobalScope.idl
     DEFINE_ATTRIBUTE_EVENT_LISTENER(connect);
@@ -59,11 +59,11 @@ public:
 
     SharedWorkerThread* thread();
 
-    virtual void trace(Visitor*) OVERRIDE;
+    virtual void trace(Visitor*) override;
 
 private:
-    SharedWorkerGlobalScope(const String& name, const KURL&, const String& userAgent, SharedWorkerThread*, PassOwnPtrWillBeRawPtr<WorkerClients>);
-    virtual void logExceptionToConsole(const String& errorMessage, int scriptId, const String& sourceURL, int lineNumber, int columnNumber, PassRefPtrWillBeRawPtr<ScriptCallStack>) OVERRIDE;
+    SharedWorkerGlobalScope(const String& name, const KURL&, const String& userAgent, SharedWorkerThread*, const SecurityOrigin*, PassOwnPtrWillBeRawPtr<WorkerClients>);
+    virtual void logExceptionToConsole(const String& errorMessage, int scriptId, const String& sourceURL, int lineNumber, int columnNumber, PassRefPtrWillBeRawPtr<ScriptCallStack>) override;
 
     String m_name;
 };