Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1592)

Unified Diff: content/renderer/devtools/devtools_agent_filter.cc

Issue 198753002: Don't handle DispatchOnInspectorBackend msg for SharedWorkers in DevToolsAgentFilter. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rename OnUI to OnMainThread. Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/renderer/devtools/devtools_agent_filter.h ('k') | content/renderer/render_thread_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/devtools/devtools_agent_filter.cc
diff --git a/content/renderer/devtools/devtools_agent_filter.cc b/content/renderer/devtools/devtools_agent_filter.cc
index fc9e34f8a8ab43023f27391e365df5c416aceda2..e34abb55ec49038818a225e7e169646243aace4b 100644
--- a/content/renderer/devtools/devtools_agent_filter.cc
+++ b/content/renderer/devtools/devtools_agent_filter.cc
@@ -6,6 +6,7 @@
#include "base/bind.h"
#include "base/message_loop/message_loop.h"
+#include "content/child/child_process.h"
#include "content/common/devtools_messages.h"
#include "content/renderer/devtools/devtools_agent.h"
#include "third_party/WebKit/public/platform/WebString.h"
@@ -42,6 +43,7 @@ class MessageImpl : public WebDevToolsAgent::MessageDescriptor {
DevToolsAgentFilter::DevToolsAgentFilter()
: message_handled_(false),
render_thread_loop_(base::MessageLoop::current()),
+ io_message_loop_proxy_(ChildProcess::current()->io_message_loop_proxy()),
current_routing_id_(0) {}
bool DevToolsAgentFilter::OnMessageReceived(const IPC::Message& message) {
@@ -60,6 +62,11 @@ DevToolsAgentFilter::~DevToolsAgentFilter() {}
void DevToolsAgentFilter::OnDispatchOnInspectorBackend(
const std::string& message) {
+ if (shared_worker_routes_.find(current_routing_id_) !=
+ shared_worker_routes_.end()) {
+ message_handled_ = false;
+ return;
+ }
if (!WebDevToolsAgent::shouldInterruptForMessage(
WebString::fromUTF8(message))) {
message_handled_ = false;
@@ -72,4 +79,26 @@ void DevToolsAgentFilter::OnDispatchOnInspectorBackend(
FROM_HERE, base::Bind(&WebDevToolsAgent::processPendingMessages));
}
+void DevToolsAgentFilter::AddSharedWorkerRouteOnMainThread(int32 routing_id) {
+ io_message_loop_proxy_->PostTask(
+ FROM_HERE,
+ base::Bind(&DevToolsAgentFilter::AddSharedWorkerRoute, this, routing_id));
+}
+
+void DevToolsAgentFilter::RemoveSharedWorkerRouteOnMainThread(
+ int32 routing_id) {
+ io_message_loop_proxy_->PostTask(
+ FROM_HERE,
+ base::Bind(
+ &DevToolsAgentFilter::RemoveSharedWorkerRoute, this, routing_id));
+}
+
+void DevToolsAgentFilter::AddSharedWorkerRoute(int32 routing_id) {
+ shared_worker_routes_.insert(routing_id);
+}
+
+void DevToolsAgentFilter::RemoveSharedWorkerRoute(int32 routing_id) {
+ shared_worker_routes_.erase(routing_id);
+}
+
} // namespace content
« no previous file with comments | « content/renderer/devtools/devtools_agent_filter.h ('k') | content/renderer/render_thread_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698