summaryrefslogtreecommitdiffstats
path: root/webkit/glue/webdevtoolsclient_impl.cc
diff options
context:
space:
mode:
authorpfeldman@chromium.org <pfeldman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-15 09:00:53 +0000
committerpfeldman@chromium.org <pfeldman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-15 09:00:53 +0000
commitcad7b942f7e9eb447cf34f5e9355e0b634e565e6 (patch)
treec6bacb2b3dbbdb96c5cc5ea0aff2ced747094f8c /webkit/glue/webdevtoolsclient_impl.cc
parentda4a2a74f402190a9f0f1f73d51eaa25054ad53d (diff)
downloadchromium_src-cad7b942f7e9eb447cf34f5e9355e0b634e565e6.zip
chromium_src-cad7b942f7e9eb447cf34f5e9355e0b634e565e6.tar.gz
chromium_src-cad7b942f7e9eb447cf34f5e9355e0b634e565e6.tar.bz2
DevTools: simplify client dispatch via moving it into javascript.
Review URL: http://codereview.chromium.org/113450 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@16150 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/webdevtoolsclient_impl.cc')
-rw-r--r--webkit/glue/webdevtoolsclient_impl.cc14
1 files changed, 3 insertions, 11 deletions
diff --git a/webkit/glue/webdevtoolsclient_impl.cc b/webkit/glue/webdevtoolsclient_impl.cc
index 7de27db..d4f1f00 100644
--- a/webkit/glue/webdevtoolsclient_impl.cc
+++ b/webkit/glue/webdevtoolsclient_impl.cc
@@ -158,17 +158,9 @@ void WebDevToolsClientImpl::DispatchMessageFromAgent(
pending_incoming_messages_.append(raw_msg);
return;
}
- OwnPtr<ListValue> message(
- static_cast<ListValue*>(DevToolsRpc::ParseMessage(raw_msg)));
-
- std::string expr;
- if (dom_agent_obj_->Dispatch(*message.get(), &expr)
- || net_agent_obj_->Dispatch(*message.get(), &expr)
- || tools_agent_obj_->Dispatch(*message.get(), &expr)
- || debugger_agent_obj_->Dispatch(*message.get(), &expr)) {
- web_view_impl_->GetMainFrame()->ExecuteScript(
- WebScriptSource(WebString::fromUTF8(expr)));
- }
+ std::string expr = StringPrintf("devtools.dispatch(%s)", raw_msg.c_str());
+ web_view_impl_->GetMainFrame()->ExecuteScript(
+ WebScriptSource(WebString::fromUTF8(expr)));
}
void WebDevToolsClientImpl::SendRpcMessage(const std::string& raw_msg) {