Replace RenderArena with PartitionAlloc.

Source/core/inspector/InspectorMemoryAgent.cpp

 /*
  * Copyright (C) 2011 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 28 matching lines @@
 #include "core/inspector/BindingVisitors.h"
 #include "core/inspector/HeapGraphSerializer.h"
 #include "core/inspector/InspectorClient.h"
 #include "core/inspector/InspectorDOMStorageAgent.h"
 #include "core/inspector/InspectorValues.h"
 #include "core/inspector/MemoryInstrumentationImpl.h"
 #include "core/loader/cache/MemoryCache.h"
 #include "core/page/Frame.h"
 #include "core/page/Page.h"
 #include "core/platform/MemoryUsageSupport.h"
+#include "core/platform/Partitions.h"
 #include <wtf/ArrayBufferView.h>
 #include <wtf/HashSet.h>
 #include <wtf/MemoryInstrumentationArrayBufferView.h>
 #include <wtf/NonCopyingSort.h>
 #include <wtf/OwnPtr.h>
 #include <wtf/PassOwnPtr.h>
 #include <wtf/text/StringBuilder.h>
 #include <wtf/text/StringImpl.h>
 #include <wtf/text/WTFString.h>
 #include <wtf/Vector.h>
 
 // Use a type alias instead of 'using' here which would cause a conflict on Mac.
 typedef WebCore::TypeBuilder::Memory::MemoryBlock InspectorMemoryBlock;
 typedef WebCore::TypeBuilder::Array<InspectorMemoryBlock> InspectorMemoryBlocks;
 
 namespace WebCore {
 
 namespace {
 
 class MemoryUsageStatsGenerator {
 public:
     MemoryUsageStatsGenerator() { }
 
     void dump(const TypeNameToSizeMap& sizesMap, InspectorMemoryBlocks* children)
     {
         m_sizesMap = sizesMap;
 
         // FIXME: We filter out Rendering type because the coverage is not good enough at the moment
-        // and report RenderArena size instead.
+        // and report rendering partition size instead.
         for (TypeNameToSizeMap::iterator i = m_sizesMap.begin(); i != m_sizesMap.end(); ++i) {
             if (i->key == PlatformMemoryTypes::Rendering) {
                 m_sizesMap.remove(i);
                 break;
             }
         }
         Vector<String> objectTypes;
         objectTypes.appendRange(m_sizesMap.keys().begin(), m_sizesMap.keys().end());
 
         for (Vector<String>::const_iterator i = objectTypes.begin(); i != objectTypes.end(); ++i)
@@ skipping 106 matching lines @@
 
 static void reportJSHeapInfo(WTF::MemoryInstrumentationClient& memoryInstrumentationClient)
 {
     HeapInfo info;
     ScriptGCEvent::getHeapSize(info);
 
     memoryInstrumentationClient.countObjectSize(0, WebCoreMemoryTypes::JSHeapUsed, info.usedJSHeapSize);
     memoryInstrumentationClient.countObjectSize(0, WebCoreMemoryTypes::JSHeapUnused, info.totalJSHeapSize - info.usedJSHeapSize);
 }
 
-static void reportRenderTreeInfo(WTF::MemoryInstrumentationClient& memoryInstrumentationClient, Page* page)
+static void reportRenderTreeInfo(WTF::MemoryInstrumentationClient& memoryInstrumentationClient, Page*)
 {
-    ArenaSize arenaSize = page->renderTreeSize();
+    size_t renderTreeSize = 0;
+#if ENABLE(PARTITION_ALLOC)
+    renderTreeSize = partitionAllocGetUsedPagesSize(*Partitions::getRenderingPartition());
+#endif
 
-    memoryInstrumentationClient.countObjectSize(0, WebCoreMemoryTypes::RenderTreeUsed, arenaSize.treeSize);
-    memoryInstrumentationClient.countObjectSize(0, WebCoreMemoryTypes::RenderTreeUnused, arenaSize.allocated - arenaSize.treeSize);
+    memoryInstrumentationClient.countObjectSize(0, WebCoreMemoryTypes::RenderTreeUsed, renderTreeSize);
 }
 
 namespace {
 
 class DOMTreesIterator : public WrappedNodeVisitor {
 public:
     DOMTreesIterator(MemoryInstrumentationImpl& memoryInstrumentation, Page* page)
         : m_page(page)
         , m_memoryInstrumentation(memoryInstrumentation)
     {
@@ skipping 172 matching lines @@
     m_frontend = frontend->memory();
 }
 
 void InspectorMemoryAgent::clearFrontend()
 {
     m_frontend = 0;
 }
 
 } // namespace WebCore