DevTools: pass agent host id to the renderer (Blink).

Source/core/inspector/InspectorController.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 132 matching lines @@
 void InspectorController::initializeDeferredAgents()
 {
     if (m_deferredAgentsInitialized)
         return;
     m_deferredAgentsInitialized = true;
 
     InjectedScriptManager* injectedScriptManager = m_injectedScriptManager.get();
     InspectorOverlay* overlay = m_overlay.get();
 
     OwnPtr<InspectorResourceAgent> resourceAgentPtr(InspectorResourceAgent::create(m_pageAgent));
-    InspectorResourceAgent* resourceAgent = resourceAgentPtr.get();
+    m_resourceAgent = resourceAgentPtr.get();
     m_agents.append(resourceAgentPtr.release());
 
-    m_agents.append(InspectorCSSAgent::create(m_domAgent, m_pageAgent, resourceAgent));
+    m_agents.append(InspectorCSSAgent::create(m_domAgent, m_pageAgent, m_resourceAgent));
 
     m_agents.append(InspectorDOMStorageAgent::create(m_pageAgent));
 
     m_agents.append(InspectorMemoryAgent::create());
 
     m_agents.append(InspectorApplicationCacheAgent::create(m_pageAgent));
 
     PageScriptDebugServer* pageScriptDebugServer = &PageScriptDebugServer::shared();
 
     OwnPtr<InspectorDebuggerAgent> debuggerAgentPtr(PageDebuggerAgent::create(pageScriptDebugServer, m_pageAgent, injectedScriptManager, overlay));
@@ skipping 33 matching lines @@
 }
 
 void InspectorController::didClearDocumentOfWindowObject(LocalFrame* frame)
 {
     // If the page is supposed to serve as InspectorFrontend notify inspector frontend
     // client that it's cleared so that the client can expose inspector bindings.
     if (m_inspectorFrontendClient && frame == m_page->mainFrame())
         m_inspectorFrontendClient->windowObjectCleared();
 }
 
-void InspectorController::connectFrontend(InspectorFrontendChannel* frontendChannel)
+void InspectorController::connectFrontend(const String& hostId, InspectorFrontendChannel* frontendChannel)
 {
     ASSERT(frontendChannel);
+    m_hostId = hostId;
 
     initializeDeferredAgents();
+    m_resourceAgent->setHostId(hostId);
 
     m_inspectorFrontend = adoptPtr(new InspectorFrontend(frontendChannel));
     // We can reconnect to existing front-end -> unmute state.
     m_state->unmute();
 
     m_agents.setFrontend(m_inspectorFrontend.get());
 
     InspectorInstrumentation::registerInstrumentingAgents(m_instrumentingAgents.get());
     InspectorInstrumentation::frontendCreated();
 
@@ skipping 15 matching lines @@
     m_state->mute();
 
     m_agents.clearFrontend();
 
     m_inspectorFrontend.clear();
 
     // relese overlay page resources
     m_overlay->freePage();
     InspectorInstrumentation::frontendDeleted();
     InspectorInstrumentation::unregisterInstrumentingAgents(m_instrumentingAgents.get());
+    m_hostId = "";
 }
 
 void InspectorController::reconnectFrontend()
 {
     if (!m_inspectorFrontend)
         return;
     InspectorFrontendChannel* frontendChannel = m_inspectorFrontend->channel();
+    String hostId = m_hostId;
     disconnectFrontend();
-    connectFrontend(frontendChannel);
+    connectFrontend(hostId, frontendChannel);
 }
 
-void InspectorController::reuseFrontend(InspectorFrontendChannel* frontendChannel, const String& inspectorStateCookie)
+void InspectorController::reuseFrontend(const String& hostId, InspectorFrontendChannel* frontendChannel, const String& inspectorStateCookie)
 {
     ASSERT(!m_inspectorFrontend);
-    connectFrontend(frontendChannel);
+    connectFrontend(hostId, frontendChannel);
     m_state->loadFromCookie(inspectorStateCookie);
     m_agents.restore();
 }
 
 void InspectorController::setProcessId(long processId)
 {
     IdentifiersFactory::setProcessId(processId);
 }
 
 void InspectorController::setLayerTreeId(int id)
@@ skipping 108 matching lines @@
 void InspectorController::resume()
 {
     if (InspectorDebuggerAgent* debuggerAgent = m_instrumentingAgents->inspectorDebuggerAgent()) {
         ErrorString error;
         debuggerAgent->resume(&error);
     }
 }
 
 void InspectorController::setResourcesDataSizeLimitsFromInternals(int maximumResourcesContentSize, int maximumSingleResourceContentSize)
 {
-    if (InspectorResourceAgent* resourceAgent = m_instrumentingAgents->inspectorResourceAgent())
-        resourceAgent->setResourcesDataSizeLimitsFromInternals(maximumResourcesContentSize, maximumSingleResourceContentSize);
+    if (m_resourceAgent)
+        m_resourceAgent->setResourcesDataSizeLimitsFromInternals(maximumResourcesContentSize, maximumSingleResourceContentSize);
 }
 
 void InspectorController::willProcessTask()
 {
     if (InspectorTimelineAgent* timelineAgent = m_instrumentingAgents->inspectorTimelineAgent())
         timelineAgent->willProcessTask();
     if (InspectorProfilerAgent* profilerAgent = m_instrumentingAgents->inspectorProfilerAgent())
         profilerAgent->willProcessTask();
 }
 
@@ skipping 63 matching lines @@
         m_layerTreeAgent->willAddPageOverlay(layer);
 }
 
 void InspectorController::didRemovePageOverlay(const GraphicsLayer* layer)
 {
     if (m_layerTreeAgent)
         m_layerTreeAgent->didRemovePageOverlay(layer);
 }
 
 } // namespace WebCore