Index: Source/core/inspector/InspectorTimelineAgent.h |
diff --git a/Source/core/inspector/InspectorTimelineAgent.h b/Source/core/inspector/InspectorTimelineAgent.h |
index 58397d3bbe4a0367a9e8dcc32cbee55c749e87d9..b175ddc8c1956d6b4a8541783023f21e0ace9ad2 100644 |
--- a/Source/core/inspector/InspectorTimelineAgent.h |
+++ b/Source/core/inspector/InspectorTimelineAgent.h |
@@ -70,6 +70,7 @@ class ResourceResponse; |
class ScriptArguments; |
class ScriptCallStack; |
class ScriptExecutionContext; |
+class ScriptState; |
class TimelineTraceEventProcessor; |
class WebSocketHandshakeRequest; |
class WebSocketHandshakeResponse; |
@@ -171,12 +172,14 @@ public: |
bool willEvaluateScript(Frame*, const String&, int); |
void didEvaluateScript(); |
- void consoleTimeStamp(ScriptExecutionContext*, PassRefPtr<ScriptArguments>); |
+ void consoleTimeStamp(ScriptExecutionContext*, const String& title); |
void domContentLoadedEventFired(Frame*); |
void loadEventFired(Frame*); |
- void startConsoleTiming(ScriptExecutionContext*, const String&); |
- void stopConsoleTiming(ScriptExecutionContext*, const String&, PassRefPtr<ScriptCallStack>); |
+ void consoleTime(ScriptExecutionContext*, const String&); |
+ void consoleTimeEnd(ScriptExecutionContext*, const String&, ScriptState*); |
+ void consoleTimeline(ScriptExecutionContext*, const String& title, ScriptState*); |
+ void consoleTimelineEnd(ScriptExecutionContext*, const String& title, ScriptState*); |
void didScheduleResourceRequest(Document*, const String& url); |
void willSendRequest(unsigned long, DocumentLoader*, const ResourceRequest&, const ResourceResponse&, const FetchInitiatorInfo&); |
@@ -255,6 +258,9 @@ private: |
double timestamp(); |
Page* page(); |
+ void innerStart(bool fromConsole); |
+ void innerStop(bool fromConsole); |
+ |
InspectorPageAgent* m_pageAgent; |
InspectorMemoryAgent* m_memoryAgent; |
InspectorDOMAgent* m_domAgent; |
@@ -286,6 +292,8 @@ private: |
RefPtr<TimelineTraceEventProcessor> m_traceEventProcessor; |
unsigned m_styleRecalcElementCounter; |
int m_layerTreeId; |
+ bool m_isStarted; |
+ Vector<String> m_consoleTimelines; |
}; |
} // namespace WebCore |