Chromium Code Reviews| 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 407 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 418 void WebDevToolsAgentImpl::willBeDestroyed() | 418 void WebDevToolsAgentImpl::willBeDestroyed() |
| 419 { | 419 { |
| 420 #if ENABLE(ASSERT) | 420 #if ENABLE(ASSERT) |
| 421 Frame* frame = m_webLocalFrameImpl->frame(); | 421 Frame* frame = m_webLocalFrameImpl->frame(); |
| 422 ASSERT(frame); | 422 ASSERT(frame); |
| 423 ASSERT(m_pageAgent->inspectedFrame()->view()); | 423 ASSERT(m_pageAgent->inspectedFrame()->view()); |
| 424 #endif | 424 #endif |
| 425 | 425 |
| 426 detach(); | 426 detach(); |
| 427 m_injectedScriptManager->disconnect(); | 427 m_injectedScriptManager->disconnect(); |
| 428 m_overlay->setCSSAgent(nullptr); | |
|
dgozman
2015/06/25 12:31:00
Let's clear on detach.
sergeyv
2015/06/25 12:54:31
Done.
| |
| 428 m_agents.discardAgents(); | 429 m_agents.discardAgents(); |
| 429 m_instrumentingAgents->reset(); | 430 m_instrumentingAgents->reset(); |
| 430 } | 431 } |
| 431 | 432 |
| 432 void WebDevToolsAgentImpl::initializeDeferredAgents() | 433 void WebDevToolsAgentImpl::initializeDeferredAgents() |
| 433 { | 434 { |
| 434 if (m_deferredAgentsInitialized) | 435 if (m_deferredAgentsInitialized) |
| 435 return; | 436 return; |
| 436 m_deferredAgentsInitialized = true; | 437 m_deferredAgentsInitialized = true; |
| 437 | 438 |
| 438 InjectedScriptManager* injectedScriptManager = m_injectedScriptManager.get() ; | 439 InjectedScriptManager* injectedScriptManager = m_injectedScriptManager.get() ; |
| 439 | 440 |
| 440 OwnPtrWillBeRawPtr<InspectorResourceAgent> resourceAgentPtr(InspectorResourc eAgent::create(m_pageAgent)); | 441 OwnPtrWillBeRawPtr<InspectorResourceAgent> resourceAgentPtr(InspectorResourc eAgent::create(m_pageAgent)); |
| 441 m_resourceAgent = resourceAgentPtr.get(); | 442 m_resourceAgent = resourceAgentPtr.get(); |
| 442 m_agents.append(resourceAgentPtr.release()); | 443 m_agents.append(resourceAgentPtr.release()); |
| 443 | 444 |
| 444 OwnPtrWillBeRawPtr<InspectorCSSAgent> cssAgentPtr(InspectorCSSAgent::create( m_domAgent, m_pageAgent, m_resourceAgent)); | 445 OwnPtrWillBeRawPtr<InspectorCSSAgent> cssAgentPtr(InspectorCSSAgent::create( m_domAgent, m_pageAgent, m_resourceAgent)); |
| 445 m_cssAgent = cssAgentPtr.get(); | 446 m_cssAgent = cssAgentPtr.get(); |
| 446 m_agents.append(cssAgentPtr.release()); | 447 m_agents.append(cssAgentPtr.release()); |
| 448 m_overlay->setCSSAgent(m_cssAgent.get()); | |
|
dgozman
2015/06/25 12:31:00
Let's set on attach.
sergeyv
2015/06/25 12:54:31
Done.
| |
| 447 | 449 |
| 448 m_agents.append(InspectorAnimationAgent::create(m_pageAgent, m_domAgent)); | 450 m_agents.append(InspectorAnimationAgent::create(m_pageAgent, m_domAgent)); |
| 449 | 451 |
| 450 m_agents.append(InspectorMemoryAgent::create()); | 452 m_agents.append(InspectorMemoryAgent::create()); |
| 451 | 453 |
| 452 m_agents.append(InspectorApplicationCacheAgent::create(m_pageAgent)); | 454 m_agents.append(InspectorApplicationCacheAgent::create(m_pageAgent)); |
| 453 | 455 |
| 454 OwnPtrWillBeRawPtr<InspectorDebuggerAgent> debuggerAgentPtr(PageDebuggerAgen t::create(MainThreadDebugger::instance(), m_pageAgent, injectedScriptManager, m_ overlay, m_pageRuntimeAgent->debuggerId())); | 456 OwnPtrWillBeRawPtr<InspectorDebuggerAgent> debuggerAgentPtr(PageDebuggerAgen t::create(MainThreadDebugger::instance(), m_pageAgent, injectedScriptManager, m_ overlay, m_pageRuntimeAgent->debuggerId())); |
| 455 InspectorDebuggerAgent* debuggerAgent = debuggerAgentPtr.get(); | 457 InspectorDebuggerAgent* debuggerAgent = debuggerAgentPtr.get(); |
| 456 m_agents.append(debuggerAgentPtr.release()); | 458 m_agents.append(debuggerAgentPtr.release()); |
| (...skipping 284 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 741 if (!InspectorBackendDispatcher::getCommandName(message, &commandName)) | 743 if (!InspectorBackendDispatcher::getCommandName(message, &commandName)) |
| 742 return false; | 744 return false; |
| 743 return commandName == InspectorBackendDispatcher::commandName(InspectorBacke ndDispatcher::kDebugger_pauseCmd) | 745 return commandName == InspectorBackendDispatcher::commandName(InspectorBacke ndDispatcher::kDebugger_pauseCmd) |
| 744 || commandName == InspectorBackendDispatcher::commandName(InspectorBacke ndDispatcher::kDebugger_setBreakpointCmd) | 746 || commandName == InspectorBackendDispatcher::commandName(InspectorBacke ndDispatcher::kDebugger_setBreakpointCmd) |
| 745 || commandName == InspectorBackendDispatcher::commandName(InspectorBacke ndDispatcher::kDebugger_setBreakpointByUrlCmd) | 747 || commandName == InspectorBackendDispatcher::commandName(InspectorBacke ndDispatcher::kDebugger_setBreakpointByUrlCmd) |
| 746 || commandName == InspectorBackendDispatcher::commandName(InspectorBacke ndDispatcher::kDebugger_removeBreakpointCmd) | 748 || commandName == InspectorBackendDispatcher::commandName(InspectorBacke ndDispatcher::kDebugger_removeBreakpointCmd) |
| 747 || commandName == InspectorBackendDispatcher::commandName(InspectorBacke ndDispatcher::kDebugger_setBreakpointsActiveCmd); | 749 || commandName == InspectorBackendDispatcher::commandName(InspectorBacke ndDispatcher::kDebugger_setBreakpointsActiveCmd); |
| 748 } | 750 } |
| 749 | 751 |
| 750 } // namespace blink | 752 } // namespace blink |
| OLD | NEW |