Web Inspector: reduce number of native memory instrumentation categories
authoryurys@chromium.org <yurys@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 7 Feb 2013 09:09:22 +0000 (09:09 +0000)
committeryurys@chromium.org <yurys@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 7 Feb 2013 09:09:22 +0000 (09:09 +0000)
https://bugs.webkit.org/show_bug.cgi?id=109146

Reviewed by Pavel Feldman.

Merged some of memory instrumentation categories.

* dom/WebCoreMemoryInstrumentation.cpp:
(WebCore):
* inspector/front-end/NativeMemorySnapshotView.js:
(WebInspector.MemoryBlockViewProperties._initialize):
* platform/PlatformMemoryInstrumentation.cpp:
(WebCore):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@142081 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog
Source/WebCore/dom/WebCoreMemoryInstrumentation.cpp
Source/WebCore/inspector/front-end/NativeMemorySnapshotView.js
Source/WebCore/platform/PlatformMemoryInstrumentation.cpp

index 109b6d9..fdb4f89 100644 (file)
@@ -1,3 +1,19 @@
+2013-02-07  Yury Semikhatsky  <yurys@chromium.org>
+
+        Web Inspector: reduce number of native memory instrumentation categories
+        https://bugs.webkit.org/show_bug.cgi?id=109146
+
+        Reviewed by Pavel Feldman.
+
+        Merged some of memory instrumentation categories.
+
+        * dom/WebCoreMemoryInstrumentation.cpp:
+        (WebCore):
+        * inspector/front-end/NativeMemorySnapshotView.js:
+        (WebInspector.MemoryBlockViewProperties._initialize):
+        * platform/PlatformMemoryInstrumentation.cpp:
+        (WebCore):
+
 2013-02-04  Kentaro Hara  <haraken@chromium.org>
 
         [V8] Remove V8GCController::m_edenNodes and make minor DOM GC more precise
