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 192 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
203 m_agents.append(InspectorHeapProfilerAgent::create(injectedScriptManager)); | 203 m_agents.append(InspectorHeapProfilerAgent::create(injectedScriptManager)); |
204 | 204 |
205 m_agents.append(InspectorCanvasAgent::create(m_pageAgent, injectedScriptMana ger)); | 205 m_agents.append(InspectorCanvasAgent::create(m_pageAgent, injectedScriptMana ger)); |
206 | 206 |
207 m_agents.append(InspectorInputAgent::create(m_page, m_inspectorClient)); | 207 m_agents.append(InspectorInputAgent::create(m_page, m_inspectorClient)); |
208 } | 208 } |
209 | 209 |
210 void InspectorController::willBeDestroyed() | 210 void InspectorController::willBeDestroyed() |
211 { | 211 { |
212 disconnectFrontend(); | 212 disconnectFrontend(); |
213 m_pageAgent->dispose(); | |
213 m_injectedScriptManager->disconnect(); | 214 m_injectedScriptManager->disconnect(); |
214 m_inspectorClient = 0; | 215 m_inspectorClient = 0; |
215 m_page = nullptr; | 216 m_page = nullptr; |
216 m_instrumentingAgents->reset(); | 217 m_instrumentingAgents->reset(); |
217 m_agents.discardAgents(); | 218 m_agents.discardAgents(); |
vsevik
2014/09/02 13:24:33
discardAgents calls virtual discardAgent method on
| |
218 if (m_inspectorFrontendClient) | 219 if (m_inspectorFrontendClient) |
219 m_inspectorFrontendClient->dispose(); | 220 m_inspectorFrontendClient->dispose(); |
220 } | 221 } |
221 | 222 |
222 void InspectorController::registerModuleAgent(PassOwnPtrWillBeRawPtr<InspectorAg ent> agent) | 223 void InspectorController::registerModuleAgent(PassOwnPtrWillBeRawPtr<InspectorAg ent> agent) |
223 { | 224 { |
224 m_agents.append(agent); | 225 m_agents.append(agent); |
225 } | 226 } |
226 | 227 |
227 void InspectorController::setInspectorFrontendClient(InspectorFrontendClient* in spectorFrontendClient) | 228 void InspectorController::setInspectorFrontendClient(InspectorFrontendClient* in spectorFrontendClient) |
(...skipping 279 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
507 m_layerTreeAgent->willAddPageOverlay(layer); | 508 m_layerTreeAgent->willAddPageOverlay(layer); |
508 } | 509 } |
509 | 510 |
510 void InspectorController::didRemovePageOverlay(const GraphicsLayer* layer) | 511 void InspectorController::didRemovePageOverlay(const GraphicsLayer* layer) |
511 { | 512 { |
512 if (m_layerTreeAgent) | 513 if (m_layerTreeAgent) |
513 m_layerTreeAgent->didRemovePageOverlay(layer); | 514 m_layerTreeAgent->didRemovePageOverlay(layer); |
514 } | 515 } |
515 | 516 |
516 } // namespace blink | 517 } // namespace blink |
OLD | NEW |