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 472 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 483 void WebDevToolsAgentImpl::attach(const WebString& hostId) | 483 void WebDevToolsAgentImpl::attach(const WebString& hostId) |
| 484 { | 484 { |
| 485 if (m_attached) | 485 if (m_attached) |
| 486 return; | 486 return; |
| 487 | 487 |
| 488 // Set the attached bit first so that sync notifications were delivered. | 488 // Set the attached bit first so that sync notifications were delivered. |
| 489 m_attached = true; | 489 m_attached = true; |
| 490 | 490 |
| 491 initializeDeferredAgents(); | 491 initializeDeferredAgents(); |
| 492 m_resourceAgent->setHostId(hostId); | 492 m_resourceAgent->setHostId(hostId); |
| 493 m_overlay->setCSSAgent(m_cssAgent.get()); | |
| 493 | 494 |
| 494 m_inspectorFrontend = adoptPtr(new InspectorFrontend(this)); | 495 m_inspectorFrontend = adoptPtr(new InspectorFrontend(this)); |
| 495 // We can reconnect to existing front-end -> unmute state. | 496 // We can reconnect to existing front-end -> unmute state. |
| 496 m_state->unmute(); | 497 m_state->unmute(); |
| 497 m_agents.setFrontend(m_inspectorFrontend.get()); | 498 m_agents.setFrontend(m_inspectorFrontend.get()); |
| 498 | 499 |
| 499 InspectorInstrumentation::registerInstrumentingAgents(m_instrumentingAgents. get()); | 500 InspectorInstrumentation::registerInstrumentingAgents(m_instrumentingAgents. get()); |
| 500 InspectorInstrumentation::frontendCreated(); | 501 InspectorInstrumentation::frontendCreated(); |
| 501 | 502 |
| 502 m_inspectorBackendDispatcher = InspectorBackendDispatcher::create(this); | 503 m_inspectorBackendDispatcher = InspectorBackendDispatcher::create(this); |
| (...skipping 25 matching lines...) Expand all Loading... | |
| 528 // Destroying agents would change the state, but we don't want that. | 529 // Destroying agents would change the state, but we don't want that. |
| 529 // Pre-disconnect state will be used to restore inspector agents. | 530 // Pre-disconnect state will be used to restore inspector agents. |
| 530 m_state->mute(); | 531 m_state->mute(); |
| 531 m_agents.clearFrontend(); | 532 m_agents.clearFrontend(); |
| 532 m_inspectorFrontend.clear(); | 533 m_inspectorFrontend.clear(); |
| 533 | 534 |
| 534 // Release overlay resources. | 535 // Release overlay resources. |
| 535 m_overlay->clear(); | 536 m_overlay->clear(); |
| 536 InspectorInstrumentation::frontendDeleted(); | 537 InspectorInstrumentation::frontendDeleted(); |
| 537 InspectorInstrumentation::unregisterInstrumentingAgents(m_instrumentingAgent s.get()); | 538 InspectorInstrumentation::unregisterInstrumentingAgents(m_instrumentingAgent s.get()); |
| 539 m_overlay->setCSSAgent(nullptr); | |
|
dgozman
2015/06/25 12:57:56
Let's do this before instrumentation calls.
sergeyv
2015/06/25 13:01:40
Done.
| |
| 538 | 540 |
| 539 m_attached = false; | 541 m_attached = false; |
| 540 } | 542 } |
| 541 | 543 |
| 542 void WebDevToolsAgentImpl::continueProgram() | 544 void WebDevToolsAgentImpl::continueProgram() |
| 543 { | 545 { |
| 544 ClientMessageLoopAdapter::continueProgram(); | 546 ClientMessageLoopAdapter::continueProgram(); |
| 545 } | 547 } |
| 546 | 548 |
| 547 bool WebDevToolsAgentImpl::handleInputEvent(const WebInputEvent& inputEvent) | 549 bool WebDevToolsAgentImpl::handleInputEvent(const WebInputEvent& inputEvent) |
| (...skipping 193 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 |