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

Unified Diff: trunk/src/webkit/glue/webkit_glue.cc

Issue 19888003: Revert 212927 "Move webkitplatformsupport_impl and related from ..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 5 months 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
« no previous file with comments | « trunk/src/webkit/glue/webkit_glue.h ('k') | trunk/src/webkit/glue/webkit_glue.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/webkit/glue/webkit_glue.cc
===================================================================
--- trunk/src/webkit/glue/webkit_glue.cc (revision 212931)
+++ trunk/src/webkit/glue/webkit_glue.cc (working copy)
@@ -89,4 +89,39 @@
COMPILE_ASSERT(std::numeric_limits<double>::has_quiet_NaN, has_quiet_NaN);
+#if defined(OS_LINUX) || defined(OS_ANDROID)
+size_t MemoryUsageKB() {
+ struct mallinfo minfo = mallinfo();
+ uint64_t mem_usage =
+#if defined(USE_TCMALLOC)
+ minfo.uordblks
+#else
+ (minfo.hblkhd + minfo.arena)
+#endif
+ >> 10;
+
+ v8::HeapStatistics stat;
+ // TODO(svenpanne) The call below doesn't take web workers into account, this
+ // has to be done manually by iterating over all Isolates involved.
+ v8::Isolate::GetCurrent()->GetHeapStatistics(&stat);
+ return mem_usage + (static_cast<uint64_t>(stat.total_heap_size()) >> 10);
+}
+#elif defined(OS_MACOSX)
+size_t MemoryUsageKB() {
+ scoped_ptr<base::ProcessMetrics> process_metrics(
+ // The default port provider is sufficient to get data for the current
+ // process.
+ base::ProcessMetrics::CreateProcessMetrics(
+ base::GetCurrentProcessHandle(), NULL));
+ return process_metrics->GetWorkingSetSize() >> 10;
+}
+#else
+size_t MemoryUsageKB() {
+ scoped_ptr<base::ProcessMetrics> process_metrics(
+ base::ProcessMetrics::CreateProcessMetrics(
+ base::GetCurrentProcessHandle()));
+ return process_metrics->GetPagefileUsage() >> 10;
+}
+#endif
+
} // namespace webkit_glue
« no previous file with comments | « trunk/src/webkit/glue/webkit_glue.h ('k') | trunk/src/webkit/glue/webkit_glue.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698