Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(853)

Unified Diff: Source/core/inspector/InspectorInstrumentation.h

Issue 898593002: DevTools: use per-LocalFrame instrumenting agents instead of per-Page ones. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: fixed assertion Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/core/inspector/InspectorInstrumentation.h
diff --git a/Source/core/inspector/InspectorInstrumentation.h b/Source/core/inspector/InspectorInstrumentation.h
index 724a727857863e1f36f6cdf80c89773b2504a00e..c0362806872208a3ece8be2c366cd087e5b36dc1 100644
--- a/Source/core/inspector/InspectorInstrumentation.h
+++ b/Source/core/inspector/InspectorInstrumentation.h
@@ -54,7 +54,6 @@ namespace blink {
class Document;
class EventTarget;
class ExecutionContext;
-class FrameHost;
class InspectorTimelineAgent;
class InstrumentingAgents;
class ThreadableLoaderClient;
@@ -101,7 +100,6 @@ void unregisterInstrumentingAgents(InstrumentingAgents*);
InspectorTimelineAgent* retrieveTimelineAgent(const InspectorInstrumentationCookie&);
// Called from generated instrumentation code.
-InstrumentingAgents* instrumentingAgentsFor(Page*);
InstrumentingAgents* instrumentingAgentsFor(LocalFrame*);
InstrumentingAgents* instrumentingAgentsFor(EventTarget*);
InstrumentingAgents* instrumentingAgentsFor(ExecutionContext*);
@@ -110,7 +108,6 @@ InstrumentingAgents* instrumentingAgentsFor(Document*);
InstrumentingAgents* instrumentingAgentsFor(RenderObject*);
InstrumentingAgents* instrumentingAgentsFor(Node*);
InstrumentingAgents* instrumentingAgentsFor(WorkerGlobalScope*);
-InstrumentingAgents* instrumentingAgentsFor(FrameHost*);
// Helper for the one above.
InstrumentingAgents* instrumentingAgentsForNonDocumentContext(ExecutionContext*);
@@ -145,17 +142,12 @@ inline InstrumentingAgents* instrumentingAgentsFor(ExecutionContext* context)
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)
@@ -180,8 +172,6 @@ inline InstrumentingAgents* instrumentingAgentsFor(CSSStyleDeclaration* declarat
} // namespace InspectorInstrumentation
-InstrumentingAgents* instrumentationForPage(Page*);
-
InstrumentingAgents* instrumentationForWorkerGlobalScope(WorkerGlobalScope*);
} // namespace blink
« no previous file with comments | « Source/core/inspector/InspectorInspectorAgent.cpp ('k') | Source/core/inspector/InspectorInstrumentation.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698