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

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

Issue 24027002: DevTools: implement console.timeline/timelineEnd. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Review comments addressed. Created 7 years, 3 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/InspectorConsoleAgent.h ('k') | Source/core/inspector/InspectorController.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/inspector/InspectorConsoleAgent.cpp
diff --git a/Source/core/inspector/InspectorConsoleAgent.cpp b/Source/core/inspector/InspectorConsoleAgent.cpp
index 67b9261547280eead39a439c1b73e1265e54e8f9..8ad03e4df3f15f9dd0d08ddd9f853747b8b03dc8 100644
--- a/Source/core/inspector/InspectorConsoleAgent.cpp
+++ b/Source/core/inspector/InspectorConsoleAgent.cpp
@@ -35,6 +35,7 @@
#include "core/inspector/InjectedScriptHost.h"
#include "core/inspector/InjectedScriptManager.h"
#include "core/inspector/InspectorState.h"
+#include "core/inspector/InspectorTimelineAgent.h"
#include "core/inspector/InstrumentingAgents.h"
#include "core/inspector/ScriptArguments.h"
#include "core/inspector/ScriptCallFrame.h"
@@ -62,8 +63,9 @@ static const char consoleMessagesEnabled[] = "consoleMessagesEnabled";
int InspectorConsoleAgent::s_enabledAgentCount = 0;
-InspectorConsoleAgent::InspectorConsoleAgent(InstrumentingAgents* instrumentingAgents, InspectorCompositeState* state, InjectedScriptManager* injectedScriptManager)
+InspectorConsoleAgent::InspectorConsoleAgent(InstrumentingAgents* instrumentingAgents, InspectorTimelineAgent* timelineAgent, InspectorCompositeState* state, InjectedScriptManager* injectedScriptManager)
: InspectorBaseAgent<InspectorConsoleAgent>("Console", instrumentingAgents, state)
+ , m_timelineAgent(timelineAgent)
, m_injectedScriptManager(injectedScriptManager)
, m_frontend(0)
, m_previousMessage(0)
@@ -191,7 +193,7 @@ Vector<unsigned> InspectorConsoleAgent::consoleMessageArgumentCounts()
return result;
}
-void InspectorConsoleAgent::startConsoleTiming(ScriptExecutionContext*, const String& title)
+void InspectorConsoleAgent::consoleTime(ScriptExecutionContext*, const String& title)
{
// Follow Firebug's behavior of requiring a title that is not null or
// undefined for timing functions
@@ -201,7 +203,7 @@ void InspectorConsoleAgent::startConsoleTiming(ScriptExecutionContext*, const St
m_times.add(title, monotonicallyIncreasingTime());
}
-void InspectorConsoleAgent::stopConsoleTiming(ScriptExecutionContext*, const String& title, PassRefPtr<ScriptCallStack> callStack)
+void InspectorConsoleAgent::consoleTimeEnd(ScriptExecutionContext*, const String& title, ScriptState* state)
{
// Follow Firebug's behavior of requiring a title that is not null or
// undefined for timing functions
@@ -217,8 +219,17 @@ void InspectorConsoleAgent::stopConsoleTiming(ScriptExecutionContext*, const Str
double elapsed = monotonicallyIncreasingTime() - startTime;
String message = title + String::format(": %.3fms", elapsed * 1000);
- const ScriptCallFrame& lastCaller = callStack->at(0);
- addMessageToConsole(ConsoleAPIMessageSource, TimingMessageType, DebugMessageLevel, message, lastCaller.sourceURL(), lastCaller.lineNumber(), lastCaller.columnNumber());
+ addMessageToConsole(ConsoleAPIMessageSource, LogMessageType, DebugMessageLevel, message, String(), 0, 0, state);
caseq 2013/09/13 15:36:18 are we intentionally loosing call-site location he
+}
+
+void InspectorConsoleAgent::consoleTimeline(ScriptExecutionContext* context, const String& title, ScriptState* state)
+{
+ m_timelineAgent->consoleTimeline(context, title, state);
+}
+
+void InspectorConsoleAgent::consoleTimelineEnd(ScriptExecutionContext* context, const String& title, ScriptState* state)
+{
+ m_timelineAgent->consoleTimelineEnd(context, title, state);
}
void InspectorConsoleAgent::consoleCount(ScriptState* state, PassRefPtr<ScriptArguments> arguments)
« no previous file with comments | « Source/core/inspector/InspectorConsoleAgent.h ('k') | Source/core/inspector/InspectorController.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698