| 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 89 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 100 m_agents.append(InspectorIndexedDBAgent::create(m_instrumentingAgents.get(),
m_state.get(), m_injectedScriptManager.get(), pageAgent)); | 100 m_agents.append(InspectorIndexedDBAgent::create(m_instrumentingAgents.get(),
m_state.get(), m_injectedScriptManager.get(), pageAgent)); |
| 101 | 101 |
| 102 m_agents.append(InspectorFileSystemAgent::create(m_instrumentingAgents.get()
, pageAgent, m_state.get())); | 102 m_agents.append(InspectorFileSystemAgent::create(m_instrumentingAgents.get()
, pageAgent, m_state.get())); |
| 103 | 103 |
| 104 m_agents.append(InspectorDOMStorageAgent::create(m_instrumentingAgents.get()
, pageAgent, m_state.get())); | 104 m_agents.append(InspectorDOMStorageAgent::create(m_instrumentingAgents.get()
, pageAgent, m_state.get())); |
| 105 | 105 |
| 106 OwnPtr<InspectorMemoryAgent> memoryAgentPtr(InspectorMemoryAgent::create(m_i
nstrumentingAgents.get(), inspectorClient, m_state.get(), m_page)); | 106 OwnPtr<InspectorMemoryAgent> memoryAgentPtr(InspectorMemoryAgent::create(m_i
nstrumentingAgents.get(), inspectorClient, m_state.get(), m_page)); |
| 107 m_memoryAgent = memoryAgentPtr.get(); | 107 m_memoryAgent = memoryAgentPtr.get(); |
| 108 m_agents.append(memoryAgentPtr.release()); | 108 m_agents.append(memoryAgentPtr.release()); |
| 109 | 109 |
| 110 m_agents.append(InspectorTimelineAgent::create(m_instrumentingAgents.get(),
pageAgent, m_memoryAgent, domAgent, m_state.get(), InspectorTimelineAgent::PageI
nspector, | 110 OwnPtr<InspectorTimelineAgent> timelineAgentPtr(InspectorTimelineAgent::crea
te(m_instrumentingAgents.get(), pageAgent, m_memoryAgent, domAgent, m_state.get(
), |
| 111 inspectorClient)); | 111 InspectorTimelineAgent::PageInspector, inspectorClient)); |
| 112 m_timelineAgent = timelineAgentPtr.get(); |
| 113 m_agents.append(timelineAgentPtr.release()); |
| 114 |
| 112 m_agents.append(InspectorApplicationCacheAgent::create(m_instrumentingAgents
.get(), m_state.get(), pageAgent)); | 115 m_agents.append(InspectorApplicationCacheAgent::create(m_instrumentingAgents
.get(), m_state.get(), pageAgent)); |
| 113 | |
| 114 m_agents.append(InspectorResourceAgent::create(m_instrumentingAgents.get(),
pageAgent, inspectorClient, m_state.get(), m_overlay.get())); | 116 m_agents.append(InspectorResourceAgent::create(m_instrumentingAgents.get(),
pageAgent, inspectorClient, m_state.get(), m_overlay.get())); |
| 115 | 117 |
| 116 PageScriptDebugServer* pageScriptDebugServer = &PageScriptDebugServer::share
d(); | 118 PageScriptDebugServer* pageScriptDebugServer = &PageScriptDebugServer::share
d(); |
| 117 | 119 |
| 118 m_agents.append(PageRuntimeAgent::create(m_instrumentingAgents.get(), m_stat
e.get(), m_injectedScriptManager.get(), pageScriptDebugServer, page, pageAgent))
; | 120 m_agents.append(PageRuntimeAgent::create(m_instrumentingAgents.get(), m_stat
e.get(), m_injectedScriptManager.get(), pageScriptDebugServer, page, pageAgent))
; |
| 119 | 121 |
| 120 OwnPtr<InspectorConsoleAgent> consoleAgentPtr(PageConsoleAgent::create(m_ins
trumentingAgents.get(), m_state.get(), m_injectedScriptManager.get(), domAgent))
; | 122 OwnPtr<InspectorConsoleAgent> consoleAgentPtr(PageConsoleAgent::create(m_ins
trumentingAgents.get(), m_state.get(), m_injectedScriptManager.get(), domAgent))
; |
| 121 InspectorConsoleAgent* consoleAgent = consoleAgentPtr.get(); | 123 InspectorConsoleAgent* consoleAgent = consoleAgentPtr.get(); |
| 122 m_agents.append(consoleAgentPtr.release()); | 124 m_agents.append(consoleAgentPtr.release()); |
| 123 | 125 |
| (...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 235 connectFrontend(frontendChannel); | 237 connectFrontend(frontendChannel); |
| 236 m_state->loadFromCookie(inspectorStateCookie); | 238 m_state->loadFromCookie(inspectorStateCookie); |
| 237 m_agents.restore(); | 239 m_agents.restore(); |
| 238 } | 240 } |
| 239 | 241 |
| 240 void InspectorController::setProcessId(long processId) | 242 void InspectorController::setProcessId(long processId) |
| 241 { | 243 { |
| 242 IdentifiersFactory::setProcessId(processId); | 244 IdentifiersFactory::setProcessId(processId); |
| 243 } | 245 } |
| 244 | 246 |
| 247 void InspectorController::setLayerTreeId(int id) |
| 248 { |
| 249 m_timelineAgent->setLayerTreeId(id); |
| 250 } |
| 251 |
| 245 void InspectorController::webViewResized(const IntSize& size) | 252 void InspectorController::webViewResized(const IntSize& size) |
| 246 { | 253 { |
| 247 if (InspectorPageAgent* pageAgent = m_instrumentingAgents->inspectorPageAgen
t()) | 254 if (InspectorPageAgent* pageAgent = m_instrumentingAgents->inspectorPageAgen
t()) |
| 248 pageAgent->webViewResized(size); | 255 pageAgent->webViewResized(size); |
| 249 } | 256 } |
| 250 | 257 |
| 251 bool InspectorController::isUnderTest() | 258 bool InspectorController::isUnderTest() |
| 252 { | 259 { |
| 253 return m_isUnderTest; | 260 return m_isUnderTest; |
| 254 } | 261 } |
| (...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 418 } | 425 } |
| 419 | 426 |
| 420 HashMap<String, size_t> InspectorController::processMemoryDistribution() const | 427 HashMap<String, size_t> InspectorController::processMemoryDistribution() const |
| 421 { | 428 { |
| 422 HashMap<String, size_t> memoryInfo; | 429 HashMap<String, size_t> memoryInfo; |
| 423 m_memoryAgent->getProcessMemoryDistributionMap(&memoryInfo); | 430 m_memoryAgent->getProcessMemoryDistributionMap(&memoryInfo); |
| 424 return memoryInfo; | 431 return memoryInfo; |
| 425 } | 432 } |
| 426 | 433 |
| 427 } // namespace WebCore | 434 } // namespace WebCore |
| OLD | NEW |