From 5abb8606fa57c3ebfc8b3c3dbc3fa4a25d2ae306 Mon Sep 17 00:00:00 2001
From: Iain Merrick <husky@google.com>
Date: Mon, 13 Sep 2010 16:35:48 +0100
Subject: Merge WebKit at r67178 : Initial merge by git.

Change-Id: I57e01163b6866cb029cdadf405a0394a3918bc18
---
 WebCore/bindings/v8/V8GCController.cpp | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'WebCore/bindings/v8/V8GCController.cpp')

diff --git a/WebCore/bindings/v8/V8GCController.cpp b/WebCore/bindings/v8/V8GCController.cpp
index c27e1d5..36beece 100644
--- a/WebCore/bindings/v8/V8GCController.cpp
+++ b/WebCore/bindings/v8/V8GCController.cpp
@@ -406,6 +406,15 @@ int getMemoryUsageInMB()
 #endif
 }
 
+int getActualMemoryUsageInMB()
+{
+#if PLATFORM(CHROMIUM)
+    return ChromiumBridge::actualMemoryUsageMB();
+#else
+    return 0;
+#endif
+}
+
 }  // anonymous namespace
 
 void V8GCController::gcEpilogue()
@@ -417,7 +426,7 @@ void V8GCController::gcEpilogue()
     GCEpilogueVisitor epilogueVisitor;
     visitActiveDOMObjectsInCurrentThread(&epilogueVisitor);
 
-    workingSetEstimateMB = getMemoryUsageInMB();
+    workingSetEstimateMB = getActualMemoryUsageInMB();
 
 #ifndef NDEBUG
     // Check all survivals are weak.
-- 
cgit v1.1