Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1089)

Unified Diff: Source/core/workers/WorkerGlobalScope.h

Issue 1232333002: Fix virtual/override/final usage in the rest of Source/core/. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/workers/WorkerEventQueue.cpp ('k') | Source/core/workers/WorkerLocation.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/workers/WorkerGlobalScope.h
diff --git a/Source/core/workers/WorkerGlobalScope.h b/Source/core/workers/WorkerGlobalScope.h
index fcd18f30f310d604b2e96b62d187bfc19f9d9598..9d6ec82e754b54384f1e3b30549b344668287408 100644
--- a/Source/core/workers/WorkerGlobalScope.h
+++ b/Source/core/workers/WorkerGlobalScope.h
@@ -66,11 +66,11 @@ class CORE_EXPORT WorkerGlobalScope : public EventTargetWithInlineData, public R
REFCOUNTED_EVENT_TARGET(WorkerGlobalScope);
WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(WorkerGlobalScope);
public:
- virtual ~WorkerGlobalScope();
+ ~WorkerGlobalScope() override;
- bool isWorkerGlobalScope() const override final { return true; }
+ bool isWorkerGlobalScope() const final { return true; }
- ExecutionContext* executionContext() const override final;
+ ExecutionContext* executionContext() const final;
virtual void countFeature(UseCounter::Feature) const;
virtual void countDeprecation(UseCounter::Feature) const;
@@ -78,8 +78,8 @@ public:
const KURL& url() const { return m_url; }
KURL completeURL(const String&) const;
- String userAgent(const KURL&) const override final;
- void disableEval(const String& errorMessage) override final;
+ String userAgent(const KURL&) const final;
+ void disableEval(const String& errorMessage) final;
WorkerScriptController* script() { return m_script.get(); }
@@ -88,7 +88,7 @@ public:
WorkerThread* thread() const { return m_thread; }
- void postTask(const WebTraceLocation&, PassOwnPtr<ExecutionContextTask>) override final; // Executes the task on context's thread asynchronously.
+ void postTask(const WebTraceLocation&, PassOwnPtr<ExecutionContextTask>) final; // Executes the task on context's thread asynchronously.
// WorkerGlobalScope
WorkerGlobalScope* self() { return this; }
@@ -108,18 +108,18 @@ public:
WorkerNavigator* navigator() const;
// ScriptWrappable
- v8::Local<v8::Object> wrap(v8::Isolate*, v8::Local<v8::Object> creationContext) override final;
- v8::Local<v8::Object> associateWithWrapper(v8::Isolate*, const WrapperTypeInfo*, v8::Local<v8::Object> wrapper) override final;
+ v8::Local<v8::Object> wrap(v8::Isolate*, v8::Local<v8::Object> creationContext) final;
+ v8::Local<v8::Object> associateWithWrapper(v8::Isolate*, const WrapperTypeInfo*, v8::Local<v8::Object> wrapper) final;
// ExecutionContextClient
- WorkerEventQueue* eventQueue() const override final;
- SecurityContext& securityContext() override final { return *this; }
+ WorkerEventQueue* eventQueue() const final;
+ SecurityContext& securityContext() final { return *this; }
- bool isContextThread() const override final;
- bool isJSExecutionForbidden() const override final;
+ bool isContextThread() const final;
+ bool isJSExecutionForbidden() const final;
- double timerAlignmentInterval() const override final;
- DOMTimerCoordinator* timers() override final;
+ double timerAlignmentInterval() const final;
+ DOMTimerCoordinator* timers() final;
WorkerInspectorController* workerInspectorController() { return m_workerInspectorController.get(); }
@@ -132,7 +132,7 @@ public:
using SecurityContext::securityOrigin;
using SecurityContext::contentSecurityPolicy;
- void addConsoleMessage(PassRefPtrWillBeRawPtr<ConsoleMessage>) override final;
+ void addConsoleMessage(PassRefPtrWillBeRawPtr<ConsoleMessage>) final;
ConsoleMessageStorage* messageStorage();
void exceptionHandled(int exceptionId, bool isHandled);
@@ -155,17 +155,17 @@ protected:
private:
#if !ENABLE(OILPAN)
- void refExecutionContext() override final { ref(); }
- void derefExecutionContext() override final { deref(); }
+ void refExecutionContext() final { ref(); }
+ void derefExecutionContext() final { deref(); }
#endif
- const KURL& virtualURL() const override final;
- KURL virtualCompleteURL(const String&) const override final;
+ const KURL& virtualURL() const final;
+ KURL virtualCompleteURL(const String&) const final;
- void reportBlockedScriptExecutionToInspector(const String& directiveText) override final;
+ void reportBlockedScriptExecutionToInspector(const String& directiveText) final;
- EventTarget* errorEventTarget() override final;
- void didUpdateSecurityOrigin() override final { }
+ EventTarget* errorEventTarget() final;
+ void didUpdateSecurityOrigin() final { }
void clearScript() { m_script.clear(); }
void clearInspector();
« no previous file with comments | « Source/core/workers/WorkerEventQueue.cpp ('k') | Source/core/workers/WorkerLocation.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698