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

Unified Diff: Source/core/inspector/WorkerRuntimeAgent.cpp

Issue 17648006: Rename WorkerContext to WorkerGlobalScope (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebase on master Created 7 years, 6 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/inspector/WorkerRuntimeAgent.h ('k') | Source/core/loader/ThreadableLoader.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/inspector/WorkerRuntimeAgent.cpp
diff --git a/Source/core/inspector/WorkerRuntimeAgent.cpp b/Source/core/inspector/WorkerRuntimeAgent.cpp
index 8ddd4b216ac47c3a232cf8014dd98e7e01ea4146..d3d0c3fdb8dd18cff0216d9d28724f9bfab7aec3 100644
--- a/Source/core/inspector/WorkerRuntimeAgent.cpp
+++ b/Source/core/inspector/WorkerRuntimeAgent.cpp
@@ -36,15 +36,15 @@
#include "core/inspector/InjectedScript.h"
#include "core/inspector/InstrumentingAgents.h"
#include "core/inspector/WorkerDebuggerAgent.h"
-#include "core/workers/WorkerContext.h"
+#include "core/workers/WorkerGlobalScope.h"
#include "core/workers/WorkerRunLoop.h"
#include "core/workers/WorkerThread.h"
namespace WebCore {
-WorkerRuntimeAgent::WorkerRuntimeAgent(InstrumentingAgents* instrumentingAgents, InspectorCompositeState* state, InjectedScriptManager* injectedScriptManager, ScriptDebugServer* scriptDebugServer, WorkerContext* workerContext)
+WorkerRuntimeAgent::WorkerRuntimeAgent(InstrumentingAgents* instrumentingAgents, InspectorCompositeState* state, InjectedScriptManager* injectedScriptManager, ScriptDebugServer* scriptDebugServer, WorkerGlobalScope* workerGlobalScope)
: InspectorRuntimeAgent(instrumentingAgents, state, injectedScriptManager, scriptDebugServer)
- , m_workerContext(workerContext)
+ , m_workerGlobalScope(workerGlobalScope)
, m_paused(false)
{
m_instrumentingAgents->setWorkerRuntimeAgent(this);
@@ -61,7 +61,7 @@ InjectedScript WorkerRuntimeAgent::injectedScriptForEval(ErrorString* error, con
*error = "Execution context id is not supported for workers as there is only one execution context.";
return InjectedScript();
}
- ScriptState* scriptState = scriptStateFromWorkerContext(m_workerContext);
+ ScriptState* scriptState = scriptStateFromWorkerGlobalScope(m_workerGlobalScope);
return injectedScriptManager()->injectedScriptFor(scriptState);
}
@@ -80,9 +80,9 @@ void WorkerRuntimeAgent::run(ErrorString*)
m_paused = false;
}
-void WorkerRuntimeAgent::willEvaluateWorkerScript(WorkerContext* context, int workerThreadStartMode)
+void WorkerRuntimeAgent::willEvaluateWorkerScript(WorkerGlobalScope* context, int workerThreadStartMode)
{
- if (workerThreadStartMode != PauseWorkerContextOnStart)
+ if (workerThreadStartMode != PauseWorkerGlobalScopeOnStart)
return;
m_paused = true;
« no previous file with comments | « Source/core/inspector/WorkerRuntimeAgent.h ('k') | Source/core/loader/ThreadableLoader.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698