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