| 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 467 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 478 | 478 |
| 479 MainThreadDebugger* mainThreadDebugger = MainThreadDebugger::instance(); | 479 MainThreadDebugger* mainThreadDebugger = MainThreadDebugger::instance(); |
| 480 m_injectedScriptManager->injectedScriptHost()->init( | 480 m_injectedScriptManager->injectedScriptHost()->init( |
| 481 m_pageConsoleAgent.get(), | 481 m_pageConsoleAgent.get(), |
| 482 debuggerAgent->v8DebuggerAgent(), | 482 debuggerAgent->v8DebuggerAgent(), |
| 483 bind<PassRefPtr<TypeBuilder::Runtime::RemoteObject>, PassRefPtr<JSONObje
ct>>(&InspectorInspectorAgent::inspect, m_inspectorAgent.get()), | 483 bind<PassRefPtr<TypeBuilder::Runtime::RemoteObject>, PassRefPtr<JSONObje
ct>>(&InspectorInspectorAgent::inspect, m_inspectorAgent.get()), |
| 484 mainThreadDebugger->debugger(), | 484 mainThreadDebugger->debugger(), |
| 485 adoptPtr(new PageInjectedScriptHostClient())); | 485 adoptPtr(new PageInjectedScriptHostClient())); |
| 486 | 486 |
| 487 if (m_overlay) | 487 if (m_overlay) |
| 488 m_overlay->init(m_cssAgent.get(), debuggerAgent); | 488 m_overlay->init(m_cssAgent.get(), debuggerAgent, m_domAgent); |
| 489 } | 489 } |
| 490 | 490 |
| 491 void WebDevToolsAgentImpl::registerAgent(PassOwnPtrWillBeRawPtr<InspectorAgent>
agent) | 491 void WebDevToolsAgentImpl::registerAgent(PassOwnPtrWillBeRawPtr<InspectorAgent>
agent) |
| 492 { | 492 { |
| 493 m_agents.append(agent); | 493 m_agents.append(agent); |
| 494 } | 494 } |
| 495 | 495 |
| 496 void WebDevToolsAgentImpl::attach(const WebString& hostId) | 496 void WebDevToolsAgentImpl::attach(const WebString& hostId) |
| 497 { | 497 { |
| 498 if (m_attached) | 498 if (m_attached) |
| (...skipping 257 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 756 if (!InspectorBackendDispatcher::getCommandName(message, &commandName)) | 756 if (!InspectorBackendDispatcher::getCommandName(message, &commandName)) |
| 757 return false; | 757 return false; |
| 758 return commandName == InspectorBackendDispatcher::commandName(InspectorBacke
ndDispatcher::kDebugger_pauseCmd) | 758 return commandName == InspectorBackendDispatcher::commandName(InspectorBacke
ndDispatcher::kDebugger_pauseCmd) |
| 759 || commandName == InspectorBackendDispatcher::commandName(InspectorBacke
ndDispatcher::kDebugger_setBreakpointCmd) | 759 || commandName == InspectorBackendDispatcher::commandName(InspectorBacke
ndDispatcher::kDebugger_setBreakpointCmd) |
| 760 || commandName == InspectorBackendDispatcher::commandName(InspectorBacke
ndDispatcher::kDebugger_setBreakpointByUrlCmd) | 760 || commandName == InspectorBackendDispatcher::commandName(InspectorBacke
ndDispatcher::kDebugger_setBreakpointByUrlCmd) |
| 761 || commandName == InspectorBackendDispatcher::commandName(InspectorBacke
ndDispatcher::kDebugger_removeBreakpointCmd) | 761 || commandName == InspectorBackendDispatcher::commandName(InspectorBacke
ndDispatcher::kDebugger_removeBreakpointCmd) |
| 762 || commandName == InspectorBackendDispatcher::commandName(InspectorBacke
ndDispatcher::kDebugger_setBreakpointsActiveCmd); | 762 || commandName == InspectorBackendDispatcher::commandName(InspectorBacke
ndDispatcher::kDebugger_setBreakpointsActiveCmd); |
| 763 } | 763 } |
| 764 | 764 |
| 765 } // namespace blink | 765 } // namespace blink |
| OLD | NEW |