Changeset 124315 in webkit

Timestamp:

Aug 1, 2012 2:19:25 AM (12 years ago)

Author:

commit-queue@webkit.org

Message:

Web Inspector: Add native memory used by GlyphCache to the snapshot
​https://bugs.webkit.org/show_bug.cgi?id=90615

Patch by Alexei Filippov <​alexeif@chromium.org> on 2012-08-01
Reviewed by Yury Semikhatsky.

Adds interface for reporting memory usage of platform specific
components.
Report memory usage of the font cache allocated by skia in chromium.

• inspector/InspectorMemoryAgent.cpp:

(WebCore::addPlatformComponentsInfo):
(WebCore):
(WebCore::InspectorMemoryAgent::getProcessMemoryDistribution):

• inspector/front-end/NativeMemorySnapshotView.js:

(WebInspector.MemoryBlockViewProperties._initialize):

• platform/MemoryUsageSupport.cpp:

(WebCore::MemoryUsageSupport::memoryUsageByComponents):
(WebCore):

• platform/MemoryUsageSupport.h:

(MemoryUsageSupport):
(ComponentInfo):
(WebCore::MemoryUsageSupport::ComponentInfo::ComponentInfo):

• platform/chromium/MemoryUsageSupportChromium.cpp:

(WebCore::MemoryUsageSupport::memoryUsageByComponents):
(WebCore):

• platform/qt/MemoryUsageSupportQt.cpp:

(WebCore::MemoryUsageSupport::memoryUsageByComponents):
(WebCore):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/InspectorMemoryAgent.cpp (modified) (2 diffs)
• inspector/front-end/NativeMemorySnapshotView.js (modified) (1 diff)
• platform/MemoryUsageSupport.cpp (modified) (1 diff)
• platform/MemoryUsageSupport.h (modified) (2 diffs)
• platform/chromium/MemoryUsageSupportChromium.cpp (modified) (2 diffs)
• platform/qt/MemoryUsageSupportQt.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-08-01  Alexei Filippov  <alexeif@chromium.org>
+
+        Web Inspector: Add native memory used by GlyphCache to the snapshot
+        https://bugs.webkit.org/show_bug.cgi?id=90615
+
+        Reviewed by Yury Semikhatsky.
+
+        Adds interface for reporting memory usage of platform specific
+        components.
+        Report memory usage of the font cache allocated by skia in chromium.
+
+        * inspector/InspectorMemoryAgent.cpp:
+        (WebCore::addPlatformComponentsInfo):
+        (WebCore):
+        (WebCore::InspectorMemoryAgent::getProcessMemoryDistribution):
+        * inspector/front-end/NativeMemorySnapshotView.js:
+        (WebInspector.MemoryBlockViewProperties._initialize):
+        * platform/MemoryUsageSupport.cpp:
+        (WebCore::MemoryUsageSupport::memoryUsageByComponents):
+        (WebCore):
+        * platform/MemoryUsageSupport.h:
+        (MemoryUsageSupport):
+        (ComponentInfo):
+        (WebCore::MemoryUsageSupport::ComponentInfo::ComponentInfo):
+        * platform/chromium/MemoryUsageSupportChromium.cpp:
+        (WebCore::MemoryUsageSupport::memoryUsageByComponents):
+        (WebCore):
+        * platform/qt/MemoryUsageSupportQt.cpp:
+        (WebCore::MemoryUsageSupport::memoryUsageByComponents):
+        (WebCore):
+
 2012-08-01  Yoshifumi Inoue  <yosin@chromium.org>
 

trunk/Source/WebCore/inspector/InspectorMemoryAgent.cpp

@@ -517 +517 @@
 }
 
+static void addPlatformComponentsInfo(PassRefPtr<TypeBuilder::Array<InspectorMemoryBlock> > children)
+{
+    Vector<MemoryUsageSupport::ComponentInfo> components;
+    MemoryUsageSupport::memoryUsageByComponents(components);
+    for (Vector<MemoryUsageSupport::ComponentInfo>::iterator it = components.begin(); it != components.end(); ++it) {
+        RefPtr<InspectorMemoryBlock> block = InspectorMemoryBlock::create().setName(it->m_name);
+        block->setSize(it->m_sizeInBytes);
+        children->addItem(block);
+    }
+}
+
 static PassRefPtr<InspectorMemoryBlock> memoryCacheInfo()
 {
@@ -574 +585 @@
     children->addItem(jsExternalResourcesInfo(visitedObjects));
     children->addItem(inspectorData.dumpStatistics());
+    addPlatformComponentsInfo(children);
     processMemory->setChildren(children);
 

trunk/Source/WebCore/inspector/front-end/NativeMemorySnapshotView.js

@@ -225 +225 @@
     addBlock("hsl(210, 60%,  80%)", "InspectorData", "Inspector data");
     addBlock("hsl( 30, 60%,  80%)", "MemoryCache", "Memory cache resources");
+    addBlock("hsl( 40, 60%,  80%)", "GlyphCache", "Glyph cache resources");
     addBlock("hsl( 60, 60%,  80%)", "RenderTreeAllocated", "Render tree");
     addBlock("hsl( 60, 60%,  80%)", "RenderTreeUsed", "Render tree used");

trunk/Source/WebCore/platform/MemoryUsageSupport.cpp

@@ -64 +64 @@
 }
 
+void MemoryUsageSupport::memoryUsageByComponents(Vector<ComponentInfo>&)
+{
+}
+
 } // namespace WebCore

trunk/Source/WebCore/platform/MemoryUsageSupport.h

@@ -32 +32 @@
 #define MemoryUsageSupport_h
 
+#include <wtf/Forward.h>
+#include <wtf/text/WTFString.h>
+
 namespace WebCore {
 
@@ -58 +61 @@
     // false on platform specific error conditions.
     static bool processMemorySizesInBytes(size_t* privateBytes, size_t* sharedBytes);
+
+    class ComponentInfo {
+    public:
+        ComponentInfo(const String& name, size_t size) : m_name(name), m_sizeInBytes(size) { }
+
+        const String m_name;
+        size_t m_sizeInBytes;
+    };
+
+    // Reports private memory used by components in bytes.
+    static void memoryUsageByComponents(Vector<ComponentInfo>&);
 };
 

trunk/Source/WebCore/platform/chromium/MemoryUsageSupportChromium.cpp

@@ -32 +32 @@
 #include "MemoryUsageSupport.h"
 
+#include <SkGraphics.h>
 #include <public/Platform.h>
 
@@ -66 +67 @@
 }
 
+void MemoryUsageSupport::memoryUsageByComponents(Vector<ComponentInfo>& components)
+{
+    size_t size = SkGraphics::GetFontCacheUsed();
+    components.append(ComponentInfo("GlyphCache", size));
+}
+
 } // namespace WebCore

trunk/Source/WebCore/platform/qt/MemoryUsageSupportQt.cpp

@@ -112 +112 @@
 }
 
+void MemoryUsageSupport::memoryUsageByComponents(Vector<ComponentInfo>&)
+{
+}
+
 } // namespace WebCore