| 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..e287cfdaec54baf901e8061444e805b8eb396318 100644
|
| --- a/third_party/WebKit/Source/core/workers/WorkerGlobalScope.h
|
| +++ b/third_party/WebKit/Source/core/workers/WorkerGlobalScope.h
|
| @@ -38,7 +38,9 @@
|
| #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/Supplementable.h"
|
| #include "platform/heap/Handle.h"
|
| #include "platform/network/ContentSecurityPolicyParsers.h"
|
| #include "wtf/Assertions.h"
|
| @@ -55,6 +57,7 @@ namespace blink {
|
| class ConsoleMessage;
|
| class ConsoleMessageStorage;
|
| class ExceptionState;
|
| +class GlobalScopeScriptController;
|
| class V8AbstractEventListener;
|
| class WorkerClients;
|
| class WorkerConsole;
|
| @@ -63,7 +66,7 @@ class WorkerLocation;
|
| class WorkerNavigator;
|
| class WorkerThread;
|
|
|
| -class CORE_EXPORT WorkerGlobalScope : public EventTargetWithInlineData, public RefCountedWillBeNoBase<WorkerGlobalScope>, public SecurityContext, public ExecutionContext, public WillBeHeapSupplementable<WorkerGlobalScope>, public DOMWindowBase64 {
|
| +class CORE_EXPORT WorkerGlobalScope : public EventTargetWithInlineData, public RefCountedWillBeNoBase<WorkerGlobalScope>, public AbstractGlobalScope, public WillBeHeapSupplementable<WorkerGlobalScope>, public DOMWindowBase64 {
|
| DEFINE_WRAPPERTYPEINFO();
|
| REFCOUNTED_EVENT_TARGET(WorkerGlobalScope);
|
| WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(WorkerGlobalScope);
|
| @@ -73,17 +76,13 @@ public:
|
| bool isWorkerGlobalScope() const final { return true; }
|
|
|
| ExecutionContext* executionContext() const final;
|
| + v8::Isolate* isolate() const final;
|
| + void didStopRunLoop() final;
|
|
|
| virtual void countFeature(UseCounter::Feature) const;
|
| virtual void countDeprecation(UseCounter::Feature) const;
|
|
|
| - const KURL& url() const { return m_url; }
|
| - KURL completeURL(const String&) const;
|
| -
|
| - 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();
|
| @@ -130,9 +129,6 @@ public:
|
|
|
| WorkerClients* clients() { return m_workerClients.get(); }
|
|
|
| - using SecurityContext::securityOrigin;
|
| - using SecurityContext::contentSecurityPolicy;
|
| -
|
| void addConsoleMessage(PassRefPtrWillBeRawPtr<ConsoleMessage>) final;
|
| ConsoleMessageStorage* messageStorage();
|
|
|
| @@ -140,8 +136,6 @@ public:
|
|
|
| virtual void scriptLoaded(size_t scriptSize, size_t cachedMetadataSize) { }
|
|
|
| - bool isSecureContext(String& errorMessage, const SecureContextCheck = StandardSecureContextCheck) const override;
|
| -
|
| void registerEventListener(V8AbstractEventListener*);
|
| void deregisterEventListener(V8AbstractEventListener*);
|
|
|
| @@ -163,21 +157,15 @@ private:
|
| void derefExecutionContext() final { deref(); }
|
| #endif
|
|
|
| - const KURL& virtualURL() const final;
|
| - KURL virtualCompleteURL(const String&) const final;
|
| -
|
| void reportBlockedScriptExecutionToInspector(const String& directiveText) final;
|
|
|
| EventTarget* errorEventTarget() final;
|
| - void didUpdateSecurityOrigin() final { }
|
|
|
| void clearScript();
|
| void clearInspector();
|
|
|
| static void removeURLFromMemoryCacheInternal(const KURL&);
|
|
|
| - KURL m_url;
|
| - String m_userAgent;
|
| V8CacheOptions m_v8CacheOptions;
|
|
|
| mutable PersistentWillBeMember<WorkerConsole> m_console;
|
|
|