summaryrefslogtreecommitdiffstats
path: root/content/worker
diff options
context:
space:
mode:
authoryurys@chromium.org <yurys@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-05 07:35:51 +0000
committeryurys@chromium.org <yurys@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-05 07:35:51 +0000
commit331b01d23d2d1af36bf3a144d53f5bb1c2e01f61 (patch)
treed335950b28e77c3c5d92d96857659c6b147ab6f5 /content/worker
parent5cbe0d872f2d45ae3fbfa463c32c414721033079 (diff)
downloadchromium_src-331b01d23d2d1af36bf3a144d53f5bb1c2e01f61.zip
chromium_src-331b01d23d2d1af36bf3a144d53f5bb1c2e01f61.tar.gz
chromium_src-331b01d23d2d1af36bf3a144d53f5bb1c2e01f61.tar.bz2
Now that WebKit r96590 is rolled, reapply http://codereview.chromium.org/8135002/ which was reverted due to compilation errors.
We want agent to save its state into a string instead of using a map of runtime properties. Also the serialized state should be taken into account only when existing client is reattached from one agent to another, this is why we introduce Reattach message. Also see https://bugs.webkit.org/show_bug.cgi?id=69335 BUG=None TEST=None TBR=pfeldman,jam Review URL: http://codereview.chromium.org/8136029 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@104072 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/worker')
-rw-r--r--content/worker/worker_devtools_agent.cc7
1 files changed, 6 insertions, 1 deletions
diff --git a/content/worker/worker_devtools_agent.cc b/content/worker/worker_devtools_agent.cc
index 1ef2f03..8498fea 100644
--- a/content/worker/worker_devtools_agent.cc
+++ b/content/worker/worker_devtools_agent.cc
@@ -32,6 +32,7 @@ class WorkerDevToolsAgentImpl : public WorkerDevToolsAgent {
bool handled = true;
IPC_BEGIN_MESSAGE_MAP(WorkerDevToolsAgentImpl, message)
IPC_MESSAGE_HANDLER(DevToolsAgentMsg_Attach, OnAttach)
+ IPC_MESSAGE_HANDLER(DevToolsAgentMsg_Reattach, OnReattach)
IPC_MESSAGE_HANDLER(DevToolsAgentMsg_Detach, OnDetach)
IPC_MESSAGE_HANDLER(DevToolsAgentMsg_DispatchOnInspectorBackend,
OnDispatchOnInspectorBackend)
@@ -42,10 +43,14 @@ class WorkerDevToolsAgentImpl : public WorkerDevToolsAgent {
virtual void SendDevToolsMessage(const WebKit::WebString& message);
- void OnAttach(const DevToolsRuntimeProperties&) {
+ void OnAttach() {
webworker_->attachDevTools();
}
+ void OnReattach(const std::string&) {
+ OnAttach();
+ }
+
void OnDetach() {
webworker_->detachDevTools();
}