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 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
69 #include "core/rendering/RenderLayer.h" | 69 #include "core/rendering/RenderLayer.h" |
70 #include "platform/PlatformMouseEvent.h" | 70 #include "platform/PlatformMouseEvent.h" |
71 | 71 |
72 namespace blink { | 72 namespace blink { |
73 | 73 |
74 InspectorController::InspectorController(Page* page, InspectorClient* inspectorC
lient) | 74 InspectorController::InspectorController(Page* page, InspectorClient* inspectorC
lient) |
75 : m_instrumentingAgents(InstrumentingAgents::create()) | 75 : m_instrumentingAgents(InstrumentingAgents::create()) |
76 , m_injectedScriptManager(InjectedScriptManager::createForPage()) | 76 , m_injectedScriptManager(InjectedScriptManager::createForPage()) |
77 , m_state(adoptPtr(new InspectorCompositeState(inspectorClient))) | 77 , m_state(adoptPtr(new InspectorCompositeState(inspectorClient))) |
78 , m_overlay(InspectorOverlay::create(page, inspectorClient)) | 78 , m_overlay(InspectorOverlay::create(page, inspectorClient)) |
79 , m_resourceAgent(0) | 79 , m_cssAgent(nullptr) |
80 , m_cssAgent(0) | 80 , m_resourceAgent(nullptr) |
81 , m_layerTreeAgent(0) | 81 , m_layerTreeAgent(nullptr) |
82 , m_page(page) | 82 , m_page(page) |
83 , m_inspectorClient(inspectorClient) | 83 , m_inspectorClient(inspectorClient) |
84 , m_agents(m_instrumentingAgents.get(), m_state.get()) | 84 , m_agents(m_instrumentingAgents.get(), m_state.get()) |
85 , m_isUnderTest(false) | 85 , m_isUnderTest(false) |
86 , m_deferredAgentsInitialized(false) | 86 , m_deferredAgentsInitialized(false) |
87 { | 87 { |
88 InjectedScriptManager* injectedScriptManager = m_injectedScriptManager.get()
; | 88 InjectedScriptManager* injectedScriptManager = m_injectedScriptManager.get()
; |
89 InspectorOverlay* overlay = m_overlay.get(); | 89 InspectorOverlay* overlay = m_overlay.get(); |
90 | 90 |
91 m_agents.append(InspectorInspectorAgent::create(m_page, injectedScriptManage
r)); | 91 m_agents.append(InspectorInspectorAgent::create(m_page, injectedScriptManage
r)); |
92 | 92 |
93 OwnPtr<InspectorPageAgent> pageAgentPtr(InspectorPageAgent::create(m_page, i
njectedScriptManager, inspectorClient, overlay)); | 93 OwnPtrWillBeRawPtr<InspectorPageAgent> pageAgentPtr(InspectorPageAgent::crea
te(m_page, injectedScriptManager, inspectorClient, overlay)); |
94 m_pageAgent = pageAgentPtr.get(); | 94 m_pageAgent = pageAgentPtr.get(); |
95 m_agents.append(pageAgentPtr.release()); | 95 m_agents.append(pageAgentPtr.release()); |
96 | 96 |
97 OwnPtr<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 OwnPtr<InspectorLayerTreeAgent> layerTreeAgentPtr(InspectorLayerTreeAgent::c
reate(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 OwnPtr<InspectorTracingAgent> tracingAgentPtr = InspectorTracingAgent::creat
e(inspectorClient); | 106 OwnPtrWillBeRawPtr<InspectorTracingAgent> tracingAgentPtr = InspectorTracing
Agent::create(inspectorClient); |
107 m_tracingAgent = tracingAgentPtr.get(); | 107 m_tracingAgent = tracingAgentPtr.get(); |
108 m_agents.append(tracingAgentPtr.release()); | 108 m_agents.append(tracingAgentPtr.release()); |
109 | 109 |
110 OwnPtr<InspectorTimelineAgent> timelineAgentPtr(InspectorTimelineAgent::crea
te(m_pageAgent, m_layerTreeAgent, | 110 OwnPtrWillBeRawPtr<InspectorTimelineAgent> timelineAgentPtr(InspectorTimelin
eAgent::create(m_pageAgent, m_layerTreeAgent, |
111 overlay, InspectorTimelineAgent::PageInspector, inspectorClient)); | 111 overlay, InspectorTimelineAgent::PageInspector, inspectorClient)); |
112 m_timelineAgent = timelineAgentPtr.get(); | 112 m_timelineAgent = timelineAgentPtr.get(); |
113 m_agents.append(timelineAgentPtr.release()); | 113 m_agents.append(timelineAgentPtr.release()); |
114 | 114 |
115 PageScriptDebugServer* pageScriptDebugServer = &PageScriptDebugServer::share
d(); | 115 PageScriptDebugServer* pageScriptDebugServer = &PageScriptDebugServer::share
d(); |
116 | 116 |
117 m_agents.append(PageRuntimeAgent::create(injectedScriptManager, pageScriptDe
bugServer, m_page, m_pageAgent)); | 117 m_agents.append(PageRuntimeAgent::create(injectedScriptManager, pageScriptDe
bugServer, m_page, m_pageAgent)); |
118 | 118 |
119 m_agents.append(PageConsoleAgent::create(injectedScriptManager, m_domAgent,
m_timelineAgent)); | 119 m_agents.append(PageConsoleAgent::create(injectedScriptManager, m_domAgent,
m_timelineAgent)); |
120 | 120 |
121 m_agents.append(InspectorWorkerAgent::create()); | 121 m_agents.append(InspectorWorkerAgent::create()); |
122 | 122 |
123 ASSERT_ARG(inspectorClient, inspectorClient); | 123 ASSERT_ARG(inspectorClient, inspectorClient); |
124 m_injectedScriptManager->injectedScriptHost()->init(m_instrumentingAgents.ge
t(), pageScriptDebugServer); | 124 m_injectedScriptManager->injectedScriptHost()->init(m_instrumentingAgents.ge
t(), pageScriptDebugServer); |
125 } | 125 } |
126 | 126 |
127 InspectorController::~InspectorController() | 127 InspectorController::~InspectorController() |
128 { | 128 { |
129 } | 129 } |
130 | 130 |
131 PassOwnPtr<InspectorController> InspectorController::create(Page* page, Inspecto
rClient* client) | 131 void InspectorController::trace(Visitor* visitor) |
132 { | 132 { |
133 return adoptPtr(new InspectorController(page, client)); | 133 visitor->trace(m_instrumentingAgents); |
| 134 visitor->trace(m_domAgent); |
| 135 visitor->trace(m_pageAgent); |
| 136 visitor->trace(m_timelineAgent); |
| 137 visitor->trace(m_cssAgent); |
| 138 visitor->trace(m_resourceAgent); |
| 139 visitor->trace(m_layerTreeAgent); |
| 140 visitor->trace(m_tracingAgent); |
| 141 visitor->trace(m_page); |
| 142 m_agents.trace(visitor); |
| 143 } |
| 144 |
| 145 PassOwnPtrWillBeRawPtr<InspectorController> InspectorController::create(Page* pa
ge, InspectorClient* client) |
| 146 { |
| 147 return adoptPtrWillBeNoop(new InspectorController(page, client)); |
134 } | 148 } |
135 | 149 |
136 void InspectorController::setTextAutosizingEnabled(bool enabled) | 150 void InspectorController::setTextAutosizingEnabled(bool enabled) |
137 { | 151 { |
138 m_pageAgent->setTextAutosizingEnabled(enabled); | 152 m_pageAgent->setTextAutosizingEnabled(enabled); |
139 } | 153 } |
140 | 154 |
141 void InspectorController::setDeviceScaleAdjustment(float deviceScaleAdjustment) | 155 void InspectorController::setDeviceScaleAdjustment(float deviceScaleAdjustment) |
142 { | 156 { |
143 m_pageAgent->setDeviceScaleAdjustment(deviceScaleAdjustment); | 157 m_pageAgent->setDeviceScaleAdjustment(deviceScaleAdjustment); |
144 } | 158 } |
145 | 159 |
146 void InspectorController::initializeDeferredAgents() | 160 void InspectorController::initializeDeferredAgents() |
147 { | 161 { |
148 if (m_deferredAgentsInitialized) | 162 if (m_deferredAgentsInitialized) |
149 return; | 163 return; |
150 m_deferredAgentsInitialized = true; | 164 m_deferredAgentsInitialized = true; |
151 | 165 |
152 InjectedScriptManager* injectedScriptManager = m_injectedScriptManager.get()
; | 166 InjectedScriptManager* injectedScriptManager = m_injectedScriptManager.get()
; |
153 InspectorOverlay* overlay = m_overlay.get(); | 167 InspectorOverlay* overlay = m_overlay.get(); |
154 | 168 |
155 OwnPtr<InspectorResourceAgent> resourceAgentPtr(InspectorResourceAgent::crea
te(m_pageAgent)); | 169 OwnPtrWillBeRawPtr<InspectorResourceAgent> resourceAgentPtr(InspectorResourc
eAgent::create(m_pageAgent)); |
156 m_resourceAgent = resourceAgentPtr.get(); | 170 m_resourceAgent = resourceAgentPtr.get(); |
157 m_agents.append(resourceAgentPtr.release()); | 171 m_agents.append(resourceAgentPtr.release()); |
158 | 172 |
159 OwnPtr<InspectorCSSAgent> cssAgentPtr(InspectorCSSAgent::create(m_domAgent,
m_pageAgent, m_resourceAgent)); | 173 OwnPtrWillBeRawPtr<InspectorCSSAgent> cssAgentPtr(InspectorCSSAgent::create(
m_domAgent, m_pageAgent, m_resourceAgent)); |
160 m_cssAgent = cssAgentPtr.get(); | 174 m_cssAgent = cssAgentPtr.get(); |
161 m_agents.append(cssAgentPtr.release()); | 175 m_agents.append(cssAgentPtr.release()); |
162 | 176 |
163 m_agents.append(InspectorDOMStorageAgent::create(m_pageAgent)); | 177 m_agents.append(InspectorDOMStorageAgent::create(m_pageAgent)); |
164 | 178 |
165 m_agents.append(InspectorMemoryAgent::create()); | 179 m_agents.append(InspectorMemoryAgent::create()); |
166 | 180 |
167 m_agents.append(InspectorApplicationCacheAgent::create(m_pageAgent)); | 181 m_agents.append(InspectorApplicationCacheAgent::create(m_pageAgent)); |
168 | 182 |
169 PageScriptDebugServer* pageScriptDebugServer = &PageScriptDebugServer::share
d(); | 183 PageScriptDebugServer* pageScriptDebugServer = &PageScriptDebugServer::share
d(); |
170 | 184 |
171 OwnPtr<InspectorDebuggerAgent> debuggerAgentPtr(PageDebuggerAgent::create(pa
geScriptDebugServer, m_pageAgent, injectedScriptManager, overlay)); | 185 OwnPtrWillBeRawPtr<InspectorDebuggerAgent> debuggerAgentPtr(PageDebuggerAgen
t::create(pageScriptDebugServer, m_pageAgent, injectedScriptManager, overlay)); |
172 InspectorDebuggerAgent* debuggerAgent = debuggerAgentPtr.get(); | 186 InspectorDebuggerAgent* debuggerAgent = debuggerAgentPtr.get(); |
173 m_agents.append(debuggerAgentPtr.release()); | 187 m_agents.append(debuggerAgentPtr.release()); |
174 | 188 |
175 m_agents.append(InspectorDOMDebuggerAgent::create(m_domAgent, debuggerAgent)
); | 189 m_agents.append(InspectorDOMDebuggerAgent::create(m_domAgent, debuggerAgent)
); |
176 | 190 |
177 m_agents.append(InspectorProfilerAgent::create(injectedScriptManager, overla
y)); | 191 m_agents.append(InspectorProfilerAgent::create(injectedScriptManager, overla
y)); |
178 | 192 |
179 m_agents.append(InspectorHeapProfilerAgent::create(injectedScriptManager)); | 193 m_agents.append(InspectorHeapProfilerAgent::create(injectedScriptManager)); |
180 | 194 |
181 m_agents.append(InspectorCanvasAgent::create(m_pageAgent, injectedScriptMana
ger)); | 195 m_agents.append(InspectorCanvasAgent::create(m_pageAgent, injectedScriptMana
ger)); |
182 | 196 |
183 m_agents.append(InspectorInputAgent::create(m_page, m_inspectorClient)); | 197 m_agents.append(InspectorInputAgent::create(m_page, m_inspectorClient)); |
184 } | 198 } |
185 | 199 |
186 void InspectorController::willBeDestroyed() | 200 void InspectorController::willBeDestroyed() |
187 { | 201 { |
188 disconnectFrontend(); | 202 disconnectFrontend(); |
189 m_injectedScriptManager->disconnect(); | 203 m_injectedScriptManager->disconnect(); |
190 m_inspectorClient = 0; | 204 m_inspectorClient = 0; |
191 m_page = 0; | 205 m_page = nullptr; |
192 m_instrumentingAgents->reset(); | 206 m_instrumentingAgents->reset(); |
193 m_agents.discardAgents(); | 207 m_agents.discardAgents(); |
194 } | 208 } |
195 | 209 |
196 void InspectorController::registerModuleAgent(PassOwnPtr<InspectorAgent> agent) | 210 void InspectorController::registerModuleAgent(PassOwnPtrWillBeRawPtr<InspectorAg
ent> agent) |
197 { | 211 { |
198 m_agents.append(agent); | 212 m_agents.append(agent); |
199 } | 213 } |
200 | 214 |
201 void InspectorController::setInspectorFrontendClient(PassOwnPtr<InspectorFronten
dClient> inspectorFrontendClient) | 215 void InspectorController::setInspectorFrontendClient(PassOwnPtr<InspectorFronten
dClient> inspectorFrontendClient) |
202 { | 216 { |
203 m_inspectorFrontendClient = inspectorFrontendClient; | 217 m_inspectorFrontendClient = inspectorFrontendClient; |
204 } | 218 } |
205 | 219 |
206 void InspectorController::didClearDocumentOfWindowObject(LocalFrame* frame) | 220 void InspectorController::didClearDocumentOfWindowObject(LocalFrame* frame) |
(...skipping 274 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
481 m_layerTreeAgent->willAddPageOverlay(layer); | 495 m_layerTreeAgent->willAddPageOverlay(layer); |
482 } | 496 } |
483 | 497 |
484 void InspectorController::didRemovePageOverlay(const GraphicsLayer* layer) | 498 void InspectorController::didRemovePageOverlay(const GraphicsLayer* layer) |
485 { | 499 { |
486 if (m_layerTreeAgent) | 500 if (m_layerTreeAgent) |
487 m_layerTreeAgent->didRemovePageOverlay(layer); | 501 m_layerTreeAgent->didRemovePageOverlay(layer); |
488 } | 502 } |
489 | 503 |
490 } // namespace blink | 504 } // namespace blink |
OLD | NEW |