diff options
| author | pfeldman@chromium.org <pfeldman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-05 09:40:51 +0000 |
|---|---|---|
| committer | pfeldman@chromium.org <pfeldman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-05 09:40:51 +0000 |
| commit | fd9dc809f2a84199a3457fee0c1b72792e3e1660 (patch) | |
| tree | 2112e63fbe0ccb8d5427eaa8a7e0cc89d02073b3 /webkit | |
| parent | 919da4005f83642977db4fca5b12005682023c6d (diff) | |
| download | chromium_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 'webkit')
4 files changed, 16 insertions, 3 deletions
diff --git a/webkit/tools/test_shell/test_shell_devtools_agent.cc b/webkit/tools/test_shell/test_shell_devtools_agent.cc index 24f83d4..e42c3e6 100644 --- a/webkit/tools/test_shell/test_shell_devtools_agent.cc +++ b/webkit/tools/test_shell/test_shell_devtools_agent.cc @@ -138,7 +138,7 @@ void TestShellDevToolsAgent::attach(TestShellDevToolsClient* client) { web_agent->attach(); } -void TestShellDevToolsAgent::detach(TestShellDevToolsClient* client) { +void TestShellDevToolsAgent::detach() { DCHECK(dev_tools_client_); WebDevToolsAgent* web_agent = GetWebAgent(); if (web_agent) @@ -146,6 +146,12 @@ void TestShellDevToolsAgent::detach(TestShellDevToolsClient* client) { dev_tools_client_ = NULL; } +void TestShellDevToolsAgent::frontendLoaded() { + WebDevToolsAgent *web_agent = GetWebAgent(); + if (web_agent) + web_agent->frontendLoaded(); +} + bool TestShellDevToolsAgent::setTimelineProfilingEnabled(bool enabled) { WebDevToolsAgent* agent = GetWebAgent(); if (!agent) diff --git a/webkit/tools/test_shell/test_shell_devtools_agent.h b/webkit/tools/test_shell/test_shell_devtools_agent.h index 994c6b2..0b2acf9 100644 --- a/webkit/tools/test_shell/test_shell_devtools_agent.h +++ b/webkit/tools/test_shell/test_shell_devtools_agent.h @@ -45,7 +45,8 @@ class TestShellDevToolsAgent : public WebKit::WebDevToolsAgentClient { void AsyncCall(const TestShellDevToolsCallArgs& args); void attach(TestShellDevToolsClient* client); - void detach(TestShellDevToolsClient* client); + void detach(); + void frontendLoaded(); bool evaluateInWebInspector(long call_id, const std::string& script); bool setTimelineProfilingEnabled(bool enable); diff --git a/webkit/tools/test_shell/test_shell_devtools_client.cc b/webkit/tools/test_shell/test_shell_devtools_client.cc index fe445641..15328e8 100644 --- a/webkit/tools/test_shell/test_shell_devtools_client.cc +++ b/webkit/tools/test_shell/test_shell_devtools_client.cc @@ -46,7 +46,12 @@ TestShellDevToolsClient::~TestShellDevToolsClient() { // dev_tools_agent_ and we should clean pending requests a bit earlier. call_method_factory_.RevokeAll(); if (dev_tools_agent_) - dev_tools_agent_->detach(this); + dev_tools_agent_->detach(); +} + +void TestShellDevToolsClient::sendFrontendLoaded() { + if (dev_tools_agent_) + dev_tools_agent_->frontendLoaded(); } void TestShellDevToolsClient::sendMessageToBackend( diff --git a/webkit/tools/test_shell/test_shell_devtools_client.h b/webkit/tools/test_shell/test_shell_devtools_client.h index d130cfd..9b3d09a5 100644 --- a/webkit/tools/test_shell/test_shell_devtools_client.h +++ b/webkit/tools/test_shell/test_shell_devtools_client.h @@ -28,6 +28,7 @@ class TestShellDevToolsClient: public WebKit::WebDevToolsFrontendClient { virtual ~TestShellDevToolsClient(); // WebDevToolsFrontendClient implementation + virtual void sendFrontendLoaded(); virtual void sendMessageToBackend(const WebKit::WebString& data); virtual void sendDebuggerCommandToAgent(const WebKit::WebString& command); |