Revert of DevTools: use per-LocalFrame instrumenting agents instead of per-Page ones.

Source/core/inspector/InspectorInstrumentation.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 177 matching lines @@
 InspectorTimelineAgent* retrieveTimelineAgent(const InspectorInstrumentationCookie& cookie)
 {
     if (!cookie.instrumentingAgents())
         return 0;
     InspectorTimelineAgent* timelineAgent = cookie.instrumentingAgents()->inspectorTimelineAgent();
     if (timelineAgent && cookie.hasMatchingTimelineAgentId(timelineAgent->id()))
         return timelineAgent;
     return 0;
 }
 
-InstrumentingAgents* instrumentingAgentsFor(LocalFrame* frame)
+InstrumentingAgents* instrumentingAgentsFor(Page* page)
 {
-    return frame ? frame->instrumentingAgents() : nullptr;
+    if (!page)
+        return 0;
+    return instrumentationForPage(page);
 }
 
 InstrumentingAgents* instrumentingAgentsFor(EventTarget* eventTarget)
 {
     if (!eventTarget)
         return 0;
     return instrumentingAgentsFor(eventTarget->executionContext());
 }
 
 InstrumentingAgents* instrumentingAgentsFor(RenderObject* renderer)
 {
     return instrumentingAgentsFor(renderer->frame());
 }
 
 InstrumentingAgents* instrumentingAgentsFor(WorkerGlobalScope* workerGlobalScope)
 {
     if (!workerGlobalScope)
         return 0;
     return instrumentationForWorkerGlobalScope(workerGlobalScope);
 }
 
+InstrumentingAgents* instrumentingAgentsFor(FrameHost* host)
+{
+    return instrumentationForPage(&host->page());
+}
+
 InstrumentingAgents* instrumentingAgentsForNonDocumentContext(ExecutionContext* context)
 {
     if (context->isWorkerGlobalScope())
         return instrumentationForWorkerGlobalScope(toWorkerGlobalScope(context));
     return 0;
 }
 
 } // namespace InspectorInstrumentation
 
 namespace InstrumentationEvents {
 const char PaintSetup[] = "PaintSetup";
 const char Paint[] = "Paint";
 const char Layer[] = "Layer";
 const char RequestMainThreadFrame[] = "RequestMainThreadFrame";
 const char BeginFrame[] = "BeginFrame";
 const char ActivateLayerTree[] = "ActivateLayerTree";
 const char DrawFrame[] = "DrawFrame";
 const char EmbedderCallback[] = "EmbedderCallback";
 };
 
 namespace InstrumentationEventArguments {
 const char FrameId[] = "frameId";
 const char LayerId[] = "layerId";
 const char LayerTreeId[] = "layerTreeId";
 const char PageId[] = "pageId";
 const char CallbackName[] = "callbackName";
 };
 
+InstrumentingAgents* instrumentationForPage(Page* page)
+{
+    ASSERT(isMainThread());
+    return page->inspectorController().m_instrumentingAgents.get();
+}
+
 InstrumentingAgents* instrumentationForWorkerGlobalScope(WorkerGlobalScope* workerGlobalScope)
 {
     if (WorkerInspectorController* controller = workerGlobalScope->workerInspectorController())
         return controller->m_instrumentingAgents.get();
     return 0;
 }
 
 } // namespace blink