Index: Source/core/inspector/InspectorConsoleAgent.h |
diff --git a/Source/core/inspector/InspectorConsoleAgent.h b/Source/core/inspector/InspectorConsoleAgent.h |
index 388a97af11fcc357ac01192aebbfaf9cb069d4b8..a76b1b624cca1f60586d2a0ee587ff09118171cd 100644 |
--- a/Source/core/inspector/InspectorConsoleAgent.h |
+++ b/Source/core/inspector/InspectorConsoleAgent.h |
@@ -45,6 +45,7 @@ class DOMWindow; |
class Frame; |
class InspectorFrontend; |
class InjectedScriptManager; |
+class InspectorTimelineAgent; |
class InstrumentingAgents; |
class ResourceError; |
class ResourceLoader; |
@@ -59,7 +60,7 @@ typedef String ErrorString; |
class InspectorConsoleAgent : public InspectorBaseAgent<InspectorConsoleAgent>, public InspectorBackendDispatcher::ConsoleCommandHandler { |
WTF_MAKE_NONCOPYABLE(InspectorConsoleAgent); |
public: |
- InspectorConsoleAgent(InstrumentingAgents*, InspectorCompositeState*, InjectedScriptManager*); |
+ InspectorConsoleAgent(InstrumentingAgents*, InspectorTimelineAgent*, InspectorCompositeState*, InjectedScriptManager*); |
virtual ~InspectorConsoleAgent(); |
virtual void enable(ErrorString*); |
@@ -80,8 +81,11 @@ public: |
Vector<unsigned> consoleMessageArgumentCounts(); |
- void startConsoleTiming(ScriptExecutionContext*, const String& title); |
yurys
2013/09/06 07:56:45
Can you land this part separately?
pfeldman
2013/09/06 16:10:30
This is a simple rename in attempt to streamline c
|
- void stopConsoleTiming(ScriptExecutionContext*, const String& title, PassRefPtr<ScriptCallStack>); |
+ void consoleTime(ScriptExecutionContext*, const String& title); |
+ void consoleTimeEnd(ScriptExecutionContext*, const String& title, ScriptState*); |
caseq
2013/09/06 09:25:46
Do we need both ScriptState and ScriptExecutionCon
pfeldman
2013/09/06 16:10:30
Yes, those are different.
|
+ void consoleTimeline(ScriptExecutionContext*, const String& title, ScriptState*); |
+ void consoleTimelineEnd(ScriptExecutionContext*, const String& title, ScriptState*); |
+ |
void consoleCount(ScriptState*, PassRefPtr<ScriptArguments>); |
void frameWindowDiscarded(DOMWindow*); |
@@ -101,6 +105,7 @@ public: |
protected: |
void addConsoleMessage(PassOwnPtr<ConsoleMessage>); |
+ InspectorTimelineAgent* m_timelineAgent; |
InjectedScriptManager* m_injectedScriptManager; |
InspectorFrontend::Console* m_frontend; |
ConsoleMessage* m_previousMessage; |