Index: third_party/WebKit/Source/core/workers/WorkerGlobalScope.h |
diff --git a/third_party/WebKit/Source/core/workers/WorkerGlobalScope.h b/third_party/WebKit/Source/core/workers/WorkerGlobalScope.h |
index e5a2dbac9cf01f9f38f6a1b4bc42dec2fe63063d..58169218320a876c550eaec0a23f7a5a4428971a 100644 |
--- a/third_party/WebKit/Source/core/workers/WorkerGlobalScope.h |
+++ b/third_party/WebKit/Source/core/workers/WorkerGlobalScope.h |
@@ -73,8 +73,8 @@ public: |
bool isWorkerGlobalScope() const final { return true; } |
- ExecutionContext* executionContext() const final; |
- ScriptWrappable* scriptWrappable() const final |
+ ExecutionContext* getExecutionContext() const final; |
+ ScriptWrappable* getScriptWrappable() const final |
{ |
return const_cast<WorkerGlobalScope*>(this); |
} |
@@ -119,7 +119,7 @@ public: |
v8::Local<v8::Object> associateWithWrapper(v8::Isolate*, const WrapperTypeInfo*, v8::Local<v8::Object> wrapper) final; |
// ExecutionContext |
- WorkerEventQueue* eventQueue() const final; |
+ WorkerEventQueue* getEventQueue() const final; |
SecurityContext& securityContext() final { return *this; } |
bool isContextThread() const final; |
@@ -135,7 +135,7 @@ public: |
WorkerClients* clients() { return m_workerClients.get(); } |
- using SecurityContext::securityOrigin; |
+ using SecurityContext::getSecurityOrigin; |
using SecurityContext::contentSecurityPolicy; |
void addConsoleMessage(PassRefPtrWillBeRawPtr<ConsoleMessage>) final; |