| Index: Source/core/inspector/InspectorTimelineAgent.h
|
| diff --git a/Source/core/inspector/InspectorTimelineAgent.h b/Source/core/inspector/InspectorTimelineAgent.h
|
| index d648e1f75104c2b8075687d7be59815baba500ea..3e0c78d4ab138e8d55ce532e7916ca8b10a92f08 100644
|
| --- a/Source/core/inspector/InspectorTimelineAgent.h
|
| +++ b/Source/core/inspector/InspectorTimelineAgent.h
|
| @@ -69,6 +69,7 @@ class InspectorDOMAgent;
|
| class InspectorFrontend;
|
| class InspectorOverlay;
|
| class InspectorPageAgent;
|
| +class InspectorTracingAgent;
|
| class InspectorLayerTreeAgent;
|
| class InstrumentingAgents;
|
| class KURL;
|
| @@ -115,10 +116,10 @@ public:
|
| uint64_t limitGPUMemoryBytes;
|
| };
|
|
|
| - static PassOwnPtr<InspectorTimelineAgent> create(InspectorPageAgent* pageAgent, InspectorDOMAgent* domAgent, InspectorLayerTreeAgent* layerTreeAgent,
|
| + static PassOwnPtr<InspectorTimelineAgent> create(InspectorPageAgent* pageAgent, InspectorDOMAgent* domAgent, InspectorLayerTreeAgent* layerTreeAgent, InspectorTracingAgent* tracingAgent,
|
| InspectorOverlay* overlay, InspectorType type, InspectorClient* client)
|
| {
|
| - return adoptPtr(new InspectorTimelineAgent(pageAgent, domAgent, layerTreeAgent, overlay, type, client));
|
| + return adoptPtr(new InspectorTimelineAgent(pageAgent, domAgent, layerTreeAgent, tracingAgent, overlay, type, client));
|
| }
|
|
|
| virtual ~InspectorTimelineAgent();
|
| @@ -127,7 +128,7 @@ public:
|
| virtual void clearFrontend() OVERRIDE;
|
| virtual void restore() OVERRIDE;
|
|
|
| - virtual void enable(ErrorString*, const String* traceEventCategoryFilter) OVERRIDE;
|
| + virtual void enable(ErrorString*) OVERRIDE;
|
| virtual void disable(ErrorString*) OVERRIDE;
|
| virtual void start(ErrorString*, const int* maxCallStackDepth, const bool* bufferEvents, const String* liveEvents, const bool* includeCounters, const bool* includeGPUEvents) OVERRIDE;
|
| virtual void stop(ErrorString*, RefPtr<TypeBuilder::Array<TypeBuilder::Timeline::TimelineEvent> >& events) OVERRIDE;
|
| @@ -237,7 +238,7 @@ private:
|
|
|
| friend class TimelineRecordStack;
|
|
|
| - InspectorTimelineAgent(InspectorPageAgent*, InspectorDOMAgent*, InspectorLayerTreeAgent*, InspectorOverlay*, InspectorType, InspectorClient*);
|
| + InspectorTimelineAgent(InspectorPageAgent*, InspectorDOMAgent*, InspectorLayerTreeAgent*, InspectorTracingAgent*, InspectorOverlay*, InspectorType, InspectorClient*);
|
|
|
| // Trace event handlers
|
| void onBeginImplSideFrame(const TraceEventDispatcher::TraceEvent&);
|
| @@ -296,6 +297,7 @@ private:
|
| InspectorPageAgent* m_pageAgent;
|
| InspectorDOMAgent* m_domAgent;
|
| InspectorLayerTreeAgent* m_layerTreeAgent;
|
| + InspectorTracingAgent* m_tracingAgent;
|
| InspectorFrontend::Timeline* m_frontend;
|
| InspectorClient* m_client;
|
| InspectorOverlay* m_overlay;
|
| @@ -327,7 +329,6 @@ private:
|
| bool m_mayEmitFirstPaint;
|
| HashSet<String> m_liveEvents;
|
| double m_lastProgressTimestamp;
|
| - bool m_disableTracingOnStop;
|
| };
|
|
|
| } // namespace WebCore
|
|
|