summaryrefslogtreecommitdiffstats
path: root/webkit/glue/webkitclient_impl.cc
diff options
context:
space:
mode:
authorthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-18 22:48:19 +0000
committerthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-18 22:48:19 +0000
commit14620b39945285390b90a0d84cae39c677ce18aa (patch)
tree93b5966947f6c9e04632decdd88d8d480c36b6bd /webkit/glue/webkitclient_impl.cc
parenta8c8b34888746435dfe73ff529aaf3b1d9ace3e3 (diff)
downloadchromium_src-14620b39945285390b90a0d84cae39c677ce18aa.zip
chromium_src-14620b39945285390b90a0d84cae39c677ce18aa.tar.gz
chromium_src-14620b39945285390b90a0d84cae39c677ce18aa.tar.bz2
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 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@34994 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/webkitclient_impl.cc')
-rw-r--r--webkit/glue/webkitclient_impl.cc7
1 files changed, 7 insertions, 0 deletions
diff --git a/webkit/glue/webkitclient_impl.cc b/webkit/glue/webkitclient_impl.cc
index 340a28c..c7673cf 100644
--- a/webkit/glue/webkitclient_impl.cc
+++ b/webkit/glue/webkitclient_impl.cc
@@ -318,7 +318,14 @@ 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;
}