summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authorrmcilroy@chromium.org <rmcilroy@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-05 16:58:48 +0000
committerrmcilroy@chromium.org <rmcilroy@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-05 16:58:48 +0000
commitb684d61182ea88a03f1310d2c47ec2b1649d3baf (patch)
treed49b002f3c2dbb1074632b7df3ea18bf901830ff /webkit
parentb5e116e40078306a943dd0cfb02fcd98225cb081 (diff)
downloadchromium_src-b684d61182ea88a03f1310d2c47ec2b1649d3baf.zip
chromium_src-b684d61182ea88a03f1310d2c47ec2b1649d3baf.tar.gz
chromium_src-b684d61182ea88a03f1310d2c47ec2b1649d3baf.tar.bz2
Add Platform::physicalMemoryInBytes to WebKitPlatformSupportImpl.
BUG=312241 Review URL: https://codereview.chromium.org/50903003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@233005 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/child/webkitplatformsupport_impl.cc4
-rw-r--r--webkit/child/webkitplatformsupport_impl.h1
2 files changed, 5 insertions, 0 deletions
diff --git a/webkit/child/webkitplatformsupport_impl.cc b/webkit/child/webkitplatformsupport_impl.cc
index 8f68c3a..9bdcd25 100644
--- a/webkit/child/webkitplatformsupport_impl.cc
+++ b/webkit/child/webkitplatformsupport_impl.cc
@@ -859,6 +859,10 @@ size_t WebKitPlatformSupportImpl::actualMemoryUsageMB() {
return getMemoryUsageMB(true);
}
+size_t WebKitPlatformSupportImpl::physicalMemoryMB() {
+ return static_cast<size_t>(base::SysInfo::AmountOfPhysicalMemoryMB());
+}
+
void WebKitPlatformSupportImpl::startHeapProfiling(
const WebKit::WebString& prefix) {
// FIXME(morrita): Make this built on windows.
diff --git a/webkit/child/webkitplatformsupport_impl.h b/webkit/child/webkitplatformsupport_impl.h
index 66e4759..566b41e 100644
--- a/webkit/child/webkitplatformsupport_impl.h
+++ b/webkit/child/webkitplatformsupport_impl.h
@@ -49,6 +49,7 @@ class WEBKIT_CHILD_EXPORT WebKitPlatformSupportImpl :
const WebKit::WebURL& url);
virtual size_t memoryUsageMB();
virtual size_t actualMemoryUsageMB();
+ virtual size_t physicalMemoryMB();
virtual void startHeapProfiling(const WebKit::WebString& prefix);
virtual void stopHeapProfiling() OVERRIDE;