diff options
author | acleung@chromium.org <acleung@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-19 08:39:34 +0000 |
---|---|---|
committer | acleung@chromium.org <acleung@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-19 08:39:34 +0000 |
commit | 6b690321a66755514353d3875d073d9244d6ef8f (patch) | |
tree | 750a60346e795fcc5c5a8c503d3d63d884204714 | |
parent | c6cfa8b62780f5471bbbb4971d4f1b7cd3cf1c51 (diff) | |
download | chromium_src-6b690321a66755514353d3875d073d9244d6ef8f.zip chromium_src-6b690321a66755514353d3875d073d9244d6ef8f.tar.gz chromium_src-6b690321a66755514353d3875d073d9244d6ef8f.tar.bz2 |
Removes duplicated entries in about:profiler for Android
BUG=259572
Review URL: https://chromiumcodereview.appspot.com/19496002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@212545 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r-- | content/browser/profiler_controller_impl.cc | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/content/browser/profiler_controller_impl.cc b/content/browser/profiler_controller_impl.cc index 00088ce..14c2f38 100644 --- a/content/browser/profiler_controller_impl.cc +++ b/content/browser/profiler_controller_impl.cc @@ -5,6 +5,7 @@ #include "content/browser/profiler_controller_impl.h" #include "base/bind.h" +#include "base/command_line.h" #include "base/tracked_objects.h" #include "content/common/child_process_messages.h" #include "content/public/browser/browser_child_process_host_iterator.h" @@ -12,6 +13,7 @@ #include "content/public/browser/child_process_data.h" #include "content/public/browser/profiler_subscriber.h" #include "content/public/browser/render_process_host.h" +#include "content/public/common/content_switches.h" namespace content { @@ -76,6 +78,13 @@ void ProfilerControllerImpl::GetProfilerDataFromChildProcesses( int pending_processes = 0; for (BrowserChildProcessHostIterator iter; !iter.Done(); ++iter) { + // Skips requesting profiler data from the "GPU Process" if we are using in + // process GPU. Those stats should be in the Browser-process's GPU thread. + if (iter.GetData().process_type == PROCESS_TYPE_GPU && + CommandLine::ForCurrentProcess()->HasSwitch(switches::kInProcessGPU)) { + continue; + } + ++pending_processes; if (!iter.Send(new ChildProcessMsg_GetChildProfilerData(sequence_number))) --pending_processes; |