| Index: Source/core/inspector/InspectorController.cpp
|
| diff --git a/Source/core/inspector/InspectorController.cpp b/Source/core/inspector/InspectorController.cpp
|
| index 383415730d1cc92800f717bc2e76ffea6624debb..adcd81996dfc6a90618f11e7bf289e468631a830 100644
|
| --- a/Source/core/inspector/InspectorController.cpp
|
| +++ b/Source/core/inspector/InspectorController.cpp
|
| @@ -58,6 +58,7 @@
|
| #include "core/inspector/InspectorResourceAgent.h"
|
| #include "core/inspector/InspectorState.h"
|
| #include "core/inspector/InspectorTimelineAgent.h"
|
| +#include "core/inspector/InspectorTracingAgent.h"
|
| #include "core/inspector/InspectorWorkerAgent.h"
|
| #include "core/inspector/InstrumentingAgents.h"
|
| #include "core/inspector/PageConsoleAgent.h"
|
| @@ -99,7 +100,11 @@ InspectorController::InspectorController(Page* page, InspectorClient* inspectorC
|
| m_layerTreeAgent = layerTreeAgentPtr.get();
|
| m_agents.append(layerTreeAgentPtr.release());
|
|
|
| - OwnPtr<InspectorTimelineAgent> timelineAgentPtr(InspectorTimelineAgent::create(m_pageAgent, m_domAgent, m_layerTreeAgent,
|
| + OwnPtr<InspectorTracingAgent> tracingAgentPtr = InspectorTracingAgent::create(inspectorClient);
|
| + m_tracingAgent = tracingAgentPtr.get();
|
| + m_agents.append(tracingAgentPtr.release());
|
| +
|
| + OwnPtr<InspectorTimelineAgent> timelineAgentPtr(InspectorTimelineAgent::create(m_pageAgent, m_domAgent, m_layerTreeAgent, m_tracingAgent,
|
| overlay, InspectorTimelineAgent::PageInspector, inspectorClient));
|
| m_timelineAgent = timelineAgentPtr.get();
|
| m_agents.append(timelineAgentPtr.release());
|
| @@ -269,6 +274,7 @@ void InspectorController::setProcessId(long processId)
|
| void InspectorController::setLayerTreeId(int id)
|
| {
|
| m_timelineAgent->setLayerTreeId(id);
|
| + m_tracingAgent->setLayerTreeId(id);
|
| }
|
|
|
| void InspectorController::webViewResized(const IntSize& size)
|
|
|