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

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

Issue 1535943005: Initial implementation of bindings and basic classes for worklets. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix windows build. Created 4 years, 11 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
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 8ac3d677d961dfe43c26dacf2bbfda1c4392d544..5145df8860f9ef7d1be231c1e96aaa9bca5ca129 100644
--- a/third_party/WebKit/Source/core/workers/WorkerGlobalScope.h
+++ b/third_party/WebKit/Source/core/workers/WorkerGlobalScope.h
@@ -39,6 +39,7 @@
#include "core/frame/UseCounter.h"
#include "core/frame/csp/ContentSecurityPolicy.h"
#include "core/workers/WorkerEventQueue.h"
+#include "core/workers/WorkerOrWorkletGlobalScope.h"
#include "platform/heap/Handle.h"
#include "platform/network/ContentSecurityPolicyParsers.h"
#include "wtf/Assertions.h"
@@ -63,7 +64,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 SecurityContext, public WorkerOrWorkletGlobalScope, public WillBeHeapSupplementable<WorkerGlobalScope>, public DOMWindowBase64 {
DEFINE_WRAPPERTYPEINFO();
REFCOUNTED_EVENT_TARGET(WorkerGlobalScope);
WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(WorkerGlobalScope);
@@ -73,6 +74,10 @@ public:
bool isWorkerGlobalScope() const final { return true; }
ExecutionContext* executionContext() const final;
+ ScriptWrappable* scriptWrappable() const final
haraken 2016/01/12 00:38:49 You don't need to introduce scriptWrappable(), rig
ikilpatrick 2016/01/12 04:11:24 See comment in WorkerOrWorkletScriptController.
+ {
+ return const_cast<WorkerGlobalScope*>(this);
+ }
virtual void countFeature(UseCounter::Feature) const;
virtual void countDeprecation(UseCounter::Feature) const;
@@ -83,7 +88,7 @@ public:
String userAgent() const final;
void disableEval(const String& errorMessage) final;
- WorkerOrWorkletScriptController* script() { return m_script.get(); }
+ WorkerOrWorkletScriptController* script() final { return m_script.get(); }
virtual void didEvaluateWorkerScript();
void dispose();

Powered by Google App Engine
This is Rietveld 408576698