Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(697)

Unified Diff: Source/core/inspector/InspectorTracingAgent.cpp

Issue 898593002: DevTools: use per-LocalFrame instrumenting agents instead of per-Page ones. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: fixed assertion Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/inspector/InspectorTracingAgent.h ('k') | Source/core/inspector/PageConsoleAgent.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/inspector/InspectorTracingAgent.cpp
diff --git a/Source/core/inspector/InspectorTracingAgent.cpp b/Source/core/inspector/InspectorTracingAgent.cpp
index b6ae30ebe2e24764429e7d6bef5651adecf2dbf7..c1f77359dcaa80d9efe8ec3d7eb07bd81da0bfd4 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 @@ namespace {
const char devtoolsMetadataEventCategory[] = TRACE_DISABLED_BY_DEFAULT("devtools.timeline");
}
-InspectorTracingAgent::InspectorTracingAgent(InspectorClient* client, InspectorWorkerAgent* workerAgent, Page* page)
+InspectorTracingAgent::InspectorTracingAgent(InspectorClient* client, InspectorWorkerAgent* workerAgent, InspectorPageAgent* pageAgent)
: InspectorBaseAgent<InspectorTracingAgent>("Tracing")
, m_layerTreeId(0)
, m_client(client)
, m_frontend(0)
, m_workerAgent(workerAgent)
- , m_page(page)
+ , m_pageAgent(pageAgent)
{
}
void InspectorTracingAgent::trace(Visitor* visitor)
{
visitor->trace(m_workerAgent);
- visitor->trace(m_page);
+ visitor->trace(m_pageAgent);
InspectorBaseAgent<InspectorTracingAgent>::trace(visitor);
}
@@ -71,7 +71,7 @@ String InspectorTracingAgent::sessionId()
void InspectorTracingAgent::emitMetadataEvents()
{
- TRACE_EVENT_INSTANT1(devtoolsMetadataEventCategory, "TracingStartedInPage", "data", InspectorTracingStartedInPage::data(sessionId(), m_page));
+ TRACE_EVENT_INSTANT1(devtoolsMetadataEventCategory, "TracingStartedInPage", "data", InspectorTracingStartedInFrame::data(sessionId(), m_pageAgent->inspectedFrame()));
if (m_layerTreeId)
setLayerTreeId(m_layerTreeId);
m_workerAgent->setTracingSessionId(sessionId());
« no previous file with comments | « Source/core/inspector/InspectorTracingAgent.h ('k') | Source/core/inspector/PageConsoleAgent.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698