| Index: Source/core/inspector/InspectorTracingAgent.cpp
|
| diff --git a/Source/core/inspector/InspectorTracingAgent.cpp b/Source/core/inspector/InspectorTracingAgent.cpp
|
| index e2070c75609573bf6a2eba02d91ba9d04e0cf0fb..ba854522b753c9a2be5264fced3c3c157dc624cc 100644
|
| --- a/Source/core/inspector/InspectorTracingAgent.cpp
|
| +++ b/Source/core/inspector/InspectorTracingAgent.cpp
|
| @@ -9,6 +9,7 @@
|
| #include "core/inspector/InspectorTracingAgent.h"
|
|
|
| #include "core/inspector/IdentifiersFactory.h"
|
| +#include "core/inspector/InspectorPageAgent.h"
|
| #include "core/inspector/InspectorState.h"
|
| #include "core/inspector/InspectorTraceEvents.h"
|
| #include "core/inspector/InspectorWorkerAgent.h"
|
| @@ -24,19 +25,19 @@
|
| const char devtoolsMetadataEventCategory[] = TRACE_DISABLED_BY_DEFAULT("devtools.timeline");
|
| }
|
|
|
| -InspectorTracingAgent::InspectorTracingAgent(LocalFrame* inspectedFrame, Client* client, InspectorWorkerAgent* workerAgent)
|
| +InspectorTracingAgent::InspectorTracingAgent(Client* client, InspectorWorkerAgent* workerAgent, InspectorPageAgent* pageAgent)
|
| : InspectorBaseAgent<InspectorTracingAgent, InspectorFrontend::Tracing>("Tracing")
|
| - , m_inspectedFrame(inspectedFrame)
|
| , m_layerTreeId(0)
|
| , m_client(client)
|
| , m_workerAgent(workerAgent)
|
| + , m_pageAgent(pageAgent)
|
| {
|
| }
|
|
|
| DEFINE_TRACE(InspectorTracingAgent)
|
| {
|
| - visitor->trace(m_inspectedFrame);
|
| visitor->trace(m_workerAgent);
|
| + visitor->trace(m_pageAgent);
|
| InspectorBaseAgent::trace(visitor);
|
| }
|
|
|
| @@ -68,7 +69,7 @@
|
|
|
| void InspectorTracingAgent::emitMetadataEvents()
|
| {
|
| - TRACE_EVENT_INSTANT1(devtoolsMetadataEventCategory, "TracingStartedInPage", TRACE_EVENT_SCOPE_THREAD, "data", InspectorTracingStartedInFrame::data(sessionId(), m_inspectedFrame));
|
| + TRACE_EVENT_INSTANT1(devtoolsMetadataEventCategory, "TracingStartedInPage", TRACE_EVENT_SCOPE_THREAD, "data", InspectorTracingStartedInFrame::data(sessionId(), m_pageAgent->inspectedFrame()));
|
| if (m_layerTreeId)
|
| setLayerTreeId(m_layerTreeId);
|
| m_workerAgent->setTracingSessionId(sessionId());
|
|
|