summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authorpfeldman@chromium.org <pfeldman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-19 14:40:57 +0000
committerpfeldman@chromium.org <pfeldman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-19 14:40:57 +0000
commit904f191f2f7edc9b331e2590c77eb4e8dd845549 (patch)
tree8d912a4f0a12f03ee79990ec0684bc19b26f375a /webkit
parent7b40bb9e3b23ab22b451aa81f3929b462b5c72f5 (diff)
downloadchromium_src-904f191f2f7edc9b331e2590c77eb4e8dd845549.zip
chromium_src-904f191f2f7edc9b331e2590c77eb4e8dd845549.tar.gz
chromium_src-904f191f2f7edc9b331e2590c77eb4e8dd845549.tar.bz2
DevTools: test shell should process frontendLoaded messages asynchronously.
Review URL: http://codereview.chromium.org/3180016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56686 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/tools/test_shell/test_shell_devtools_agent.cc21
-rw-r--r--webkit/tools/test_shell/test_shell_devtools_agent.h5
2 files changed, 18 insertions, 8 deletions
diff --git a/webkit/tools/test_shell/test_shell_devtools_agent.cc b/webkit/tools/test_shell/test_shell_devtools_agent.cc
index 6b385ad..4164fad 100644
--- a/webkit/tools/test_shell/test_shell_devtools_agent.cc
+++ b/webkit/tools/test_shell/test_shell_devtools_agent.cc
@@ -80,9 +80,10 @@ void TestShellDevToolsAgent::sendMessageToInspectorFrontend(
void TestShellDevToolsAgent::forceRepaint() {
}
-void TestShellDevToolsAgent::runtimeFeatureStateChanged(
- const WebKit::WebString& feature, bool enabled) {
- // TODO(loislo): implement this.
+void TestShellDevToolsAgent::runtimePropertyChanged(
+ const WebKit::WebString& name,
+ const WebKit::WebString& value) {
+ // TODO: Implement.
}
WebCString TestShellDevToolsAgent::injectedScriptSource() {
@@ -118,6 +119,12 @@ void TestShellDevToolsAgent::Call(const TestShellDevToolsCallArgs &args) {
dev_tools_client_->all_messages_processed();
}
+void TestShellDevToolsAgent::DelayedFrontendLoaded() {
+ WebDevToolsAgent *web_agent = GetWebAgent();
+ if (web_agent)
+ web_agent->frontendLoaded();
+}
+
WebDevToolsAgent* TestShellDevToolsAgent::GetWebAgent() {
if (!web_view_)
return NULL;
@@ -141,9 +148,11 @@ void TestShellDevToolsAgent::detach() {
}
void TestShellDevToolsAgent::frontendLoaded() {
- WebDevToolsAgent *web_agent = GetWebAgent();
- if (web_agent)
- web_agent->frontendLoaded();
+ MessageLoop::current()->PostDelayedTask(
+ FROM_HERE,
+ call_method_factory_.NewRunnableMethod(
+ &TestShellDevToolsAgent::DelayedFrontendLoaded),
+ 0);
}
bool TestShellDevToolsAgent::setTimelineProfilingEnabled(bool enabled) {
diff --git a/webkit/tools/test_shell/test_shell_devtools_agent.h b/webkit/tools/test_shell/test_shell_devtools_agent.h
index c29741e..467c863 100644
--- a/webkit/tools/test_shell/test_shell_devtools_agent.h
+++ b/webkit/tools/test_shell/test_shell_devtools_agent.h
@@ -33,8 +33,8 @@ class TestShellDevToolsAgent : public WebKit::WebDevToolsAgentClient {
const WebKit::WebString& data);
virtual int hostIdentifier() { return routing_id_; }
virtual void forceRepaint();
- virtual void runtimeFeatureStateChanged(const WebKit::WebString& feature,
- bool enabled);
+ virtual void runtimePropertyChanged(const WebKit::WebString& name,
+ const WebKit::WebString& value);
virtual WebKit::WebCString injectedScriptSource();
virtual WebKit::WebCString debuggerScriptSource();
@@ -52,6 +52,7 @@ class TestShellDevToolsAgent : public WebKit::WebDevToolsAgentClient {
private:
void Call(const TestShellDevToolsCallArgs& args);
+ void DelayedFrontendLoaded();
static void DispatchMessageLoop();
WebKit::WebDevToolsAgent* GetWebAgent();