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

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

Issue 27311002: Introduce ExecutionContextClient (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fix clang build error Created 7 years, 2 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/dom/ExecutionContextClient.h ('k') | Source/core/workers/WorkerGlobalScope.cpp » ('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 edd445cf882ac1e5f92b4be7b3d70f8514b4270b..15d04a26f5ec2a798582803b4cf59c1ed6874acd 100644
--- a/Source/core/workers/WorkerGlobalScope.h
+++ b/Source/core/workers/WorkerGlobalScope.h
@@ -58,7 +58,7 @@ namespace WebCore {
class WorkerNavigator;
class WorkerThread;
- class WorkerGlobalScope : public RefCounted<WorkerGlobalScope>, public ScriptWrappable, public ExecutionContext, public WorkerSupplementable, public EventTargetWithInlineData {
+ class WorkerGlobalScope : public RefCounted<WorkerGlobalScope>, public ScriptWrappable, public ExecutionContext, public ExecutionContextClient, public WorkerSupplementable, public EventTargetWithInlineData {
public:
virtual ~WorkerGlobalScope();
@@ -73,7 +73,6 @@ namespace WebCore {
KURL completeURL(const String&) const;
virtual String userAgent(const KURL&) const;
-
virtual void disableEval(const String& errorMessage) OVERRIDE;
WorkerScriptController* script() { return m_script.get(); }
@@ -96,12 +95,14 @@ namespace WebCore {
virtual void importScripts(const Vector<String>& urls, ExceptionState&);
WorkerNavigator* navigator() const;
- // ExecutionContext
+ // ExecutionContextClient
virtual WorkerEventQueue* eventQueue() const OVERRIDE;
virtual bool isContextThread() const OVERRIDE;
virtual bool isJSExecutionForbidden() const OVERRIDE;
+ virtual double timerAlignmentInterval() const OVERRIDE;
+
WorkerInspectorController* workerInspectorController() { return m_workerInspectorController.get(); }
// These methods are used for GC marking. See JSWorkerGlobalScope::visitChildrenVirtual(SlotVisitor&) in
// JSWorkerGlobalScopeCustom.cpp.
@@ -146,6 +147,7 @@ namespace WebCore {
private:
virtual void refExecutionContext() OVERRIDE { ref(); }
virtual void derefExecutionContext() OVERRIDE { deref(); }
+ virtual PassOwnPtr<LifecycleNotifier> createLifecycleNotifier() OVERRIDE;
virtual void refEventTarget() OVERRIDE { ref(); }
virtual void derefEventTarget() OVERRIDE { deref(); }
« no previous file with comments | « Source/core/dom/ExecutionContextClient.h ('k') | Source/core/workers/WorkerGlobalScope.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698