Source/core/inspector/InspectorController.h - Issue 898593002: DevTools: use per-LocalFrame instrumenting agents instead of per-Page ones.

Side by Side Diff: Source/core/inspector/InspectorController.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, 10 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 unified diff | Download patch | Annotate | Revision Log

« no previous file with comments | « Source/core/inspector/InspectorCanvasAgent.cpp ('k') | Source/core/inspector/InspectorController.cpp » ('j') | no next file with comments »

OLD	NEW
1 /*	1 /*

2 * Copyright (C) 2011 Google Inc. All rights reserved.	2 * Copyright (C) 2011 Google Inc. All rights reserved.

3 *	3 *

4 * Redistribution and use in source and binary forms, with or without	4 * Redistribution and use in source and binary forms, with or without

5 * modification, are permitted provided that the following conditions are	5 * modification, are permitted provided that the following conditions are

6 * met:	6 * met:

7 *	7 *

8 * * Redistributions of source code must retain the above copyright	8 * * Redistributions of source code must retain the above copyright

9 * notice, this list of conditions and the following disclaimer.	9 * notice, this list of conditions and the following disclaimer.

10 * * Redistributions in binary form must reproduce the above	10 * * Redistributions in binary form must reproduce the above

(...skipping 119 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
130 void willComposite();	130 void willComposite();

131 void didComposite();	131 void didComposite();

132	132

133 void processGPUEvent(double timestamp, int phase, bool foreign, uint64_t use dGPUMemoryBytes, uint64_t limitGPUMemoryBytes);	133 void processGPUEvent(double timestamp, int phase, bool foreign, uint64_t use dGPUMemoryBytes, uint64_t limitGPUMemoryBytes);

134	134

135 void scriptsEnabled(bool);	135 void scriptsEnabled(bool);

136	136

137 void willAddPageOverlay(const GraphicsLayer*);	137 void willAddPageOverlay(const GraphicsLayer*);

138 void didRemovePageOverlay(const GraphicsLayer*);	138 void didRemovePageOverlay(const GraphicsLayer*);

139	139

	140 InstrumentingAgents* instrumentingAgents() { return m_instrumentingAgents.ge t(); }

	141

140 private:	142 private:

141 InspectorController(Page, InspectorClient);	143 InspectorController(Page, InspectorClient);

142	144

143 void initializeDeferredAgents();	145 void initializeDeferredAgents();

144	146

145 friend InstrumentingAgents* instrumentationForPage(Page*);

146

147 RefPtrWillBeMember<InstrumentingAgents> m_instrumentingAgents;	147 RefPtrWillBeMember<InstrumentingAgents> m_instrumentingAgents;

148 OwnPtrWillBeMember<InjectedScriptManager> m_injectedScriptManager;	148 OwnPtrWillBeMember<InjectedScriptManager> m_injectedScriptManager;

149 OwnPtrWillBeMember<InspectorCompositeState> m_state;	149 OwnPtrWillBeMember<InspectorCompositeState> m_state;

150 OwnPtrWillBeMember<InspectorOverlay> m_overlay;	150 OwnPtrWillBeMember<InspectorOverlay> m_overlay;

151 OwnPtrWillBeMember<AsyncCallTracker> m_asyncCallTracker;	151 OwnPtrWillBeMember<AsyncCallTracker> m_asyncCallTracker;

152	152

153 RawPtrWillBeMember<InspectorDOMAgent> m_domAgent;	153 RawPtrWillBeMember<InspectorDOMAgent> m_domAgent;

154 RawPtrWillBeMember<InspectorPageAgent> m_pageAgent;	154 RawPtrWillBeMember<InspectorPageAgent> m_pageAgent;

155 RawPtrWillBeMember<InspectorTimelineAgent> m_timelineAgent;	155 RawPtrWillBeMember<InspectorTimelineAgent> m_timelineAgent;

156 RawPtrWillBeMember<InspectorCSSAgent> m_cssAgent;	156 RawPtrWillBeMember<InspectorCSSAgent> m_cssAgent;

157 RawPtrWillBeMember<InspectorResourceAgent> m_resourceAgent;	157 RawPtrWillBeMember<InspectorResourceAgent> m_resourceAgent;

158 RawPtrWillBeMember<InspectorLayerTreeAgent> m_layerTreeAgent;	158 RawPtrWillBeMember<InspectorLayerTreeAgent> m_layerTreeAgent;

159 RawPtrWillBeMember<InspectorTracingAgent> m_tracingAgent;	159 RawPtrWillBeMember<InspectorTracingAgent> m_tracingAgent;

160 RawPtrWillBeMember<InspectorAnimationAgent> m_animationAgent;	160 RawPtrWillBeMember<InspectorAnimationAgent> m_animationAgent;

161	161

162 RefPtrWillBeMember<InspectorBackendDispatcher> m_inspectorBackendDispatcher;	162 RefPtrWillBeMember<InspectorBackendDispatcher> m_inspectorBackendDispatcher;

163 InspectorFrontendClient* m_inspectorFrontendClient;	163 InspectorFrontendClient* m_inspectorFrontendClient;

164 OwnPtr<InspectorFrontend> m_inspectorFrontend;	164 OwnPtr<InspectorFrontend> m_inspectorFrontend;

165 RawPtrWillBeMember<Page> m_page;

166 InspectorClient* m_inspectorClient;	165 InspectorClient* m_inspectorClient;

167 InspectorAgentRegistry m_agents;	166 InspectorAgentRegistry m_agents;

168 bool m_isUnderTest;	167 bool m_isUnderTest;

169 bool m_deferredAgentsInitialized;	168 bool m_deferredAgentsInitialized;

170 String m_hostId;	169 String m_hostId;

171 };	170 };

172	171

173 }	172 }

174	173

175	174

176 #endif // InspectorController_h	175 #endif // InspectorController_h

OLD	NEW