Remove debugger id, use local frame id instead.

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 14 matching lines @@
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
 #include "core/inspector/PageRuntimeAgent.h"
 
 #include "bindings/core/v8/DOMWrapperWorld.h"
-#include "bindings/core/v8/MainThreadDebugger.h"
 #include "bindings/core/v8/ScriptController.h"
 #include "bindings/core/v8/ScriptState.h"
 #include "core/frame/FrameConsole.h"
 #include "core/frame/LocalFrame.h"
 #include "core/inspector/IdentifiersFactory.h"
 #include "core/inspector/InjectedScript.h"
 #include "core/inspector/InjectedScriptManager.h"
 #include "core/inspector/InspectorPageAgent.h"
 #include "core/inspector/InstrumentingAgents.h"
 #include "core/page/Page.h"
 #include "platform/weborigin/SecurityOrigin.h"
 
 namespace blink {
 
-static int s_nextDebuggerId = 1;
-
 PageRuntimeAgent::PageRuntimeAgent(InjectedScriptManager* injectedScriptManager, Client* client, V8Debugger* debugger, InspectorPageAgent* pageAgent)
     : InspectorRuntimeAgent(injectedScriptManager, debugger, client)
     , m_pageAgent(pageAgent)
     , m_mainWorldContextCreated(false)
-    , m_debuggerId(s_nextDebuggerId++)
 {
 }
 
 PageRuntimeAgent::~PageRuntimeAgent()
 {
 #if !ENABLE(OILPAN)
     m_instrumentingAgents->setPageRuntimeAgent(0);
 #endif
 }
 
@@ skipping 28 matching lines @@
 
     if (!m_enabled)
         return;
     ASSERT(frontend());
 
     frame->script().initializeMainWorld();
 }
 
 void PageRuntimeAgent::didCreateScriptContext(LocalFrame* frame, ScriptState* scriptState, SecurityOrigin* origin, int worldId)
 {
-    bool isMainWorld = worldId == MainWorldId;
-
-    // Name the context for debugging.
-    String type = isMainWorld ? "page" : "injected";
-    MainThreadDebugger::setContextDebugData(scriptState->context(), type, m_debuggerId);
-
     if (!m_enabled)

[pfeldman, 2015/07/06 12:35:50]

This agent no longer needs to be enabled at all times.

         return;
     ASSERT(frontend());
+    bool isMainWorld = worldId == MainWorldId;
     String originString = origin ? origin->toRawString() : "";
     String frameId = IdentifiersFactory::frameId(frame);
     addExecutionContextToFrontend(scriptState, isMainWorld, originString, frameId);
 }
 
 void PageRuntimeAgent::willReleaseScriptContext(LocalFrame* frame, ScriptState* scriptState)
 {
     injectedScriptManager()->discardInjectedScriptFor(scriptState);
     ScriptStateToId::iterator it = m_scriptStateToId.find(scriptState);
     if (it == m_scriptStateToId.end())
@@ skipping 49 matching lines @@
         for (const auto& pair : isolatedContexts) {
             String originString = pair.second ? pair.second->toRawString() : "";
             addExecutionContextToFrontend(pair.first, false, originString, frameId);
         }
         isolatedContexts.clear();
     }
 }
 
 } // namespace blink