| Index: Source/core/inspector/PageRuntimeAgent.cpp
|
| diff --git a/Source/core/inspector/PageRuntimeAgent.cpp b/Source/core/inspector/PageRuntimeAgent.cpp
|
| index 435cfb8b8bacb87e6a7c84f89256366a8e17901a..97987168cd29596678b7890bd8a8e17942843bba 100644
|
| --- a/Source/core/inspector/PageRuntimeAgent.cpp
|
| +++ b/Source/core/inspector/PageRuntimeAgent.cpp
|
| @@ -130,14 +130,17 @@ void PageRuntimeAgent::unmuteConsole()
|
| void PageRuntimeAgent::reportExecutionContextCreation()
|
| {
|
| Vector<std::pair<ScriptState*, SecurityOrigin*> > isolatedContexts;
|
| - for (LocalFrame* frame = m_inspectedPage->mainFrame(); frame; frame = frame->tree().traverseNext()) {
|
| - if (!frame->script().canExecuteScripts(NotAboutToExecuteScript))
|
| + for (Frame* frame = m_inspectedPage->mainFrame(); frame; frame = frame->tree().traverseNext()) {
|
| + if (!frame->isLocalFrame())
|
| continue;
|
| - String frameId = m_pageAgent->frameId(frame);
|
| + LocalFrame* localFrame = toLocalFrame(frame);
|
| + if (!localFrame->script().canExecuteScripts(NotAboutToExecuteScript))
|
| + continue;
|
| + String frameId = m_pageAgent->frameId(localFrame);
|
|
|
| - ScriptState* scriptState = ScriptState::forMainWorld(frame);
|
| + ScriptState* scriptState = ScriptState::forMainWorld(localFrame);
|
| addExecutionContextToFrontend(scriptState, true, "", frameId);
|
| - frame->script().collectIsolatedContexts(isolatedContexts);
|
| + localFrame->script().collectIsolatedContexts(isolatedContexts);
|
| if (isolatedContexts.isEmpty())
|
| continue;
|
| for (size_t i = 0; i< isolatedContexts.size(); i++)
|
|
|