summaryrefslogtreecommitdiffstats
path: root/content/renderer/devtools/devtools_client.h
diff options
context:
space:
mode:
authordgozman <dgozman@chromium.org>2015-12-07 19:56:47 -0800
committerCommit bot <commit-bot@chromium.org>2015-12-08 03:57:35 +0000
commit5c7f1ac926777bcae556dad72be6c45842e564bf (patch)
treedb9a80a40a8a0bfdc07457855dec196277b4db18 /content/renderer/devtools/devtools_client.h
parenteb8d42df5fbfb95ad409dfd2353d04674624c2f5 (diff)
downloadchromium_src-5c7f1ac926777bcae556dad72be6c45842e564bf.zip
chromium_src-5c7f1ac926777bcae556dad72be6c45842e564bf.tar.gz
chromium_src-5c7f1ac926777bcae556dad72be6c45842e564bf.tar.bz2
[DevTools] Fix frontend host race and assert.
When quickly reloading DevTools, on-load messages from frontend like Console.enable are dispatched from both page loads, but only the last batch (from the last reload) should be dispatched. Otherwise, backend sees messages with the same id, and frontend receives multiple responses, some of them even before load producing "dispatchMessage is undefined" error. Also, reloading frontend violates an assert in DevToolsHost.cpp because of no proper cleanup in WebDevToolsFrontendImpl. Drive-by: cleaning up WebDevToolsFrontend and DevToolsHost API. BUG=566929 Review URL: https://codereview.chromium.org/1504763004 Cr-Commit-Position: refs/heads/master@{#363726}
Diffstat (limited to 'content/renderer/devtools/devtools_client.h')
-rw-r--r--content/renderer/devtools/devtools_client.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/content/renderer/devtools/devtools_client.h b/content/renderer/devtools/devtools_client.h
index a751a31..0dba7f1 100644
--- a/content/renderer/devtools/devtools_client.h
+++ b/content/renderer/devtools/devtools_client.h
@@ -45,8 +45,8 @@ class CONTENT_EXPORT DevToolsClient
void OnDispatchOnInspectorFrontend(const std::string& message,
uint32 total_size);
- scoped_ptr<blink::WebDevToolsFrontend> web_tools_frontend_;
std::string compatibility_script_;
+ scoped_ptr<blink::WebDevToolsFrontend> web_tools_frontend_;
DISALLOW_COPY_AND_ASSIGN(DevToolsClient);
};