| Index: Source/core/inspector/InspectorTracingAgent.cpp
|
| diff --git a/Source/core/inspector/InspectorTracingAgent.cpp b/Source/core/inspector/InspectorTracingAgent.cpp
|
| index c1f77359dcaa80d9efe8ec3d7eb07bd81da0bfd4..b6ae30ebe2e24764429e7d6bef5651adecf2dbf7 100644
|
| --- a/Source/core/inspector/InspectorTracingAgent.cpp
|
| +++ b/Source/core/inspector/InspectorTracingAgent.cpp
|
| @@ -10,10 +10,10 @@
|
|
|
| #include "core/inspector/IdentifiersFactory.h"
|
| #include "core/inspector/InspectorClient.h"
|
| -#include "core/inspector/InspectorPageAgent.h"
|
| #include "core/inspector/InspectorState.h"
|
| #include "core/inspector/InspectorTraceEvents.h"
|
| #include "core/inspector/InspectorWorkerAgent.h"
|
| +#include "core/page/Page.h"
|
| #include "platform/TraceEvent.h"
|
|
|
| namespace blink {
|
| @@ -26,20 +26,20 @@
|
| const char devtoolsMetadataEventCategory[] = TRACE_DISABLED_BY_DEFAULT("devtools.timeline");
|
| }
|
|
|
| -InspectorTracingAgent::InspectorTracingAgent(InspectorClient* client, InspectorWorkerAgent* workerAgent, InspectorPageAgent* pageAgent)
|
| +InspectorTracingAgent::InspectorTracingAgent(InspectorClient* client, InspectorWorkerAgent* workerAgent, Page* page)
|
| : InspectorBaseAgent<InspectorTracingAgent>("Tracing")
|
| , m_layerTreeId(0)
|
| , m_client(client)
|
| , m_frontend(0)
|
| , m_workerAgent(workerAgent)
|
| - , m_pageAgent(pageAgent)
|
| + , m_page(page)
|
| {
|
| }
|
|
|
| void InspectorTracingAgent::trace(Visitor* visitor)
|
| {
|
| visitor->trace(m_workerAgent);
|
| - visitor->trace(m_pageAgent);
|
| + visitor->trace(m_page);
|
| InspectorBaseAgent<InspectorTracingAgent>::trace(visitor);
|
| }
|
|
|
| @@ -71,7 +71,7 @@
|
|
|
| void InspectorTracingAgent::emitMetadataEvents()
|
| {
|
| - TRACE_EVENT_INSTANT1(devtoolsMetadataEventCategory, "TracingStartedInPage", "data", InspectorTracingStartedInFrame::data(sessionId(), m_pageAgent->inspectedFrame()));
|
| + TRACE_EVENT_INSTANT1(devtoolsMetadataEventCategory, "TracingStartedInPage", "data", InspectorTracingStartedInPage::data(sessionId(), m_page));
|
| if (m_layerTreeId)
|
| setLayerTreeId(m_layerTreeId);
|
| m_workerAgent->setTracingSessionId(sessionId());
|
|
|