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

Side by Side Diff: content/browser/renderer_host/pepper/browser_ppapi_host_impl.cc

Issue 11411118: Add tracing support to NaCl (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: use components Created 8 years 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/browser/renderer_host/pepper/browser_ppapi_host_impl.h" 5 #include "content/browser/renderer_host/pepper/browser_ppapi_host_impl.h"
6 #include "content/browser/renderer_host/pepper/pepper_message_filter.h" 6 #include "content/browser/renderer_host/pepper/pepper_message_filter.h"
7 7
8 #include "content/browser/trace_message_filter.h"
8 #include "content/public/browser/browser_thread.h" 9 #include "content/public/browser/browser_thread.h"
9 #include "content/public/browser/render_view_host.h" 10 #include "content/public/browser/render_view_host.h"
10 #include "ipc/ipc_message_macros.h" 11 #include "ipc/ipc_message_macros.h"
11 12
12 namespace content { 13 namespace content {
13 14
14 // static 15 // static
15 BrowserPpapiHost* BrowserPpapiHost::CreateExternalPluginProcess( 16 BrowserPpapiHost* BrowserPpapiHost::CreateExternalPluginProcess(
16 IPC::Sender* sender, 17 IPC::Sender* sender,
17 ppapi::PpapiPermissions permissions, 18 ppapi::PpapiPermissions permissions,
18 base::ProcessHandle plugin_child_process, 19 base::ProcessHandle plugin_child_process,
19 IPC::ChannelProxy* channel, 20 IPC::ChannelProxy* channel,
20 net::HostResolver* host_resolver, 21 net::HostResolver* host_resolver,
21 int render_process_id, 22 int render_process_id,
22 int render_view_id) { 23 int render_view_id) {
23 BrowserPpapiHostImpl* browser_ppapi_host = 24 BrowserPpapiHostImpl* browser_ppapi_host =
24 new BrowserPpapiHostImpl(sender, permissions); 25 new BrowserPpapiHostImpl(sender, permissions);
25 browser_ppapi_host->set_plugin_process_handle(plugin_child_process); 26 browser_ppapi_host->set_plugin_process_handle(plugin_child_process);
26 27
27 channel->AddFilter( 28 channel->AddFilter(
28 new PepperMessageFilter(PepperMessageFilter::NACL, 29 new PepperMessageFilter(PepperMessageFilter::NACL,
29 permissions, 30 permissions,
30 host_resolver, 31 host_resolver,
31 render_process_id, 32 render_process_id,
32 render_view_id)); 33 render_view_id));
34 channel->AddFilter(new TraceMessageFilter());
33 35
34 return browser_ppapi_host; 36 return browser_ppapi_host;
35 } 37 }
36 38
37 BrowserPpapiHostImpl::BrowserPpapiHostImpl( 39 BrowserPpapiHostImpl::BrowserPpapiHostImpl(
38 IPC::Sender* sender, 40 IPC::Sender* sender,
39 const ppapi::PpapiPermissions& permissions) 41 const ppapi::PpapiPermissions& permissions)
40 : ppapi_host_(sender, permissions), 42 : ppapi_host_(sender, permissions),
41 plugin_process_handle_(base::kNullProcessHandle) { 43 plugin_process_handle_(base::kNullProcessHandle) {
42 message_filter_ = new HostMessageFilter(&ppapi_host_); 44 message_filter_ = new HostMessageFilter(&ppapi_host_);
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
115 */ 117 */
116 return ppapi_host_->OnMessageReceived(msg); 118 return ppapi_host_->OnMessageReceived(msg);
117 } 119 }
118 120
119 void BrowserPpapiHostImpl::HostMessageFilter::OnHostDestroyed() { 121 void BrowserPpapiHostImpl::HostMessageFilter::OnHostDestroyed() {
120 DCHECK(ppapi_host_); 122 DCHECK(ppapi_host_);
121 ppapi_host_ = NULL; 123 ppapi_host_ = NULL;
122 } 124 }
123 125
124 } // namespace content 126 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698