summaryrefslogtreecommitdiffstats
path: root/webkit/glue
diff options
context:
space:
mode:
authoralph@chromium.org <alph@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-04 16:11:03 +0000
committeralph@chromium.org <alph@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-04 16:11:03 +0000
commit2af28f2bd9354b636207dc0388553b830dc9957e (patch)
treebc4d3abfb805b441376373f6cb03d5f3b67fbb1e /webkit/glue
parent6e2c9c8323e9ac4414b6bc04afbc22fb96cafa14 (diff)
downloadchromium_src-2af28f2bd9354b636207dc0388553b830dc9957e.zip
chromium_src-2af28f2bd9354b636207dc0388553b830dc9957e.tar.gz
chromium_src-2af28f2bd9354b636207dc0388553b830dc9957e.tar.bz2
Retrieve renderer process memory sizes from browser via IPC.
The patch implements requestProcessMemorySizes function from Platform support WebKit interface. It requests renderer process memory sizes information from a browser via IPC as long as direct request is not possible due to sandbox restrictions. BUG=162467 Review URL: https://chromiumcodereview.appspot.com/11860007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@180417 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue')
-rw-r--r--webkit/glue/webkitplatformsupport_impl.cc20
-rw-r--r--webkit/glue/webkitplatformsupport_impl.h2
2 files changed, 0 insertions, 22 deletions
diff --git a/webkit/glue/webkitplatformsupport_impl.cc b/webkit/glue/webkitplatformsupport_impl.cc
index 409d700..1eb30e2 100644
--- a/webkit/glue/webkitplatformsupport_impl.cc
+++ b/webkit/glue/webkitplatformsupport_impl.cc
@@ -816,20 +816,6 @@ WebKit::WebString WebKitPlatformSupportImpl::signedPublicKeyAndChallengeString(
return WebKit::WebString("");
}
-static scoped_ptr<base::ProcessMetrics> CurrentProcessMetrics() {
- using base::ProcessMetrics;
-#if defined(OS_MACOSX)
- return scoped_ptr<ProcessMetrics>(
- // The default port provider is sufficient to get data for the current
- // process.
- ProcessMetrics::CreateProcessMetrics(base::GetCurrentProcessHandle(),
- NULL));
-#else
- return scoped_ptr<ProcessMetrics>(
- ProcessMetrics::CreateProcessMetrics(base::GetCurrentProcessHandle()));
-#endif
-}
-
static size_t getMemoryUsageMB(bool bypass_cache) {
size_t current_mem_usage = 0;
MemoryUsageCache* mem_usage_cache_singleton = MemoryUsageCache::GetInstance();
@@ -873,12 +859,6 @@ size_t WebKitPlatformSupportImpl::highUsageDeltaMB() {
}
#endif
-bool WebKitPlatformSupportImpl::processMemorySizesInBytes(
- size_t* private_bytes,
- size_t* shared_bytes) {
- return CurrentProcessMetrics()->GetMemoryBytes(private_bytes, shared_bytes);
-}
-
bool WebKitPlatformSupportImpl::memoryAllocatorWasteInBytes(size_t* size) {
return base::allocator::GetAllocatorWasteSize(size);
}
diff --git a/webkit/glue/webkitplatformsupport_impl.h b/webkit/glue/webkitplatformsupport_impl.h
index 8d928ba..c466dcb 100644
--- a/webkit/glue/webkitplatformsupport_impl.h
+++ b/webkit/glue/webkitplatformsupport_impl.h
@@ -68,8 +68,6 @@ class WEBKIT_GLUE_EXPORT WebKitPlatformSupportImpl :
virtual size_t highMemoryUsageMB() OVERRIDE;
virtual size_t highUsageDeltaMB() OVERRIDE;
#endif
- virtual bool processMemorySizesInBytes(size_t* private_bytes,
- size_t* shared_bytes);
virtual bool memoryAllocatorWasteInBytes(size_t* size);
virtual WebKit::WebURLLoader* createURLLoader();
virtual WebKit::WebSocketStreamHandle* createSocketStreamHandle();