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

Unified Diff: webkit/glue/webkit_glue.cc

Issue 20003004: reland crrev.com/212927 Move webkitplatformsupport_impl and related from glue to child (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase & allocator dep for components_unittests in shared_library2 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 | « webkit/glue/webkit_glue.h ('k') | webkit/glue/webkit_glue.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/glue/webkit_glue.cc
diff --git a/webkit/glue/webkit_glue.cc b/webkit/glue/webkit_glue.cc
index 2ef0e5755b8f7736692ec82c60e64bbc3f30d11f..4c832f35ff81639f297b41573ef4ac833dfd335d 100644
--- a/webkit/glue/webkit_glue.cc
+++ b/webkit/glue/webkit_glue.cc
@@ -89,39 +89,4 @@ int GetGlyphPageCount() {
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 | « webkit/glue/webkit_glue.h ('k') | webkit/glue/webkit_glue.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698