| 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 85 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 96 | 96 |
| 97 OwnPtrWillBeRawPtr<InspectorDOMAgent> domAgentPtr(InspectorDOMAgent::create(
m_pageAgent, injectedScriptManager, overlay)); | 97 OwnPtrWillBeRawPtr<InspectorDOMAgent> domAgentPtr(InspectorDOMAgent::create(
m_pageAgent, injectedScriptManager, overlay)); |
| 98 m_domAgent = domAgentPtr.get(); | 98 m_domAgent = domAgentPtr.get(); |
| 99 m_agents.append(domAgentPtr.release()); | 99 m_agents.append(domAgentPtr.release()); |
| 100 | 100 |
| 101 | 101 |
| 102 OwnPtrWillBeRawPtr<InspectorLayerTreeAgent> layerTreeAgentPtr(InspectorLayer
TreeAgent::create(m_page)); | 102 OwnPtrWillBeRawPtr<InspectorLayerTreeAgent> layerTreeAgentPtr(InspectorLayer
TreeAgent::create(m_page)); |
| 103 m_layerTreeAgent = layerTreeAgentPtr.get(); | 103 m_layerTreeAgent = layerTreeAgentPtr.get(); |
| 104 m_agents.append(layerTreeAgentPtr.release()); | 104 m_agents.append(layerTreeAgentPtr.release()); |
| 105 | 105 |
| 106 OwnPtrWillBeRawPtr<InspectorTracingAgent> tracingAgentPtr = InspectorTracing
Agent::create(inspectorClient); | 106 OwnPtrWillBeRawPtr<InspectorWorkerAgent> workerAgentPtr = InspectorWorkerAge
nt::create(); |
| 107 |
| 108 OwnPtrWillBeRawPtr<InspectorTracingAgent> tracingAgentPtr = InspectorTracing
Agent::create(inspectorClient, workerAgentPtr.get()); |
| 107 m_tracingAgent = tracingAgentPtr.get(); | 109 m_tracingAgent = tracingAgentPtr.get(); |
| 108 m_agents.append(tracingAgentPtr.release()); | 110 m_agents.append(tracingAgentPtr.release()); |
| 109 | 111 |
| 112 m_agents.append(workerAgentPtr.release()); |
| 113 |
| 110 OwnPtrWillBeRawPtr<InspectorTimelineAgent> timelineAgentPtr(InspectorTimelin
eAgent::create(m_pageAgent, m_layerTreeAgent, | 114 OwnPtrWillBeRawPtr<InspectorTimelineAgent> timelineAgentPtr(InspectorTimelin
eAgent::create(m_pageAgent, m_layerTreeAgent, |
| 111 overlay, InspectorTimelineAgent::PageInspector, inspectorClient)); | 115 overlay, InspectorTimelineAgent::PageInspector, inspectorClient)); |
| 112 m_timelineAgent = timelineAgentPtr.get(); | 116 m_timelineAgent = timelineAgentPtr.get(); |
| 113 m_agents.append(timelineAgentPtr.release()); | 117 m_agents.append(timelineAgentPtr.release()); |
| 114 | 118 |
| 115 PageScriptDebugServer* pageScriptDebugServer = &PageScriptDebugServer::share
d(); | 119 PageScriptDebugServer* pageScriptDebugServer = &PageScriptDebugServer::share
d(); |
| 116 | 120 |
| 117 m_agents.append(PageRuntimeAgent::create(injectedScriptManager, pageScriptDe
bugServer, m_page, m_pageAgent)); | 121 m_agents.append(PageRuntimeAgent::create(injectedScriptManager, pageScriptDe
bugServer, m_page, m_pageAgent)); |
| 118 | 122 |
| 119 m_agents.append(PageConsoleAgent::create(injectedScriptManager, m_domAgent,
m_timelineAgent, m_tracingAgent)); | 123 m_agents.append(PageConsoleAgent::create(injectedScriptManager, m_domAgent,
m_timelineAgent, m_tracingAgent)); |
| 120 | 124 |
| 121 m_agents.append(InspectorWorkerAgent::create()); | |
| 122 | |
| 123 ASSERT_ARG(inspectorClient, inspectorClient); | 125 ASSERT_ARG(inspectorClient, inspectorClient); |
| 124 m_injectedScriptManager->injectedScriptHost()->init(m_instrumentingAgents.ge
t(), pageScriptDebugServer); | 126 m_injectedScriptManager->injectedScriptHost()->init(m_instrumentingAgents.ge
t(), pageScriptDebugServer); |
| 125 } | 127 } |
| 126 | 128 |
| 127 InspectorController::~InspectorController() | 129 InspectorController::~InspectorController() |
| 128 { | 130 { |
| 129 } | 131 } |
| 130 | 132 |
| 131 void InspectorController::trace(Visitor* visitor) | 133 void InspectorController::trace(Visitor* visitor) |
| 132 { | 134 { |
| (...skipping 367 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 500 m_layerTreeAgent->willAddPageOverlay(layer); | 502 m_layerTreeAgent->willAddPageOverlay(layer); |
| 501 } | 503 } |
| 502 | 504 |
| 503 void InspectorController::didRemovePageOverlay(const GraphicsLayer* layer) | 505 void InspectorController::didRemovePageOverlay(const GraphicsLayer* layer) |
| 504 { | 506 { |
| 505 if (m_layerTreeAgent) | 507 if (m_layerTreeAgent) |
| 506 m_layerTreeAgent->didRemovePageOverlay(layer); | 508 m_layerTreeAgent->didRemovePageOverlay(layer); |
| 507 } | 509 } |
| 508 | 510 |
| 509 } // namespace blink | 511 } // namespace blink |
| OLD | NEW |