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

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

Issue 686763002: Fix Runtime.executionContextCreated for crafted iframes. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 2 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/PageRuntimeAgent.cpp
diff --git a/Source/core/inspector/PageRuntimeAgent.cpp b/Source/core/inspector/PageRuntimeAgent.cpp
index 9c1d5a2d6d0912b7907f10a6bb0e2972ec1027e8..39c4433de36c7d06a5cb75e211913e23a68245cb 100644
--- a/Source/core/inspector/PageRuntimeAgent.cpp
+++ b/Source/core/inspector/PageRuntimeAgent.cpp
@@ -105,10 +105,32 @@ void PageRuntimeAgent::didClearDocumentOfWindowObject(LocalFrame* frame)
m_scriptStateToId.clear();
m_frontend->executionContextsCleared();
}
+
+ registerMainWorldContext(frame);
yurys 2014/10/30 10:23:43 In this case we should not force initialization, i
eustas 2014/10/31 06:59:53 Done.
+}
+
+void PageRuntimeAgent::registerMainWorldContext(LocalFrame* frame)
+{
+ // Force creation on main world contect.
aandrey 2014/10/30 10:27:16 maybe add a comment that creation otherwise will h
eustas 2014/10/31 06:59:53 Done.
+ // Positive result means that contect was just initialized,
aandrey 2014/10/30 10:27:16 typo: contect
eustas 2014/10/31 06:59:53 Done.
+ // so it was registered in didCreateMainWorldContext.
+ if (frame->script().initializeMainWorld())
+ return;
+
+ // Negative result means that context already exists, and we need to register it.
String frameId = m_pageAgent->frameId(frame);
addExecutionContextToFrontend(ScriptState::forMainWorld(frame), true, "", frameId);
}
+void PageRuntimeAgent::didCreateMainWorldContext(LocalFrame* frame, ScriptState* scriptState, SecurityOrigin* origin)
+{
+ if (!m_enabled)
+ return;
+ ASSERT(m_frontend);
+ String frameId = m_pageAgent->frameId(frame);
+ addExecutionContextToFrontend(scriptState, true, origin->toRawString(), frameId);
+}
+
void PageRuntimeAgent::didCreateIsolatedContext(LocalFrame* frame, ScriptState* scriptState, SecurityOrigin* origin)
{
if (!m_enabled)
@@ -154,8 +176,7 @@ void PageRuntimeAgent::reportExecutionContextCreation()
continue;
String frameId = m_pageAgent->frameId(localFrame);
- ScriptState* scriptState = ScriptState::forMainWorld(localFrame);
- addExecutionContextToFrontend(scriptState, true, "", frameId);
+ registerMainWorldContext(localFrame);
localFrame->script().collectIsolatedContexts(isolatedContexts);
if (isolatedContexts.isEmpty())
continue;
« Source/bindings/core/v8/WindowProxy.cpp ('K') | « Source/core/inspector/PageRuntimeAgent.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698