Chromium Code Reviews| Index: third_party/WebKit/Source/web/WebDevToolsAgentImpl.cpp |
| diff --git a/third_party/WebKit/Source/web/WebDevToolsAgentImpl.cpp b/third_party/WebKit/Source/web/WebDevToolsAgentImpl.cpp |
| index 0653e9cc362e7b6bf9436d52a82631e7b1297728..a762371e0aeb69239492cd6db1016ffa65a8fb40 100644 |
| --- a/third_party/WebKit/Source/web/WebDevToolsAgentImpl.cpp |
| +++ b/third_party/WebKit/Source/web/WebDevToolsAgentImpl.cpp |
| @@ -490,7 +490,7 @@ void WebDevToolsAgentImpl::initializeDeferredAgents() |
| m_pageConsoleAgent->setDebuggerAgent(debuggerAgent->v8Agent()); |
| m_pageRuntimeAgent->v8Agent()->setClearConsoleCallback(bind<>(&InspectorConsoleAgent::clearAllMessages, m_pageConsoleAgent.get())); |
| - m_pageRuntimeAgent->v8Agent()->setInspectObjectCallback(bind<PassRefPtr<protocol::TypeBuilder::Runtime::RemoteObject>, PassRefPtr<JSONObject>>(&InspectorInspectorAgent::inspect, m_inspectorAgent.get())); |
| + m_pageRuntimeAgent->v8Agent()->setInspectObjectCallback(bind<PassOwnPtr<protocol::TypeBuilder::Runtime::RemoteObject>, PassRefPtr<JSONObject>>(&InspectorInspectorAgent::inspect, m_inspectorAgent.get())); |
| if (m_overlay) |
| m_overlay->init(cssAgent, debuggerAgent, m_domAgent.get()); |
| @@ -660,6 +660,7 @@ void WebDevToolsAgentImpl::sendProtocolResponse(int sessionId, int callId, PassR |
| else |
| m_stateCookie = stateToSend; |
| } |
| + |
| m_client->sendProtocolMessage(sessionId, callId, message->toJSONString(), stateToSend); |
| } |
| @@ -690,7 +691,7 @@ void WebDevToolsAgentImpl::pageLayoutInvalidated() |
| m_overlay->pageLayoutInvalidated(); |
| } |
| -void WebDevToolsAgentImpl::setPausedInDebuggerMessage(const String* message) |
| +void WebDevToolsAgentImpl::setPausedInDebuggerMessage(const String& message) |
| { |
| if (m_overlay) |
| m_overlay->setPausedInDebuggerMessage(message); |
| @@ -757,11 +758,11 @@ bool WebDevToolsAgent::shouldInterruptForMessage(const WebString& message) |
| String commandName; |
| if (!protocol::Dispatcher::getCommandName(message, &commandName)) |
| return false; |
| - return commandName == protocol::Dispatcher::commandName(protocol::Dispatcher::kDebugger_pauseCmd) |
| - || commandName == protocol::Dispatcher::commandName(protocol::Dispatcher::kDebugger_setBreakpointCmd) |
| - || commandName == protocol::Dispatcher::commandName(protocol::Dispatcher::kDebugger_setBreakpointByUrlCmd) |
| - || commandName == protocol::Dispatcher::commandName(protocol::Dispatcher::kDebugger_removeBreakpointCmd) |
| - || commandName == protocol::Dispatcher::commandName(protocol::Dispatcher::kDebugger_setBreakpointsActiveCmd); |
| + return commandName == "Debugger.pause" |
| + || commandName == "Debugger.setBreakpointCmd" |
|
dgozman
2016/02/22 23:57:36
kill Cmd
|
| + || commandName == "Debugger.setBreakpointByUrlCmd" |
| + || commandName == "Debugger.removeBreakpointCmd" |
| + || commandName == "Debugger.setBreakpointsActiveCmd"; |
| } |
| } // namespace blink |