Introduce InspectorIdentifiers<> and use it to assign/lookup LocalFrame and DocumentLoader

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 21 matching lines @@
 #include "core/inspector/PageRuntimeAgent.h"
 
 #include "bindings/core/v8/DOMWrapperWorld.h"
 #include "bindings/core/v8/PageScriptDebugServer.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/InjectedScript.h"
 #include "core/inspector/InjectedScriptManager.h"
+#include "core/inspector/InspectorIdentifiers.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, ScriptDebugServer* scriptDebugServer, InspectorPageAgent* pageAgent)
@@ skipping 52 matching lines @@
     bool isMainWorld = worldId == MainWorldId;
 
     // Name the context for debugging.
     String type = isMainWorld ? "page" : "injected";
     PageScriptDebugServer::setContextDebugData(scriptState->context(), type, m_debuggerId);
 
     if (!m_enabled)
         return;
     ASSERT(frontend());
     String originString = origin ? origin->toRawString() : "";
-    String frameId = m_pageAgent->frameId(frame);
+    String frameId = InspectorIdentifiers<LocalFrame>::identifier(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())
         return;
     int id = it->value;
@@ skipping 28 matching lines @@
 
 void PageRuntimeAgent::reportExecutionContextCreation()
 {
     Vector<std::pair<ScriptState*, SecurityOrigin*> > isolatedContexts;
     for (Frame* frame = m_pageAgent->inspectedFrame(); frame; frame = frame->tree().traverseNext(m_pageAgent->inspectedFrame())) {
         if (!frame->isLocalFrame())
             continue;
         LocalFrame* localFrame = toLocalFrame(frame);
         if (!localFrame->script().canExecuteScripts(NotAboutToExecuteScript))
             continue;
-        String frameId = m_pageAgent->frameId(localFrame);
+        String frameId = InspectorIdentifiers<LocalFrame>::identifier(localFrame);
 
         // Ensure execution context is created.
         // If initializeMainWorld returns true, then is registered by didCreateScriptContext
         if (!localFrame->script().initializeMainWorld())
             addExecutionContextToFrontend(ScriptState::forMainWorld(localFrame), true, "", frameId);
         localFrame->script().collectIsolatedContexts(isolatedContexts);
         if (isolatedContexts.isEmpty())
             continue;
         for (const auto& pair : isolatedContexts) {
             String originString = pair.second ? pair.second->toRawString() : "";
             addExecutionContextToFrontend(pair.first, false, originString, frameId);
         }
         isolatedContexts.clear();
     }
 }
 
 } // namespace blink