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

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

Issue 458253002: [DevTools] Removed ScriptState from createScriptCallStackForConsole (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 4 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/InspectorProfilerAgent.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/inspector/InspectorProfilerAgent.cpp
diff --git a/Source/core/inspector/InspectorProfilerAgent.cpp b/Source/core/inspector/InspectorProfilerAgent.cpp
index 609034c6806533cd5d9a60a1985a3501f92c758a..6c7eb93f7d37acedb6bf9cd0f032522c76edb93b 100644
--- a/Source/core/inspector/InspectorProfilerAgent.cpp
+++ b/Source/core/inspector/InspectorProfilerAgent.cpp
@@ -64,9 +64,9 @@ static PassRefPtr<TypeBuilder::Profiler::CPUProfile> createCPUProfile(const Scri
return profile.release();
}
-static PassRefPtr<TypeBuilder::Debugger::Location> currentDebugLocation(ScriptState* scriptState)
+static PassRefPtr<TypeBuilder::Debugger::Location> currentDebugLocation()
{
- RefPtrWillBeRawPtr<ScriptCallStack> callStack(createScriptCallStackForConsole(scriptState, 1));
+ RefPtrWillBeRawPtr<ScriptCallStack> callStack(createScriptCallStack(1));
const ScriptCallFrame& lastCaller = callStack->at(0);
RefPtr<TypeBuilder::Debugger::Location> location = TypeBuilder::Debugger::Location::create()
.setScriptId(lastCaller.scriptId())
@@ -104,17 +104,17 @@ InspectorProfilerAgent::~InspectorProfilerAgent()
{
}
-void InspectorProfilerAgent::consoleProfile(ExecutionContext* context, const String& title, ScriptState* scriptState)
+void InspectorProfilerAgent::consoleProfile(ExecutionContext* context, const String& title)
{
UseCounter::count(context, UseCounter::DevToolsConsoleProfile);
ASSERT(m_frontend && enabled());
String id = nextProfileId();
m_startedProfiles.append(ProfileDescriptor(id, title));
ScriptProfiler::start(id);
- m_frontend->consoleProfileStarted(id, currentDebugLocation(scriptState), title.isNull() ? 0 : &title);
+ m_frontend->consoleProfileStarted(id, currentDebugLocation(), title.isNull() ? 0 : &title);
}
-void InspectorProfilerAgent::consoleProfileEnd(const String& title, ScriptState* scriptState)
+void InspectorProfilerAgent::consoleProfileEnd(const String& title)
{
ASSERT(m_frontend && enabled());
String id;
@@ -141,7 +141,7 @@ void InspectorProfilerAgent::consoleProfileEnd(const String& title, ScriptState*
RefPtrWillBeRawPtr<ScriptProfile> profile = ScriptProfiler::stop(id);
if (!profile)
return;
- RefPtr<TypeBuilder::Debugger::Location> location = currentDebugLocation(scriptState);
+ RefPtr<TypeBuilder::Debugger::Location> location = currentDebugLocation();
m_frontend->consoleProfileFinished(id, location, createCPUProfile(*profile), resolvedTitle.isNull() ? 0 : &resolvedTitle);
}
« no previous file with comments | « Source/core/inspector/InspectorProfilerAgent.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698