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

Unified Diff: Source/web/WebDevToolsAgentImpl.cpp

Issue 1102933002: [DevTools] Use WebLayerTreeView::layerTreeId() for instrumentation. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 8 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/web/WebDevToolsAgentImpl.h ('k') | Source/web/WebFrameWidgetImpl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/web/WebDevToolsAgentImpl.cpp
diff --git a/Source/web/WebDevToolsAgentImpl.cpp b/Source/web/WebDevToolsAgentImpl.cpp
index 4c6c175900674603bc8cf02437847503a4c63d15..e245df36a9b3b56db2ab0d3d4f780baca9ea67f3 100644
--- a/Source/web/WebDevToolsAgentImpl.cpp
+++ b/Source/web/WebDevToolsAgentImpl.cpp
@@ -82,6 +82,7 @@
#include "platform/graphics/GraphicsContext.h"
#include "platform/graphics/paint/DisplayItemList.h"
#include "public/platform/Platform.h"
+#include "public/platform/WebLayerTreeView.h"
#include "public/platform/WebRect.h"
#include "public/platform/WebString.h"
#include "public/web/WebDevToolsAgentClient.h"
@@ -256,8 +257,12 @@ PassOwnPtrWillBeRawPtr<WebDevToolsAgentImpl> WebDevToolsAgentImpl::create(WebLoc
{
WebViewImpl* view = frame->viewImpl();
bool isMainFrame = view && view->mainFrameImpl() == frame;
- if (!isMainFrame)
- return adoptPtrWillBeNoop(new WebDevToolsAgentImpl(frame, client, frame->inspectorOverlay()));
+ if (!isMainFrame) {
+ WebDevToolsAgentImpl* agent = new WebDevToolsAgentImpl(frame, client, frame->inspectorOverlay());
+ if (frame->frameWidget())
+ agent->layerTreeViewChanged(frame->frameWidget()->layerTreeView());
+ return adoptPtrWillBeNoop(agent);
+ }
WebDevToolsAgentImpl* agent = new WebDevToolsAgentImpl(frame, client, view->inspectorOverlay());
agent->registerAgent(InspectorRenderingAgent::create(view));
@@ -270,6 +275,7 @@ PassOwnPtrWillBeRawPtr<WebDevToolsAgentImpl> WebDevToolsAgentImpl::create(WebLoc
agent->registerAgent(InspectorAccessibilityAgent::create(view->page()));
agent->registerAgent(InspectorDOMStorageAgent::create(view->page()));
agent->registerAgent(InspectorCacheStorageAgent::create());
+ agent->layerTreeViewChanged(view->layerTreeView());
return adoptPtrWillBeNoop(agent);
}
@@ -586,6 +592,11 @@ void WebDevToolsAgentImpl::didRemovePageOverlay(const GraphicsLayer* layer)
m_layerTreeAgent->didRemovePageOverlay(layer);
}
+void WebDevToolsAgentImpl::layerTreeViewChanged(WebLayerTreeView* layerTreeView)
+{
+ m_tracingAgent->setLayerTreeId(layerTreeView ? layerTreeView->layerTreeId() : 0);
+}
+
void WebDevToolsAgentImpl::enableTracing(const String& categoryFilter)
{
m_client->enableTracing(categoryFilter);
« no previous file with comments | « Source/web/WebDevToolsAgentImpl.h ('k') | Source/web/WebFrameWidgetImpl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698