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

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

Issue 301983003: Make Inspector aware of RemoteFrames in FrameTree (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: yurys' review comment addressed Created 6 years, 7 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
Index: Source/core/inspector/InspectorCanvasAgent.cpp
diff --git a/Source/core/inspector/InspectorCanvasAgent.cpp b/Source/core/inspector/InspectorCanvasAgent.cpp
index 08664a6f0b6ce2186b792fe0e5582463fffe2154..1b07fd3a54dd6860a5a714ded7279bb9d66e3741 100644
--- a/Source/core/inspector/InspectorCanvasAgent.cpp
+++ b/Source/core/inspector/InspectorCanvasAgent.cpp
@@ -310,18 +310,21 @@ void InspectorCanvasAgent::didCommitLoad(LocalFrame*, DocumentLoader* loader)
{
if (!m_enabled)
return;
- LocalFrame* frame = loader->frame();
+ Frame* frame = loader->frame();
if (frame == m_pageAgent->mainFrame()) {
for (FramesWithUninstrumentedCanvases::iterator it = m_framesWithUninstrumentedCanvases.begin(); it != m_framesWithUninstrumentedCanvases.end(); ++it)
it->value = false;
m_frontend->traceLogsRemoved(0, 0);
} else {
while (frame) {
- if (m_framesWithUninstrumentedCanvases.contains(frame))
- m_framesWithUninstrumentedCanvases.set(frame, false);
- if (m_pageAgent->hasIdForFrame(frame)) {
- String frameId = m_pageAgent->frameId(frame);
- m_frontend->traceLogsRemoved(&frameId, 0);
+ if (frame->isLocalFrame()) {
+ LocalFrame* localFrame = toLocalFrame(frame);
+ if (m_framesWithUninstrumentedCanvases.contains(localFrame))
+ m_framesWithUninstrumentedCanvases.set(localFrame, false);
+ if (m_pageAgent->hasIdForFrame(localFrame)) {
+ String frameId = m_pageAgent->frameId(localFrame);
+ m_frontend->traceLogsRemoved(&frameId, 0);
+ }
}
frame = frame->tree().traverseNext();
}
« no previous file with comments | « Source/core/inspector/InspectorApplicationCacheAgent.cpp ('k') | Source/core/inspector/InspectorDOMAgent.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698