index 0cb5f70..41593ea 100644 (file)
 
 namespace WebCore {
 
-MemoryObjectType WebCoreMemoryTypes::Page = "Page";
-MemoryObjectType WebCoreMemoryTypes::DOM = "Page.DOM";
-MemoryObjectType WebCoreMemoryTypes::CSS = "Page.CSS";
-MemoryObjectType WebCoreMemoryTypes::Binding = "Page.Binding";
-MemoryObjectType WebCoreMemoryTypes::RenderingStructures = "Page.Rendering.Structures";
+MemoryObjectType WebCoreMemoryTypes::Page = "DOM";
+MemoryObjectType WebCoreMemoryTypes::DOM = "DOM";
+MemoryObjectType WebCoreMemoryTypes::CSS = "CSS";
+MemoryObjectType WebCoreMemoryTypes::Binding = "DOM";
+MemoryObjectType WebCoreMemoryTypes::RenderingStructures = "Rendering";
 
-MemoryObjectType WebCoreMemoryTypes::MemoryCacheStructures = "MemoryCache.InternalStructures";
-MemoryObjectType WebCoreMemoryTypes::CachedResource = "MemoryCache.Resource";
-MemoryObjectType WebCoreMemoryTypes::CachedResourceRaw = "MemoryCache.RawResource";
-MemoryObjectType WebCoreMemoryTypes::CachedResourceCSS = "MemoryCache.CSS";
-MemoryObjectType WebCoreMemoryTypes::CachedResourceFont = "MemoryCache.Font";
-MemoryObjectType WebCoreMemoryTypes::CachedResourceImage = "MemoryCache.Image";
-MemoryObjectType WebCoreMemoryTypes::CachedResourceScript = "MemoryCache.Script";
-MemoryObjectType WebCoreMemoryTypes::CachedResourceSVG = "MemoryCache.SVG";
-MemoryObjectType WebCoreMemoryTypes::CachedResourceShader = "MemoryCache.Shader";
-MemoryObjectType WebCoreMemoryTypes::CachedResourceXSLT = "MemoryCache.XSLT";
+MemoryObjectType WebCoreMemoryTypes::MemoryCacheStructures = "Resources";
+MemoryObjectType WebCoreMemoryTypes::CachedResource = "Resources";
+MemoryObjectType WebCoreMemoryTypes::CachedResourceRaw = "Resources";
+MemoryObjectType WebCoreMemoryTypes::CachedResourceCSS = "Resources";
+MemoryObjectType WebCoreMemoryTypes::CachedResourceFont = "Resources";
+MemoryObjectType WebCoreMemoryTypes::CachedResourceImage = "Resources";
+MemoryObjectType WebCoreMemoryTypes::CachedResourceScript = "Resources";
+MemoryObjectType WebCoreMemoryTypes::CachedResourceSVG = "Resources";
+MemoryObjectType WebCoreMemoryTypes::CachedResourceShader = "Resources";
+MemoryObjectType WebCoreMemoryTypes::CachedResourceXSLT = "Resources";
 
-MemoryObjectType WebCoreMemoryTypes::ExternalStrings = "JSExternalResources.Strings";
-MemoryObjectType WebCoreMemoryTypes::ExternalArrays = "JSExternalResources.Arrays";
+MemoryObjectType WebCoreMemoryTypes::ExternalStrings = "JSExternalResources";
+MemoryObjectType WebCoreMemoryTypes::ExternalArrays = "JSExternalResources";
 
 MemoryObjectType WebCoreMemoryTypes::Inspector = "WebInspector";
-MemoryObjectType WebCoreMemoryTypes::InspectorController = "WebInspector.Controller";
-MemoryObjectType WebCoreMemoryTypes::InspectorMemoryAgent = "WebInspector.MemoryAgent";
-MemoryObjectType WebCoreMemoryTypes::InspectorDOMStorageAgent = "WebInspector.DOMStorageAgent";
-MemoryObjectType WebCoreMemoryTypes::InspectorDOMStorageResources = "WebInspector.DOMStorageAgent.Resources";
-MemoryObjectType WebCoreMemoryTypes::InspectorOverlay = "WebInspector.Overlay";
-MemoryObjectType WebCoreMemoryTypes::InspectorProfilerAgent = "WebInspector.ProfilerAgent";
-MemoryObjectType WebCoreMemoryTypes::InspectorDebuggerAgent = "WebInspector.DebuggerAgent";
-MemoryObjectType WebCoreMemoryTypes::InspectorResourceAgent = "WebInspector.ResourceAgent";
+MemoryObjectType WebCoreMemoryTypes::InspectorController = "WebInspector";
+MemoryObjectType WebCoreMemoryTypes::InspectorMemoryAgent = "WebInspector";
+MemoryObjectType WebCoreMemoryTypes::InspectorDOMStorageAgent = "WebInspector";
+MemoryObjectType WebCoreMemoryTypes::InspectorDOMStorageResources = "WebInspector";
+MemoryObjectType WebCoreMemoryTypes::InspectorOverlay = "WebInspector";
+MemoryObjectType WebCoreMemoryTypes::InspectorProfilerAgent = "WebInspector";
+MemoryObjectType WebCoreMemoryTypes::InspectorDebuggerAgent = "WebInspector";
+MemoryObjectType WebCoreMemoryTypes::InspectorResourceAgent = "WebInspector";
 
 MemoryObjectType WebCoreMemoryTypes::JSHeapUsed = "JSHeap.Used";
 MemoryObjectType WebCoreMemoryTypes::JSHeapUnused = "JSHeap.Unused";
 
 MemoryObjectType WebCoreMemoryTypes::DOMStorageCache = "DOMStorageCache";
 
-MemoryObjectType WebCoreMemoryTypes::RenderTreeUsed = "RenderTree.Used";
-MemoryObjectType WebCoreMemoryTypes::RenderTreeUnused = "RenderTree.Unused";
+MemoryObjectType WebCoreMemoryTypes::RenderTreeUsed = "RenderTree";
+MemoryObjectType WebCoreMemoryTypes::RenderTreeUnused = "RenderTree";
 
 MemoryObjectType WebCoreMemoryTypes::ProcessPrivateMemory = "ProcessPrivateMemory";
 
index e485778..122a712 100644 (file)
@@ -628,13 +628,13 @@ WebInspector.MemoryBlockViewProperties._initialize = function()
     addBlock("hsl(  0,  0%,  60%)", "ProcessPrivateMemory", "Total");
     addBlock("hsl(  0,  0%,  80%)", "OwnersTypePlaceholder", "OwnersTypePlaceholder");
     addBlock("hsl(  0,  0%,  60%)", "Other", "Other");
-    addBlock("hsl(220, 80%,  70%)", "Page", "Page structures");
+    addBlock("hsl(220, 80%,  70%)", "Image", "Images");
     addBlock("hsl(100, 60%,  50%)", "JSHeap", "JavaScript heap");
     addBlock("hsl( 90, 40%,  80%)", "JSExternalResources", "JavaScript external resources");
-    addBlock("hsl( 90, 60%,  80%)", "JSExternalArrays", "JavaScript external arrays");
-    addBlock("hsl( 90, 60%,  80%)", "JSExternalStrings", "JavaScript external strings");
+    addBlock("hsl( 90, 60%,  80%)", "CSS", "CSS");
+    addBlock("hsl(  0, 50%,  60%)", "DOM", "DOM");
     addBlock("hsl(  0, 80%,  60%)", "WebInspector", "Inspector data");
-    addBlock("hsl( 36, 90%,  50%)", "MemoryCache", "Memory cache resources");
+    addBlock("hsl( 36, 90%,  50%)", "Resources", "Resources");
     addBlock("hsl( 40, 80%,  80%)", "GlyphCache", "Glyph cache resources");
     addBlock("hsl( 35, 80%,  80%)", "DOMStorageCache", "DOM storage cache");
     addBlock("hsl( 60, 80%,  60%)", "RenderTree", "Render tree");
index 73e5635..b8b2f19 100644 (file)
 
 namespace WebCore {
 
-MemoryObjectType PlatformMemoryTypes::Image = "Page.Image";
-MemoryObjectType PlatformMemoryTypes::Loader = "Page.Loader";
-MemoryObjectType PlatformMemoryTypes::Rendering = "Page.Rendering";
-MemoryObjectType PlatformMemoryTypes::Layers = "Page.Rendering.Layers";
+MemoryObjectType PlatformMemoryTypes::Image = "Image";
+MemoryObjectType PlatformMemoryTypes::Loader = "Resources";
+MemoryObjectType PlatformMemoryTypes::Rendering = "Rendering";
+MemoryObjectType PlatformMemoryTypes::Layers = "Rendering";
 
-MemoryObjectType PlatformMemoryTypes::Audio = "Page.Audio";
-MemoryObjectType PlatformMemoryTypes::AudioSharedData = "Page.Audio.SharedData";
+MemoryObjectType PlatformMemoryTypes::Audio = "Audio";
+MemoryObjectType PlatformMemoryTypes::AudioSharedData = "Audio";
 
 void PlatformMemoryInstrumentation::reportStaticMembersMemoryUsage(WTF::MemoryInstrumentation* memoryInstrumentation)
 {