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

Unified Diff: webkit/glue/webkitclient_impl.cc

Issue 500118: Fix cpu/memory measurements on OS X. (Closed)
Patch Set: foobar Created 11 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 side-by-side diff with in-line comments
Download patch
« base/process_util_mac.mm ('K') | « chrome/test/chrome_process_util.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/glue/webkitclient_impl.cc
diff --git a/webkit/glue/webkitclient_impl.cc b/webkit/glue/webkitclient_impl.cc
index 340a28ca2f88a2b45d68e7795151f4557172b8cb..c7673cf1c322736dab153aa6be3970638930dde1 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;
}
« base/process_util_mac.mm ('K') | « chrome/test/chrome_process_util.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698