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

Source/core/inspector/InspectorInstrumentation.h

 /*
 * Copyright (C) 2010 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 36 matching lines @@
 #include "platform/network/FormData.h"
 #include "platform/network/WebSocketHandshakeRequest.h"
 #include "platform/network/WebSocketHandshakeResponse.h"
 #include "wtf/RefPtr.h"
 
 namespace blink {
 
 class Document;
 class EventTarget;
 class ExecutionContext;
-class FrameHost;
 class InspectorTimelineAgent;
 class InstrumentingAgents;
 class ThreadableLoaderClient;
 class WorkerGlobalScope;
 class WorkerInspectorProxy;
 
 #define FAST_RETURN_IF_NO_FRONTENDS(value) if (!hasFrontends()) return value;
 
 class InspectorInstrumentationCookie {
     STACK_ALLOCATED();
@@ skipping 26 matching lines @@
 inline void frontendCreated() { atomicIncrement(&FrontendCounter::s_frontendCounter); }
 inline void frontendDeleted() { atomicDecrement(&FrontendCounter::s_frontendCounter); }
 inline bool hasFrontends() { return FrontendCounter::s_frontendCounter; }
 
 void registerInstrumentingAgents(InstrumentingAgents*);
 void unregisterInstrumentingAgents(InstrumentingAgents*);
 
 InspectorTimelineAgent* retrieveTimelineAgent(const InspectorInstrumentationCookie&);
 
 // Called from generated instrumentation code.
-InstrumentingAgents* instrumentingAgentsFor(Page*);
 InstrumentingAgents* instrumentingAgentsFor(LocalFrame*);
 InstrumentingAgents* instrumentingAgentsFor(EventTarget*);
 InstrumentingAgents* instrumentingAgentsFor(ExecutionContext*);
 InstrumentingAgents* instrumentingAgentsFor(Document&);
 InstrumentingAgents* instrumentingAgentsFor(Document*);
 InstrumentingAgents* instrumentingAgentsFor(RenderObject*);
 InstrumentingAgents* instrumentingAgentsFor(Node*);
 InstrumentingAgents* instrumentingAgentsFor(WorkerGlobalScope*);
-InstrumentingAgents* instrumentingAgentsFor(FrameHost*);
 
 // Helper for the one above.
 InstrumentingAgents* instrumentingAgentsForNonDocumentContext(ExecutionContext*);
 
 }  // namespace InspectorInstrumentation
 
 namespace InstrumentationEvents {
 extern const char PaintSetup[];
 extern const char Paint[];
 extern const char Layer[];
@@ skipping 14 matching lines @@
 
 namespace InspectorInstrumentation {
 
 inline InstrumentingAgents* instrumentingAgentsFor(ExecutionContext* context)
 {
     if (!context)
         return 0;
     return context->isDocument() ? instrumentingAgentsFor(*toDocument(context)) : instrumentingAgentsForNonDocumentContext(context);
 }
 
-inline InstrumentingAgents* instrumentingAgentsFor(LocalFrame* frame)
-{
-    return frame ? instrumentingAgentsFor(frame->page()) : 0;
-}
-
 inline InstrumentingAgents* instrumentingAgentsFor(Document& document)
 {
-    Page* page = document.page();
-    if (!page && document.templateDocumentHost())
-        page = document.templateDocumentHost()->page();
-    return instrumentingAgentsFor(page);
+    LocalFrame* frame = document.frame();
+    if (!frame && document.templateDocumentHost())
+        frame = document.templateDocumentHost()->frame();
+    return instrumentingAgentsFor(frame);
 }
 
 inline InstrumentingAgents* instrumentingAgentsFor(Document* document)
 {
     return document ? instrumentingAgentsFor(*document) : 0;
 }
 
 inline InstrumentingAgents* instrumentingAgentsFor(CSSStyleSheet* styleSheet)
 {
     return styleSheet ? instrumentingAgentsFor(styleSheet->ownerDocument()) : 0;
 }
 
 inline InstrumentingAgents* instrumentingAgentsFor(Node* node)
 {
     return node ? instrumentingAgentsFor(node->document()) : 0;
 }
 
 inline InstrumentingAgents* instrumentingAgentsFor(CSSStyleDeclaration* declaration)
 {
     return declaration ? instrumentingAgentsFor(declaration->parentStyleSheet()) : 0;
 }
 
 } // namespace InspectorInstrumentation
 
-InstrumentingAgents* instrumentationForPage(Page*);
-
 InstrumentingAgents* instrumentationForWorkerGlobalScope(WorkerGlobalScope*);
 
 } // namespace blink
 
 #include "core/InspectorInstrumentationInl.h"
 
 #include "core/inspector/InspectorInstrumentationCustomInl.h"
 
 #include "core/InspectorOverridesInl.h"
 
 #endif // !defined(InspectorInstrumentation_h)