| 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 b03f823e8bed6e7c21d67cf3203047be404dfb8f..9d40a506b8b7f2b3471be355ce0c36821ecb145f 100644
|
| --- a/third_party/WebKit/Source/core/workers/WorkerGlobalScope.h
|
| +++ b/third_party/WebKit/Source/core/workers/WorkerGlobalScope.h
|
| @@ -32,12 +32,12 @@
|
| #include "core/CoreExport.h"
|
| #include "core/dom/ExecutionContext.h"
|
| #include "core/events/EventListener.h"
|
| -#include "core/events/EventTarget.h"
|
| #include "core/fetch/CachedMetadataHandler.h"
|
| #include "core/frame/DOMTimerCoordinator.h"
|
| #include "core/frame/DOMWindowBase64.h"
|
| #include "core/frame/UseCounter.h"
|
| #include "core/frame/csp/ContentSecurityPolicy.h"
|
| +#include "core/workers/AbstractGlobalScope.h"
|
| #include "core/workers/WorkerEventQueue.h"
|
| #include "platform/heap/Handle.h"
|
| #include "platform/network/ContentSecurityPolicyParsers.h"
|
| @@ -55,6 +55,7 @@ namespace blink {
|
| class ConsoleMessage;
|
| class ConsoleMessageStorage;
|
| class ExceptionState;
|
| +class GlobalScopeScriptController;
|
| class V8AbstractEventListener;
|
| class WorkerClients;
|
| class WorkerConsole;
|
| @@ -63,9 +64,9 @@ class WorkerLocation;
|
| class WorkerNavigator;
|
| class WorkerThread;
|
|
|
| -class CORE_EXPORT WorkerGlobalScope : public EventTargetWithInlineData, public RefCountedWillBeNoBase<WorkerGlobalScope>, public SecurityContext, public ExecutionContext, public WillBeHeapSupplementable<WorkerGlobalScope>, public DOMWindowBase64 {
|
| - DEFINE_WRAPPERTYPEINFO();
|
| +class CORE_EXPORT WorkerGlobalScope : public EventTargetWithInlineData, public RefCountedWillBeNoBase<WorkerGlobalScope>, public AbstractGlobalScope, public WillBeHeapSupplementable<WorkerGlobalScope>, public DOMWindowBase64 {
|
| REFCOUNTED_EVENT_TARGET(WorkerGlobalScope);
|
| + DEFINE_WRAPPERTYPEINFO();
|
| WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(WorkerGlobalScope);
|
| public:
|
| ~WorkerGlobalScope() override;
|
| @@ -73,6 +74,7 @@ public:
|
| bool isWorkerGlobalScope() const final { return true; }
|
|
|
| ExecutionContext* executionContext() const final;
|
| + v8::Isolate* isolate() const final;
|
|
|
| virtual void countFeature(UseCounter::Feature) const;
|
| virtual void countDeprecation(UseCounter::Feature) const;
|
| @@ -83,7 +85,7 @@ public:
|
| String userAgent() const final;
|
| void disableEval(const String& errorMessage) final;
|
|
|
| - WorkerScriptController* script() { return m_script.get(); }
|
| + GlobalScopeScriptController* script() final { return m_script.get(); }
|
|
|
| virtual void didEvaluateWorkerScript();
|
| void dispose();
|
| @@ -169,7 +171,6 @@ private:
|
| void reportBlockedScriptExecutionToInspector(const String& directiveText) final;
|
|
|
| EventTarget* errorEventTarget() final;
|
| - void didUpdateSecurityOrigin() final { }
|
|
|
| void clearScript();
|
| void clearInspector();
|
|
|