Chromium Code Reviews| 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 132 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 143 return; | 143 return; |
| 144 m_deferredAgentsInitialized = true; | 144 m_deferredAgentsInitialized = true; |
| 145 | 145 |
| 146 InjectedScriptManager* injectedScriptManager = m_injectedScriptManager.get() ; | 146 InjectedScriptManager* injectedScriptManager = m_injectedScriptManager.get() ; |
| 147 InspectorOverlay* overlay = m_overlay.get(); | 147 InspectorOverlay* overlay = m_overlay.get(); |
| 148 | 148 |
| 149 OwnPtr<InspectorResourceAgent> resourceAgentPtr(InspectorResourceAgent::crea te(m_pageAgent, m_inspectorClient)); | 149 OwnPtr<InspectorResourceAgent> resourceAgentPtr(InspectorResourceAgent::crea te(m_pageAgent, m_inspectorClient)); |
| 150 InspectorResourceAgent* resourceAgent = resourceAgentPtr.get(); | 150 InspectorResourceAgent* resourceAgent = resourceAgentPtr.get(); |
| 151 m_agents.append(resourceAgentPtr.release()); | 151 m_agents.append(resourceAgentPtr.release()); |
| 152 | 152 |
| 153 m_agents.append(InspectorCSSAgent::create(m_domAgent, m_pageAgent, resourceA gent)); | 153 OwnPtr<InspectorCSSAgent> cssAgentPtr(InspectorCSSAgent::create(m_domAgent, m_pageAgent, resourceAgent)); |
|
lushnikov
2014/03/17 08:59:34
looks like all this change is unneeded.
pfeldman
2014/03/17 12:32:58
Done.
| |
| 154 m_cssAgent = cssAgentPtr.get(); | |
|
aandrey
2014/03/17 06:45:17
never used
pfeldman
2014/03/17 12:32:58
Done.
| |
| 155 m_agents.append(cssAgentPtr.release()); | |
| 154 | 156 |
| 155 m_agents.append(InspectorDOMStorageAgent::create(m_pageAgent)); | 157 m_agents.append(InspectorDOMStorageAgent::create(m_pageAgent)); |
| 156 | 158 |
| 157 m_agents.append(InspectorMemoryAgent::create()); | 159 m_agents.append(InspectorMemoryAgent::create()); |
| 158 | 160 |
| 159 m_agents.append(InspectorApplicationCacheAgent::create(m_pageAgent)); | 161 m_agents.append(InspectorApplicationCacheAgent::create(m_pageAgent)); |
| 160 | 162 |
| 161 PageScriptDebugServer* pageScriptDebugServer = &PageScriptDebugServer::share d(); | 163 PageScriptDebugServer* pageScriptDebugServer = &PageScriptDebugServer::share d(); |
| 162 | 164 |
| 163 OwnPtr<InspectorDebuggerAgent> debuggerAgentPtr(PageDebuggerAgent::create(pa geScriptDebugServer, m_pageAgent, injectedScriptManager, overlay)); | 165 OwnPtr<InspectorDebuggerAgent> debuggerAgentPtr(PageDebuggerAgent::create(pa geScriptDebugServer, m_pageAgent, injectedScriptManager, overlay)); |
| (...skipping 249 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 413 void InspectorController::willProcessTask() | 415 void InspectorController::willProcessTask() |
| 414 { | 416 { |
| 415 if (InspectorTimelineAgent* timelineAgent = m_instrumentingAgents->inspector TimelineAgent()) | 417 if (InspectorTimelineAgent* timelineAgent = m_instrumentingAgents->inspector TimelineAgent()) |
| 416 timelineAgent->willProcessTask(); | 418 timelineAgent->willProcessTask(); |
| 417 if (InspectorProfilerAgent* profilerAgent = m_instrumentingAgents->inspector ProfilerAgent()) | 419 if (InspectorProfilerAgent* profilerAgent = m_instrumentingAgents->inspector ProfilerAgent()) |
| 418 profilerAgent->willProcessTask(); | 420 profilerAgent->willProcessTask(); |
| 419 } | 421 } |
| 420 | 422 |
| 421 void InspectorController::didProcessTask() | 423 void InspectorController::didProcessTask() |
| 422 { | 424 { |
| 425 if (InspectorCSSAgent* cssAgent = m_instrumentingAgents->inspectorCSSAgent() ) | |
| 426 cssAgent->didProcessTask(); | |
| 423 if (InspectorTimelineAgent* timelineAgent = m_instrumentingAgents->inspector TimelineAgent()) | 427 if (InspectorTimelineAgent* timelineAgent = m_instrumentingAgents->inspector TimelineAgent()) |
| 424 timelineAgent->didProcessTask(); | 428 timelineAgent->didProcessTask(); |
| 425 if (InspectorProfilerAgent* profilerAgent = m_instrumentingAgents->inspector ProfilerAgent()) | 429 if (InspectorProfilerAgent* profilerAgent = m_instrumentingAgents->inspector ProfilerAgent()) |
| 426 profilerAgent->didProcessTask(); | 430 profilerAgent->didProcessTask(); |
| 427 if (InspectorDOMDebuggerAgent* domDebuggerAgent = m_instrumentingAgents->ins pectorDOMDebuggerAgent()) | 431 if (InspectorDOMDebuggerAgent* domDebuggerAgent = m_instrumentingAgents->ins pectorDOMDebuggerAgent()) |
| 428 domDebuggerAgent->didProcessTask(); | 432 domDebuggerAgent->didProcessTask(); |
| 429 } | 433 } |
| 430 | 434 |
| 431 void InspectorController::didCommitLoadForMainFrame() | 435 void InspectorController::didCommitLoadForMainFrame() |
| 432 { | 436 { |
| (...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 479 m_layerTreeAgent->willAddPageOverlay(layer); | 483 m_layerTreeAgent->willAddPageOverlay(layer); |
| 480 } | 484 } |
| 481 | 485 |
| 482 void InspectorController::didRemovePageOverlay(const GraphicsLayer* layer) | 486 void InspectorController::didRemovePageOverlay(const GraphicsLayer* layer) |
| 483 { | 487 { |
| 484 if (m_layerTreeAgent) | 488 if (m_layerTreeAgent) |
| 485 m_layerTreeAgent->didRemovePageOverlay(layer); | 489 m_layerTreeAgent->didRemovePageOverlay(layer); |
| 486 } | 490 } |
| 487 | 491 |
| 488 } // namespace WebCore | 492 } // namespace WebCore |
| OLD | NEW |