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

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

Issue 18344005: DevTools: expose setLayerTreeId() so we can relate events from LayerTreeHost (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: fixed another regression Created 7 years, 5 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/InspectorController.h ('k') | Source/core/inspector/InspectorInstrumentation.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/inspector/InspectorController.cpp
diff --git a/Source/core/inspector/InspectorController.cpp b/Source/core/inspector/InspectorController.cpp
index 196c876e43114652c0cafce1b11f9d3629f65329..d5def10b3494cf14e8e9805d87a71f6039490ef7 100644
--- a/Source/core/inspector/InspectorController.cpp
+++ b/Source/core/inspector/InspectorController.cpp
@@ -107,10 +107,12 @@ InspectorController::InspectorController(Page* page, InspectorClient* inspectorC
m_memoryAgent = memoryAgentPtr.get();
m_agents.append(memoryAgentPtr.release());
- m_agents.append(InspectorTimelineAgent::create(m_instrumentingAgents.get(), pageAgent, m_memoryAgent, domAgent, m_state.get(), InspectorTimelineAgent::PageInspector,
- inspectorClient));
- m_agents.append(InspectorApplicationCacheAgent::create(m_instrumentingAgents.get(), m_state.get(), pageAgent));
+ OwnPtr<InspectorTimelineAgent> timelineAgentPtr(InspectorTimelineAgent::create(m_instrumentingAgents.get(), pageAgent, m_memoryAgent, domAgent, m_state.get(),
+ InspectorTimelineAgent::PageInspector, inspectorClient));
+ m_timelineAgent = timelineAgentPtr.get();
+ m_agents.append(timelineAgentPtr.release());
+ m_agents.append(InspectorApplicationCacheAgent::create(m_instrumentingAgents.get(), m_state.get(), pageAgent));
m_agents.append(InspectorResourceAgent::create(m_instrumentingAgents.get(), pageAgent, inspectorClient, m_state.get(), m_overlay.get()));
PageScriptDebugServer* pageScriptDebugServer = &PageScriptDebugServer::shared();
@@ -242,6 +244,11 @@ void InspectorController::setProcessId(long processId)
IdentifiersFactory::setProcessId(processId);
}
+void InspectorController::setLayerTreeId(int id)
+{
+ m_timelineAgent->setLayerTreeId(id);
+}
+
void InspectorController::webViewResized(const IntSize& size)
{
if (InspectorPageAgent* pageAgent = m_instrumentingAgents->inspectorPageAgent())
« no previous file with comments | « Source/core/inspector/InspectorController.h ('k') | Source/core/inspector/InspectorInstrumentation.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698