Revert of [DevTools] Postpone more agents instantiation until attached.

third_party/WebKit/Source/core/inspector/PageRuntimeAgent.cpp

 /*
  * Copyright (C) 2011 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 31 matching lines @@
 #include "platform/v8_inspector/public/V8RuntimeAgent.h"
 #include "platform/weborigin/SecurityOrigin.h"
 
 using blink::protocol::Runtime::ExceptionDetails;
 
 namespace blink {
 
 PageRuntimeAgent::PageRuntimeAgent(Client* client, V8Debugger* debugger, InspectedFrames* inspectedFrames)
     : InspectorRuntimeAgent(debugger, client)
     , m_inspectedFrames(inspectedFrames)
+    , m_mainWorldContextCreated(false)
 {
 }
 
 PageRuntimeAgent::~PageRuntimeAgent()
 {
 #if !ENABLE(OILPAN)
     m_instrumentingAgents->setPageRuntimeAgent(0);
 #endif
 }
 
 DEFINE_TRACE(PageRuntimeAgent)
 {
     visitor->trace(m_inspectedFrames);
     InspectorRuntimeAgent::trace(visitor);
 }
 
+void PageRuntimeAgent::init()
+{
+    InspectorRuntimeAgent::init();
+    m_instrumentingAgents->setPageRuntimeAgent(this);
+}
+
 void PageRuntimeAgent::enable(ErrorString* errorString)
 {
     if (m_enabled)
         return;
 
     InspectorRuntimeAgent::enable(errorString);
-    m_instrumentingAgents->setPageRuntimeAgent(this);
 }
 
 void PageRuntimeAgent::disable(ErrorString* errorString)
 {
     if (!m_enabled)
         return;
-    m_instrumentingAgents->setPageRuntimeAgent(nullptr);
     InspectorRuntimeAgent::disable(errorString);
 }
 
 void PageRuntimeAgent::didClearDocumentOfWindowObject(LocalFrame* frame)
 {
+    m_mainWorldContextCreated = true;
+
+    if (!m_enabled)
+        return;
     ASSERT(frontend());
+
     if (frame == m_inspectedFrames->root())
         m_v8RuntimeAgent->clearInspectedObjects();
     frame->script().initializeMainWorld();
 }
 
 void PageRuntimeAgent::didCreateScriptContext(LocalFrame* frame, ScriptState* scriptState, SecurityOrigin* origin, int worldId)
 {
+    if (!m_enabled)
+        return;
     ASSERT(frontend());
     bool isMainWorld = worldId == MainWorldId;
     String originString = origin ? origin->toRawString() : "";
     String frameId = IdentifiersFactory::frameId(frame);
     reportExecutionContext(scriptState, isMainWorld, originString, frameId);
 }
 
 void PageRuntimeAgent::willReleaseScriptContext(LocalFrame* frame, ScriptState* scriptState)
 {
     reportExecutionContextDestroyed(scriptState);
@@ skipping 14 matching lines @@
 void PageRuntimeAgent::unmuteConsole()
 {
     FrameConsole::unmute();
 }
 
 void PageRuntimeAgent::reportExecutionContexts()
 {
     // Only report existing contexts if the page did commit load, otherwise we may
     // 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_client->didCommitLoadFired())
+    if (!m_mainWorldContextCreated)
         return;
 
     Vector<std::pair<ScriptState*, SecurityOrigin*>> isolatedContexts;
     for (LocalFrame* frame : *m_inspectedFrames) {
         if (!frame->script().canExecuteScripts(NotAboutToExecuteScript))
             continue;
         String frameId = IdentifiersFactory::frameId(frame);
 
         // Ensure execution context is created.
         // If initializeMainWorld returns true, then is registered by didCreateScriptContext
@@ skipping 14 matching lines @@
 
 void PageRuntimeAgent::reportExecutionContext(ScriptState* scriptState, bool isPageContext, const String& origin, const String& frameId)
 {
     DOMWrapperWorld& world = scriptState->world();
     String humanReadableName = world.isIsolatedWorld() ? world.isolatedWorldHumanReadableName() : "";
     String type = isPageContext ? "" : "Extension";
     InspectorRuntimeAgent::reportExecutionContextCreated(scriptState, type, origin, humanReadableName, frameId);
 }
 
 } // namespace blink