diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-19 01:31:03 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-19 01:31:03 +0000 |
| commit | 0d525036512529fc73287726ac65649040672f86 (patch) | |
| tree | c7228937ed591491d541b76aee909ee3090fb1db /webkit | |
| parent | 27f2b6626e1c0e71d8b8e5d20e017beee762d7d6 (diff) | |
| download | chromium_src-0d525036512529fc73287726ac65649040672f86.zip chromium_src-0d525036512529fc73287726ac65649040672f86.tar.gz chromium_src-0d525036512529fc73287726ac65649040672f86.tar.bz2 | |
Revert 34994, maybe it regressed startup perf - Fix cpu/memory measurements on OS X.
Right now, this only works for the current process; support for child processes will be added in a later CL.
BUG=13156,25454
TEST=Hook up task manager (connect menu item to commandDispatch:, give it the right tag). Stats for the browser process should now be right, and %cpu should be 0 (for now) for all other processes.
Review URL: http://codereview.chromium.org/500118
TBR=thakis@chromium.org
Review URL: http://codereview.chromium.org/504068
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@35025 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/glue/webkitclient_impl.cc | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/webkit/glue/webkitclient_impl.cc b/webkit/glue/webkitclient_impl.cc index c7673cf..340a28c 100644 --- a/webkit/glue/webkitclient_impl.cc +++ b/webkit/glue/webkitclient_impl.cc @@ -318,14 +318,7 @@ WebKit::WebString WebKitClientImpl::signedPublicKeyAndChallengeString( size_t WebKitClientImpl::memoryUsageMB() { using base::ProcessMetrics; static ProcessMetrics* process_metrics = -#if !defined(OS_MACOSX) ProcessMetrics::CreateProcessMetrics(base::GetCurrentProcessHandle()); -#else - // The default port provider is sufficient to get data for the current - // process. - ProcessMetrics::CreateProcessMetrics(base::GetCurrentProcessHandle(), - NULL); -#endif DCHECK(process_metrics); return process_metrics->GetPagefileUsage() >> 20; } |