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

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

Issue 1173263004: [tracing] Send unique tracing process id for cross-process memory dumps identification. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixing DCHECK while setting id. Created 5 years, 6 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 unified diff | Download patch
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 6
7 #include "base/metrics/sparse_histogram.h" 7 #include "base/metrics/sparse_histogram.h"
8 #include "content/browser/renderer_host/pepper/pepper_message_filter.h" 8 #include "content/browser/renderer_host/pepper/pepper_message_filter.h"
9 #include "content/browser/tracing/trace_message_filter.h" 9 #include "content/browser/tracing/trace_message_filter.h"
10 #include "content/common/pepper_renderer_instance_data.h" 10 #include "content/common/pepper_renderer_instance_data.h"
(...skipping 21 matching lines...) Expand all
32 profile_directory, 32 profile_directory,
33 false /* in_process */, 33 false /* in_process */,
34 true /* external_plugin */); 34 true /* external_plugin */);
35 browser_ppapi_host->set_plugin_process( 35 browser_ppapi_host->set_plugin_process(
36 base::Process::DeprecatedGetProcessFromHandle(plugin_child_process)); 36 base::Process::DeprecatedGetProcessFromHandle(plugin_child_process));
37 37
38 scoped_refptr<PepperMessageFilter> pepper_message_filter( 38 scoped_refptr<PepperMessageFilter> pepper_message_filter(
39 new PepperMessageFilter()); 39 new PepperMessageFilter());
40 channel->AddFilter(pepper_message_filter->GetFilter()); 40 channel->AddFilter(pepper_message_filter->GetFilter());
41 channel->AddFilter(browser_ppapi_host->message_filter().get()); 41 channel->AddFilter(browser_ppapi_host->message_filter().get());
42 channel->AddFilter((new TraceMessageFilter())->GetFilter()); 42 channel->AddFilter((new TraceMessageFilter(render_process_id))->GetFilter());
43 43
44 return browser_ppapi_host; 44 return browser_ppapi_host;
45 } 45 }
46 46
47 BrowserPpapiHostImpl::BrowserPpapiHostImpl( 47 BrowserPpapiHostImpl::BrowserPpapiHostImpl(
48 IPC::Sender* sender, 48 IPC::Sender* sender,
49 const ppapi::PpapiPermissions& permissions, 49 const ppapi::PpapiPermissions& permissions,
50 const std::string& plugin_name, 50 const std::string& plugin_name,
51 const base::FilePath& plugin_path, 51 const base::FilePath& plugin_path,
52 const base::FilePath& profile_data_directory, 52 const base::FilePath& profile_data_directory,
(...skipping 211 matching lines...) Expand 10 before | Expand all | Expand 10 after
264 instance->second->renderer_data.render_frame_id; 264 instance->second->renderer_data.render_frame_id;
265 instance_data[i].document_url = 265 instance_data[i].document_url =
266 instance->second->renderer_data.document_url; 266 instance->second->renderer_data.document_url;
267 ++instance; 267 ++instance;
268 ++i; 268 ++i;
269 } 269 }
270 on_keepalive_callback_.Run(instance_data, profile_data_directory_); 270 on_keepalive_callback_.Run(instance_data, profile_data_directory_);
271 } 271 }
272 272
273 } // namespace content 273 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698