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

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

Issue 12077053: Merge 140127 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1364/
Patch Set: Created 7 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
« no previous file with comments | « no previous file | Source/WebCore/inspector/InspectorController.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
121 121
122 void willProcessTask(); 122 void willProcessTask();
123 void didProcessTask(); 123 void didProcessTask();
124 124
125 private: 125 private:
126 InspectorController(Page*, InspectorClient*); 126 InspectorController(Page*, InspectorClient*);
127 127
128 friend class PostWorkerNotificationToFrontendTask; 128 friend class PostWorkerNotificationToFrontendTask;
129 friend InstrumentingAgents* instrumentationForPage(Page*); 129 friend InstrumentingAgents* instrumentationForPage(Page*);
130 130
131 OwnPtr<InstrumentingAgents> m_instrumentingAgents; 131 RefPtr<InstrumentingAgents> m_instrumentingAgents;
132 OwnPtr<InjectedScriptManager> m_injectedScriptManager; 132 OwnPtr<InjectedScriptManager> m_injectedScriptManager;
133 OwnPtr<InspectorState> m_state; 133 OwnPtr<InspectorState> m_state;
134 OwnPtr<InspectorOverlay> m_overlay; 134 OwnPtr<InspectorOverlay> m_overlay;
135 135
136 InspectorAgent* m_inspectorAgent; 136 InspectorAgent* m_inspectorAgent;
137 InspectorDOMAgent* m_domAgent; 137 InspectorDOMAgent* m_domAgent;
138 InspectorResourceAgent* m_resourceAgent; 138 InspectorResourceAgent* m_resourceAgent;
139 InspectorPageAgent* m_pageAgent; 139 InspectorPageAgent* m_pageAgent;
140 #if ENABLE(JAVASCRIPT_DEBUGGER) 140 #if ENABLE(JAVASCRIPT_DEBUGGER)
141 InspectorDebuggerAgent* m_debuggerAgent; 141 InspectorDebuggerAgent* m_debuggerAgent;
142 InspectorProfilerAgent* m_profilerAgent; 142 InspectorProfilerAgent* m_profilerAgent;
143 #endif 143 #endif
144 144
145 RefPtr<InspectorBackendDispatcher> m_inspectorBackendDispatcher; 145 RefPtr<InspectorBackendDispatcher> m_inspectorBackendDispatcher;
146 OwnPtr<InspectorFrontendClient> m_inspectorFrontendClient; 146 OwnPtr<InspectorFrontendClient> m_inspectorFrontendClient;
147 OwnPtr<InspectorFrontend> m_inspectorFrontend; 147 OwnPtr<InspectorFrontend> m_inspectorFrontend;
148 Page* m_page; 148 Page* m_page;
149 InspectorClient* m_inspectorClient; 149 InspectorClient* m_inspectorClient;
150 InspectorAgentRegistry m_agents; 150 InspectorAgentRegistry m_agents;
151 }; 151 };
152 152
153 } 153 }
154 154
155 #endif // ENABLE(INSPECTOR) 155 #endif // ENABLE(INSPECTOR)
156 156
157 #endif // !defined(InspectorController_h) 157 #endif // !defined(InspectorController_h)
OLDNEW
« no previous file with comments | « no previous file | Source/WebCore/inspector/InspectorController.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698