| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2010-2011 Google Inc. All rights reserved. | 2 * Copyright (C) 2010-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 301 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 312 PassOwnPtrWillBeRawPtr<InspectorOverlay> overlay) | 312 PassOwnPtrWillBeRawPtr<InspectorOverlay> overlay) |
| 313 : m_client(client) | 313 : m_client(client) |
| 314 , m_webLocalFrameImpl(webLocalFrameImpl) | 314 , m_webLocalFrameImpl(webLocalFrameImpl) |
| 315 , m_attached(false) | 315 , m_attached(false) |
| 316 #if ENABLE(ASSERT) | 316 #if ENABLE(ASSERT) |
| 317 , m_hasBeenDisposed(false) | 317 , m_hasBeenDisposed(false) |
| 318 #endif | 318 #endif |
| 319 , m_instrumentingAgents(m_webLocalFrameImpl->frame()->instrumentingAgents()) | 319 , m_instrumentingAgents(m_webLocalFrameImpl->frame()->instrumentingAgents()) |
| 320 , m_injectedScriptManager(InjectedScriptManager::createForPage()) | 320 , m_injectedScriptManager(InjectedScriptManager::createForPage()) |
| 321 , m_resourceContentLoader(InspectorResourceContentLoader::create(m_webLocalF
rameImpl->frame())) | 321 , m_resourceContentLoader(InspectorResourceContentLoader::create(m_webLocalF
rameImpl->frame())) |
| 322 , m_state(adoptPtrWillBeNoop(new InspectorCompositeState(this))) | 322 , m_state(adoptPtr(new InspectorCompositeState(this))) |
| 323 , m_overlay(overlay) | 323 , m_overlay(overlay) |
| 324 , m_inspectedFrames(InspectedFrames::create(m_webLocalFrameImpl->frame())) | 324 , m_inspectedFrames(InspectedFrames::create(m_webLocalFrameImpl->frame())) |
| 325 , m_inspectorAgent(nullptr) | 325 , m_inspectorAgent(nullptr) |
| 326 , m_domAgent(nullptr) | 326 , m_domAgent(nullptr) |
| 327 , m_pageAgent(nullptr) | 327 , m_pageAgent(nullptr) |
| 328 , m_resourceAgent(nullptr) | 328 , m_resourceAgent(nullptr) |
| 329 , m_layerTreeAgent(nullptr) | 329 , m_layerTreeAgent(nullptr) |
| 330 , m_tracingAgent(nullptr) | 330 , m_tracingAgent(nullptr) |
| 331 , m_pageRuntimeAgent(nullptr) | 331 , m_pageRuntimeAgent(nullptr) |
| 332 , m_pageConsoleAgent(nullptr) | 332 , m_pageConsoleAgent(nullptr) |
| (...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 404 // static | 404 // static |
| 405 void WebDevToolsAgentImpl::webFrameWidgetImplClosed(WebFrameWidgetImpl* webFrame
WidgetImpl) | 405 void WebDevToolsAgentImpl::webFrameWidgetImplClosed(WebFrameWidgetImpl* webFrame
WidgetImpl) |
| 406 { | 406 { |
| 407 ClientMessageLoopAdapter::webFrameWidgetImplClosed(webFrameWidgetImpl); | 407 ClientMessageLoopAdapter::webFrameWidgetImplClosed(webFrameWidgetImpl); |
| 408 } | 408 } |
| 409 | 409 |
| 410 DEFINE_TRACE(WebDevToolsAgentImpl) | 410 DEFINE_TRACE(WebDevToolsAgentImpl) |
| 411 { | 411 { |
| 412 visitor->trace(m_webLocalFrameImpl); | 412 visitor->trace(m_webLocalFrameImpl); |
| 413 visitor->trace(m_instrumentingAgents); | 413 visitor->trace(m_instrumentingAgents); |
| 414 visitor->trace(m_injectedScriptManager); | |
| 415 visitor->trace(m_resourceContentLoader); | 414 visitor->trace(m_resourceContentLoader); |
| 416 visitor->trace(m_state); | |
| 417 visitor->trace(m_overlay); | 415 visitor->trace(m_overlay); |
| 418 visitor->trace(m_inspectedFrames); | 416 visitor->trace(m_inspectedFrames); |
| 419 visitor->trace(m_inspectorAgent); | 417 visitor->trace(m_inspectorAgent); |
| 420 visitor->trace(m_domAgent); | 418 visitor->trace(m_domAgent); |
| 421 visitor->trace(m_pageAgent); | 419 visitor->trace(m_pageAgent); |
| 422 visitor->trace(m_resourceAgent); | 420 visitor->trace(m_resourceAgent); |
| 423 visitor->trace(m_layerTreeAgent); | 421 visitor->trace(m_layerTreeAgent); |
| 424 visitor->trace(m_tracingAgent); | 422 visitor->trace(m_tracingAgent); |
| 425 visitor->trace(m_pageRuntimeAgent); | 423 visitor->trace(m_pageRuntimeAgent); |
| 426 visitor->trace(m_pageConsoleAgent); | 424 visitor->trace(m_pageConsoleAgent); |
| (...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 478 m_agents.append(InspectorHeapProfilerAgent::create(isolate, injectedScriptMa
nager)); | 476 m_agents.append(InspectorHeapProfilerAgent::create(isolate, injectedScriptMa
nager)); |
| 479 | 477 |
| 480 OwnPtrWillBeRawPtr<InspectorPageAgent> pageAgentPtr(InspectorPageAgent::crea
te(m_inspectedFrames.get(), m_overlay.get(), m_resourceContentLoader.get(), debu
ggerAgent)); | 478 OwnPtrWillBeRawPtr<InspectorPageAgent> pageAgentPtr(InspectorPageAgent::crea
te(m_inspectedFrames.get(), m_overlay.get(), m_resourceContentLoader.get(), debu
ggerAgent)); |
| 481 m_pageAgent = pageAgentPtr.get(); | 479 m_pageAgent = pageAgentPtr.get(); |
| 482 m_agents.append(pageAgentPtr.release()); | 480 m_agents.append(pageAgentPtr.release()); |
| 483 | 481 |
| 484 m_pageConsoleAgent->setDebuggerAgent(debuggerAgent->v8DebuggerAgent()); | 482 m_pageConsoleAgent->setDebuggerAgent(debuggerAgent->v8DebuggerAgent()); |
| 485 | 483 |
| 486 MainThreadDebugger* mainThreadDebugger = MainThreadDebugger::instance(); | 484 MainThreadDebugger* mainThreadDebugger = MainThreadDebugger::instance(); |
| 487 m_injectedScriptManager->injectedScriptHost()->init( | 485 m_injectedScriptManager->injectedScriptHost()->init( |
| 488 m_pageConsoleAgent.get(), | |
| 489 debuggerAgent->v8DebuggerAgent(), | 486 debuggerAgent->v8DebuggerAgent(), |
| 490 bind<PassRefPtr<TypeBuilder::Runtime::RemoteObject>, PassRefPtr<JSONObje
ct>>(&InspectorInspectorAgent::inspect, m_inspectorAgent.get()), | 487 bind<PassRefPtr<TypeBuilder::Runtime::RemoteObject>, PassRefPtr<JSONObje
ct>>(&InspectorInspectorAgent::inspect, m_inspectorAgent.get()), |
| 488 bind<>(&InspectorConsoleAgent::clearAllMessages, m_pageConsoleAgent.get(
)), |
| 491 mainThreadDebugger->debugger(), | 489 mainThreadDebugger->debugger(), |
| 492 adoptPtr(new PageInjectedScriptHostClient())); | 490 adoptPtr(new PageInjectedScriptHostClient())); |
| 493 | 491 |
| 494 if (m_overlay) | 492 if (m_overlay) |
| 495 m_overlay->init(cssAgent, debuggerAgent, m_domAgent.get()); | 493 m_overlay->init(cssAgent, debuggerAgent, m_domAgent.get()); |
| 496 } | 494 } |
| 497 | 495 |
| 498 void WebDevToolsAgentImpl::registerAgent(PassOwnPtrWillBeRawPtr<InspectorAgent>
agent) | 496 void WebDevToolsAgentImpl::registerAgent(PassOwnPtrWillBeRawPtr<InspectorAgent>
agent) |
| 499 { | 497 { |
| 500 m_agents.append(agent); | 498 m_agents.append(agent); |
| (...skipping 226 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 727 if (!InspectorBackendDispatcher::getCommandName(message, &commandName)) | 725 if (!InspectorBackendDispatcher::getCommandName(message, &commandName)) |
| 728 return false; | 726 return false; |
| 729 return commandName == InspectorBackendDispatcher::commandName(InspectorBacke
ndDispatcher::kDebugger_pauseCmd) | 727 return commandName == InspectorBackendDispatcher::commandName(InspectorBacke
ndDispatcher::kDebugger_pauseCmd) |
| 730 || commandName == InspectorBackendDispatcher::commandName(InspectorBacke
ndDispatcher::kDebugger_setBreakpointCmd) | 728 || commandName == InspectorBackendDispatcher::commandName(InspectorBacke
ndDispatcher::kDebugger_setBreakpointCmd) |
| 731 || commandName == InspectorBackendDispatcher::commandName(InspectorBacke
ndDispatcher::kDebugger_setBreakpointByUrlCmd) | 729 || commandName == InspectorBackendDispatcher::commandName(InspectorBacke
ndDispatcher::kDebugger_setBreakpointByUrlCmd) |
| 732 || commandName == InspectorBackendDispatcher::commandName(InspectorBacke
ndDispatcher::kDebugger_removeBreakpointCmd) | 730 || commandName == InspectorBackendDispatcher::commandName(InspectorBacke
ndDispatcher::kDebugger_removeBreakpointCmd) |
| 733 || commandName == InspectorBackendDispatcher::commandName(InspectorBacke
ndDispatcher::kDebugger_setBreakpointsActiveCmd); | 731 || commandName == InspectorBackendDispatcher::commandName(InspectorBacke
ndDispatcher::kDebugger_setBreakpointsActiveCmd); |
| 734 } | 732 } |
| 735 | 733 |
| 736 } // namespace blink | 734 } // namespace blink |
| OLD | NEW |