Fix Runtime.executionContextCreated for crafted iframes.

Source/core/inspector/PageRuntimeAgent.cpp

Index: Source/core/inspector/PageRuntimeAgent.cpp
diff --git a/Source/core/inspector/PageRuntimeAgent.cpp b/Source/core/inspector/PageRuntimeAgent.cpp
index 9c1d5a2d6d0912b7907f10a6bb0e2972ec1027e8..2cdba8f7e86be96399745f3ba03daea6883cb3b3 100644
--- a/Source/core/inspector/PageRuntimeAgent.cpp
+++ b/Source/core/inspector/PageRuntimeAgent.cpp
@@ -85,7 +85,7 @@ void PageRuntimeAgent::enable(ErrorString* errorString)
     // unintentionally initialize contexts in the frames which may trigger some listeners
     // that are expected to be triggered only after the load is committed, see http://crbug.com/131623
     if (m_mainWorldContextCreated)
-        reportExecutionContextCreation();
+        reportExecutionContextsToFrontend();
 }
 
 void PageRuntimeAgent::run(ErrorString* errorString)
@@ -96,17 +96,25 @@ void PageRuntimeAgent::run(ErrorString* errorString)
 void PageRuntimeAgent::didClearDocumentOfWindowObject(LocalFrame* frame)
 {
     m_mainWorldContextCreated = true;
+}
+
+void PageRuntimeAgent::registerMainWorldContext(LocalFrame* frame)
+{
+    if (!frame->script().isMainWorldInitialized())
+        return;
 
+    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);
 
-    if (frame == m_inspectedPage->mainFrame()) {
-        m_scriptStateToId.clear();
-        m_frontend->executionContextsCleared();
-    }
     String frameId = m_pageAgent->frameId(frame);
-    addExecutionContextToFrontend(ScriptState::forMainWorld(frame), true, "", frameId);
+    addExecutionContextToFrontend(scriptState, true, origin->toRawString(), frameId);
 }
 
 void PageRuntimeAgent::didCreateIsolatedContext(LocalFrame* frame, ScriptState* scriptState, SecurityOrigin* origin)
@@ -143,7 +151,7 @@ void PageRuntimeAgent::unmuteConsole()
     FrameConsole::unmute();
 }
 
-void PageRuntimeAgent::reportExecutionContextCreation()
+void PageRuntimeAgent::reportExecutionContextsToFrontend()
 {
     Vector<std::pair<ScriptState*, SecurityOrigin*> > isolatedContexts;
     for (Frame* frame = m_inspectedPage->mainFrame(); frame; frame = frame->tree().traverseNext()) {
@@ -154,8 +162,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;