| OLD | NEW |
| 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "config.h" | 5 #include "config.h" |
| 6 | 6 |
| 7 #include <string> | 7 #include <string> |
| 8 | 8 |
| 9 #include "Document.h" | 9 #include "Document.h" |
| 10 #include "EventListener.h" | 10 #include "EventListener.h" |
| (...skipping 177 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 188 tools_agent_delegate_stub_->DidEvaluateJavaScript(call_id, result_string); | 188 tools_agent_delegate_stub_->DidEvaluateJavaScript(call_id, result_string); |
| 189 } | 189 } |
| 190 | 190 |
| 191 void WebDevToolsAgentImpl::ExecuteUtilityFunction( | 191 void WebDevToolsAgentImpl::ExecuteUtilityFunction( |
| 192 int call_id, | 192 int call_id, |
| 193 const String& function_name, | 193 const String& function_name, |
| 194 int node_id, | 194 int node_id, |
| 195 const String& json_args) { | 195 const String& json_args) { |
| 196 Node* node = dom_agent_impl_->GetNodeForId(node_id); | 196 Node* node = dom_agent_impl_->GetNodeForId(node_id); |
| 197 String result; | 197 String result; |
| 198 String exception; |
| 198 if (node) { | 199 if (node) { |
| 199 result = debugger_agent_impl_->ExecuteUtilityFunction(function_name, node, | 200 result = debugger_agent_impl_->ExecuteUtilityFunction(function_name, node, |
| 200 json_args); | 201 json_args, &exception); |
| 201 } | 202 } |
| 202 tools_agent_delegate_stub_->DidExecuteUtilityFunction(call_id, | 203 tools_agent_delegate_stub_->DidExecuteUtilityFunction(call_id, |
| 203 result); | 204 result, exception); |
| 204 } | 205 } |
| 205 | 206 |
| 206 void WebDevToolsAgentImpl::ClearConsoleMessages() { | 207 void WebDevToolsAgentImpl::ClearConsoleMessages() { |
| 207 console_log_.clear(); | 208 console_log_.clear(); |
| 208 } | 209 } |
| 209 | 210 |
| 210 void WebDevToolsAgentImpl::DispatchMessageFromClient( | 211 void WebDevToolsAgentImpl::DispatchMessageFromClient( |
| 211 const std::string& raw_msg) { | 212 const std::string& raw_msg) { |
| 212 OwnPtr<ListValue> message( | 213 OwnPtr<ListValue> message( |
| 213 static_cast<ListValue*>(DevToolsRpc::ParseMessage(raw_msg))); | 214 static_cast<ListValue*>(DevToolsRpc::ParseMessage(raw_msg))); |
| (...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 264 const std::string& command, | 265 const std::string& command, |
| 265 int caller_id) { | 266 int caller_id) { |
| 266 DebuggerAgentManager::ExecuteDebuggerCommand(command, caller_id); | 267 DebuggerAgentManager::ExecuteDebuggerCommand(command, caller_id); |
| 267 } | 268 } |
| 268 | 269 |
| 269 // static | 270 // static |
| 270 void WebDevToolsAgent::SetMessageLoopDispatchHandler( | 271 void WebDevToolsAgent::SetMessageLoopDispatchHandler( |
| 271 MessageLoopDispatchHandler handler) { | 272 MessageLoopDispatchHandler handler) { |
| 272 DebuggerAgentManager::SetMessageLoopDispatchHandler(handler); | 273 DebuggerAgentManager::SetMessageLoopDispatchHandler(handler); |
| 273 } | 274 } |
| 274 | |
| OLD | NEW |