OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "content/renderer/devtools_agent_filter.h" | 5 #include "content/renderer/devtools_agent_filter.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/message_loop.h" | 8 #include "base/message_loop.h" |
9 #include "content/common/devtools_messages.h" | 9 #include "content/common/devtools_messages.h" |
10 #include "content/renderer/devtools_agent.h" | 10 #include "content/renderer/devtools_agent.h" |
11 #include "content/renderer/plugin_channel_host.h" | 11 #include "content/renderer/plugin_channel_host.h" |
12 #include "content/renderer/render_thread.h" | |
13 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDevToolsAgent.h" | 12 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDevToolsAgent.h" |
14 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h" | 13 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h" |
15 | 14 |
16 using WebKit::WebDevToolsAgent; | 15 using WebKit::WebDevToolsAgent; |
17 using WebKit::WebString; | 16 using WebKit::WebString; |
18 | 17 |
19 namespace { | 18 namespace { |
20 | 19 |
21 class MessageImpl : public WebDevToolsAgent::MessageDescriptor { | 20 class MessageImpl : public WebDevToolsAgent::MessageDescriptor { |
22 public: | 21 public: |
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
62 IPC_END_MESSAGE_MAP() | 61 IPC_END_MESSAGE_MAP() |
63 return message_handled_; | 62 return message_handled_; |
64 } | 63 } |
65 | 64 |
66 void DevToolsAgentFilter::OnFilterAdded(IPC::Channel* channel) { | 65 void DevToolsAgentFilter::OnFilterAdded(IPC::Channel* channel) { |
67 channel_ = channel; | 66 channel_ = channel; |
68 } | 67 } |
69 | 68 |
70 void DevToolsAgentFilter::OnDispatchOnInspectorBackend( | 69 void DevToolsAgentFilter::OnDispatchOnInspectorBackend( |
71 const std::string& message) { | 70 const std::string& message) { |
72 RenderThread::current()->EnsureWebKitInitialized(); | |
73 if (!WebDevToolsAgent::shouldInterruptForMessage( | 71 if (!WebDevToolsAgent::shouldInterruptForMessage( |
74 WebString::fromUTF8(message))) { | 72 WebString::fromUTF8(message))) { |
75 message_handled_ = false; | 73 message_handled_ = false; |
76 return; | 74 return; |
77 } | 75 } |
78 WebDevToolsAgent::interruptAndDispatch( | 76 WebDevToolsAgent::interruptAndDispatch( |
79 new MessageImpl(message, current_routing_id_)); | 77 new MessageImpl(message, current_routing_id_)); |
80 | 78 |
81 render_thread_loop_->PostTask( | 79 render_thread_loop_->PostTask( |
82 FROM_HERE, base::Bind(&WebDevToolsAgent::processPendingMessages)); | 80 FROM_HERE, base::Bind(&WebDevToolsAgent::processPendingMessages)); |
83 } | 81 } |
OLD | NEW |