summaryrefslogtreecommitdiffstats
path: root/chrome/renderer
diff options
context:
space:
mode:
authorpfeldman@chromium.org <pfeldman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-05 09:40:51 +0000
committerpfeldman@chromium.org <pfeldman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-05 09:40:51 +0000
commitfd9dc809f2a84199a3457fee0c1b72792e3e1660 (patch)
tree2112e63fbe0ccb8d5427eaa8a7e0cc89d02073b3 /chrome/renderer
parent919da4005f83642977db4fca5b12005682023c6d (diff)
downloadchromium_src-fd9dc809f2a84199a3457fee0c1b72792e3e1660.zip
chromium_src-fd9dc809f2a84199a3457fee0c1b72792e3e1660.tar.gz
chromium_src-fd9dc809f2a84199a3457fee0c1b72792e3e1660.tar.bz2
DevTools: get rid of delayed command dispatching on front-end side.
Review URL: http://codereview.chromium.org/3020063 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@55047 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer')
-rw-r--r--chrome/renderer/devtools_agent.cc10
-rw-r--r--chrome/renderer/devtools_agent.h1
-rw-r--r--chrome/renderer/devtools_client.cc4
-rw-r--r--chrome/renderer/devtools_client.h1
4 files changed, 14 insertions, 2 deletions
diff --git a/chrome/renderer/devtools_agent.cc b/chrome/renderer/devtools_agent.cc
index 282cf18..b03eea7 100644
--- a/chrome/renderer/devtools_agent.cc
+++ b/chrome/renderer/devtools_agent.cc
@@ -78,6 +78,7 @@ bool DevToolsAgent::OnMessageReceived(const IPC::Message& message) {
IPC_BEGIN_MESSAGE_MAP(DevToolsAgent, message)
IPC_MESSAGE_HANDLER(DevToolsAgentMsg_Attach, OnAttach)
IPC_MESSAGE_HANDLER(DevToolsAgentMsg_Detach, OnDetach)
+ IPC_MESSAGE_HANDLER(DevToolsAgentMsg_FrontendLoaded, OnFrontendLoaded)
IPC_MESSAGE_HANDLER(DevToolsAgentMsg_DispatchOnInspectorBackend,
OnDispatchOnInspectorBackend)
IPC_MESSAGE_HANDLER(DevToolsAgentMsg_InspectElement, OnInspectElement)
@@ -177,9 +178,14 @@ void DevToolsAgent::OnAttach(const std::vector<std::string>& runtime_features) {
void DevToolsAgent::OnDetach() {
WebDevToolsAgent* web_agent = GetWebAgent();
- if (web_agent) {
+ if (web_agent)
web_agent->detach();
- }
+}
+
+void DevToolsAgent::OnFrontendLoaded() {
+ WebDevToolsAgent* web_agent = GetWebAgent();
+ if (web_agent)
+ web_agent->frontendLoaded();
}
void DevToolsAgent::OnDispatchOnInspectorBackend(const std::string& message) {
diff --git a/chrome/renderer/devtools_agent.h b/chrome/renderer/devtools_agent.h
index 1c566b0..9fc8355 100644
--- a/chrome/renderer/devtools_agent.h
+++ b/chrome/renderer/devtools_agent.h
@@ -66,6 +66,7 @@ class DevToolsAgent : public WebKit::WebDevToolsAgentClient {
void OnAttach(const std::vector<std::string>& runtime_features);
void OnDetach();
+ void OnFrontendLoaded();
void OnDispatchOnInspectorBackend(const std::string& message);
void OnInspectElement(int x, int y);
void OnSetApuAgentEnabled(bool enabled);
diff --git a/chrome/renderer/devtools_client.cc b/chrome/renderer/devtools_client.cc
index 81b6f73..2673fb9 100644
--- a/chrome/renderer/devtools_client.cc
+++ b/chrome/renderer/devtools_client.cc
@@ -49,6 +49,10 @@ bool DevToolsClient::OnMessageReceived(const IPC::Message& message) {
return handled;
}
+void DevToolsClient::sendFrontendLoaded() {
+ Send(DevToolsAgentMsg_FrontendLoaded());
+}
+
void DevToolsClient::sendMessageToBackend(const WebString& message) {
Send(DevToolsAgentMsg_DispatchOnInspectorBackend(message.utf8()));
}
diff --git a/chrome/renderer/devtools_client.h b/chrome/renderer/devtools_client.h
index 3625547..fdef8d1 100644
--- a/chrome/renderer/devtools_client.h
+++ b/chrome/renderer/devtools_client.h
@@ -41,6 +41,7 @@ class DevToolsClient : public WebKit::WebDevToolsFrontendClient {
bool OnMessageReceived(const IPC::Message& message);
// WebDevToolsFrontendClient implementation
+ virtual void sendFrontendLoaded();
virtual void sendMessageToBackend(const WebKit::WebString&);
virtual void sendDebuggerCommandToAgent(const WebKit::WebString& command);
virtual void sendDebuggerPauseScript();