auto import from //depot/cupcake/@136594

1 files changed, 25 insertions, 5 deletions

diff --git a/WebKit/mac/Misc/WebCoreStatistics.mm b/WebKit/mac/Misc/WebCoreStatistics.mm
index ecbfe9d..05c2659 100644
--- a/WebKit/mac/Misc/WebCoreStatistics.mm
+++ b/WebKit/mac/Misc/WebCoreStatistics.mm
@@ -54,7 +54,7 @@ using namespace WebCore;
 + (size_t)javaScriptObjectsCount
 {
     JSLock lock(false);
-    return JSDOMWindow::commonJSGlobalData()->heap.size();
+    return JSDOMWindow::commonJSGlobalData()->heap.objectCount();
 }
 
 + (size_t)javaScriptGlobalObjectsCount
@@ -122,17 +122,17 @@ using namespace WebCore;
 
 + (size_t)cachedFontDataCount
 {
-    return FontCache::fontDataCount();
+    return fontCache()->fontDataCount();
 }
 
 + (size_t)cachedFontDataInactiveCount
 {
-    return FontCache::inactiveFontDataCount();
+    return fontCache()->inactiveFontDataCount();
 }
 
 + (void)purgeInactiveFontData
 {
-    FontCache::purgeInactiveFontData();
+    fontCache()->purgeInactiveFontData();
 }
 
 + (size_t)glyphPageCount
@@ -167,11 +167,31 @@ using namespace WebCore;
     WebCore::Node::startIgnoringLeaks();
 }
 
-+ (void)stopIgnoringWebCoreNodeLeaks;
++ (void)stopIgnoringWebCoreNodeLeaks
 {
     WebCore::Node::stopIgnoringLeaks();
 }
 
++ (NSDictionary *)memoryStatistics
+{
+    WTF::FastMallocStatistics fastMallocStatistics = WTF::fastMallocStatistics();
+    JSLock lock(false);
+    Heap::Statistics jsHeapStatistics = JSDOMWindow::commonJSGlobalData()->heap.statistics();
+    return [NSDictionary dictionaryWithObjectsAndKeys:
+                [NSNumber numberWithInt:fastMallocStatistics.heapSize], @"FastMallocHeapSize",
+                [NSNumber numberWithInt:fastMallocStatistics.freeSizeInHeap], @"FastMallocFreeSizeInHeap",
+                [NSNumber numberWithInt:fastMallocStatistics.freeSizeInCaches], @"FastMallocFreeSizeInCaches",
+                [NSNumber numberWithInt:fastMallocStatistics.returnedSize], @"FastMallocReturnedSize",
+                [NSNumber numberWithInt:jsHeapStatistics.size], @"JavaScriptHeapSize",
+                [NSNumber numberWithInt:jsHeapStatistics.free], @"JavaScriptFreeSize",
+            nil];
+}
+
++ (void)returnFreeMemoryToSystem
+{
+    WTF::releaseFastMallocFreeMemory();
+}
+
 // Deprecated
 + (size_t)javaScriptNoGCAllowedObjectsCount
 {