Source/core/inspector/InspectorController.h - Issue 146683003: Settings should not call into inspector

Side by Side Diff: Source/core/inspector/InspectorController.h

Issue 146683003: Settings should not call into inspector (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: incorporated review comments Created 6 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 unified diff | Download patch

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 100 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
111 void willProcessTask();	111 void willProcessTask();

112 void didProcessTask();	112 void didProcessTask();

113	113

114 void didBeginFrame(int frameId);	114 void didBeginFrame(int frameId);

115 void didCancelFrame();	115 void didCancelFrame();

116 void willComposite();	116 void willComposite();

117 void didComposite();	117 void didComposite();

118	118

119 void processGPUEvent(double timestamp, int phase, bool foreign, size_t usedG PUMemoryBytes);	119 void processGPUEvent(double timestamp, int phase, bool foreign, size_t usedG PUMemoryBytes);

120	120

	121 void settingsChanged();

	122

121 private:	123 private:

122 InspectorController(Page, InspectorClient);	124 InspectorController(Page, InspectorClient);

123	125

124 friend InstrumentingAgents* instrumentationForPage(Page*);	126 friend InstrumentingAgents* instrumentationForPage(Page*);

125	127

126 RefPtr<InstrumentingAgents> m_instrumentingAgents;	128 RefPtr<InstrumentingAgents> m_instrumentingAgents;

127 OwnPtr<InjectedScriptManager> m_injectedScriptManager;	129 OwnPtr<InjectedScriptManager> m_injectedScriptManager;

128 OwnPtr<InspectorCompositeState> m_state;	130 OwnPtr<InspectorCompositeState> m_state;

129 OwnPtr<InspectorOverlay> m_overlay;	131 OwnPtr<InspectorOverlay> m_overlay;

130	132

131 InspectorMemoryAgent* m_memoryAgent;	133 InspectorMemoryAgent* m_memoryAgent;

132 InspectorTimelineAgent* m_timelineAgent;	134 InspectorTimelineAgent* m_timelineAgent;

133	135

134 RefPtr<InspectorBackendDispatcher> m_inspectorBackendDispatcher;	136 RefPtr<InspectorBackendDispatcher> m_inspectorBackendDispatcher;

135 OwnPtr<InspectorFrontendClient> m_inspectorFrontendClient;	137 OwnPtr<InspectorFrontendClient> m_inspectorFrontendClient;

136 OwnPtr<InspectorFrontend> m_inspectorFrontend;	138 OwnPtr<InspectorFrontend> m_inspectorFrontend;

137 Page* m_page;	139 Page* m_page;

138 InspectorClient* m_inspectorClient;	140 InspectorClient* m_inspectorClient;

139 InspectorAgentRegistry m_agents;	141 InspectorAgentRegistry m_agents;

140 bool m_isUnderTest;	142 bool m_isUnderTest;

141 };	143 };

142	144

143 }	145 }

144	146

145	147

146 #endif // !defined(InspectorController_h)	148 #endif // !defined(InspectorController_h)

OLD	NEW

« Source/core/frame/Settings.cpp ('K') | « Source/core/frame/SettingsDelegate.h ('k') | Source/core/inspector/InspectorController.cpp » ('j') | no next file with comments »