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

Side by Side Diff: third_party/WebKit/Source/core/inspector/PageRuntimeAgent.cpp

Issue 1867423002: [DevTools] Handle iframes when forcing contexts on runtime.enable. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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 unified diff | Download patch
« no previous file with comments | « content/renderer/render_view_browsertest.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2011 Google Inc. All rights reserved. 2 * Copyright (C) 2011 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
59 visitor->trace(m_inspectedFrames); 59 visitor->trace(m_inspectedFrames);
60 InspectorRuntimeAgent::trace(visitor); 60 InspectorRuntimeAgent::trace(visitor);
61 } 61 }
62 62
63 void PageRuntimeAgent::enable(ErrorString* errorString) 63 void PageRuntimeAgent::enable(ErrorString* errorString)
64 { 64 {
65 if (m_enabled) 65 if (m_enabled)
66 return; 66 return;
67 67
68 m_instrumentingAgents->setPageRuntimeAgent(this); 68 m_instrumentingAgents->setPageRuntimeAgent(this);
69 if (m_inspectedFrames->root()->loader().stateMachine()->committedFirstRealDo cumentLoad()) 69 if (m_inspectedFrames->root()->loader().stateMachine()->committedFirstRealDo cumentLoad()) {
70 m_inspectedFrames->root()->script().initializeMainWorld(); 70 for (const LocalFrame* frame : *m_inspectedFrames)
71 frame->script().initializeMainWorld();
72 }
71 InspectorRuntimeAgent::enable(errorString); 73 InspectorRuntimeAgent::enable(errorString);
72 } 74 }
73 75
74 void PageRuntimeAgent::disable(ErrorString* errorString) 76 void PageRuntimeAgent::disable(ErrorString* errorString)
75 { 77 {
76 if (!m_enabled) 78 if (!m_enabled)
77 return; 79 return;
78 InspectorRuntimeAgent::disable(errorString); 80 InspectorRuntimeAgent::disable(errorString);
79 m_instrumentingAgents->setPageRuntimeAgent(nullptr); 81 m_instrumentingAgents->setPageRuntimeAgent(nullptr);
80 } 82 }
81 83
82 void PageRuntimeAgent::didClearDocumentOfWindowObject(LocalFrame* frame) 84 void PageRuntimeAgent::didClearDocumentOfWindowObject(LocalFrame* frame)
83 { 85 {
84 frame->script().initializeMainWorld(); 86 frame->script().initializeMainWorld();
85 } 87 }
86 88
87 } // namespace blink 89 } // namespace blink
OLDNEW
« no previous file with comments | « content/renderer/render_view_browsertest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698