Changeset 133174 in webkit

Timestamp:

Nov 1, 2012 8:16:25 AM (11 years ago)

Author:

commit-queue@webkit.org

Message:

Web Inspector: make component subitems use parent color in native memory snapshots.
​https://bugs.webkit.org/show_bug.cgi?id=100876

A component subitems use the color of the component itself if the color
is not explicitly specified for the subitem.

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

• inspector/front-end/NativeMemorySnapshotView.js:

(WebInspector.NativeSnapshotNode.prototype._createSizeCell):
(WebInspector.MemoryBlockViewProperties._initialize):
(WebInspector.MemoryBlockViewProperties._forMemoryBlock):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/front-end/NativeMemorySnapshotView.js (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-11-01  Alexei Filippov  <alph@chromium.org>
+
+        Web Inspector: make component subitems use parent color in native memory snapshots.
+        https://bugs.webkit.org/show_bug.cgi?id=100876
+
+        A component subitems use the color of the component itself if the color
+        is not explicitly specified for the subitem.
+
+        Reviewed by Yury Semikhatsky.
+
+        * inspector/front-end/NativeMemorySnapshotView.js:
+        (WebInspector.NativeSnapshotNode.prototype._createSizeCell):
+        (WebInspector.MemoryBlockViewProperties._initialize):
+        (WebInspector.MemoryBlockViewProperties._forMemoryBlock):
+
 2012-11-01  Emil A Eklund  <eae@chromium.org>
 

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

@@ -107 +107 @@
     _createSizeCell: function(columnIdentifier)
     {
-        var viewProperties = WebInspector.MemoryBlockViewProperties._forMemoryBlock(this._nodeData);
+        var cell = this;
+        var viewProperties = null;
+        while (!viewProperties || viewProperties._fillStyle === "inherit") {
+            viewProperties = WebInspector.MemoryBlockViewProperties._forMemoryBlock(cell._nodeData);
+            cell = cell.parent;
+        }
+
         var sizeKiB = this._nodeData.size / 1024;
         var totalSize = this._profile.size;
@@ -312 +318 @@
     addBlock("hsl(220, 80%,  70%)", "Page", "Page structures");
     addBlock("hsl(100, 60%,  50%)", "JSHeap", "JavaScript heap");
-    addBlock("hsl(100, 80%,  80%)", "JSHeap.Used", "Used 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(  0, 80%,  60%)", "WebInspector", "Inspector data");
-    addBlock("hsl( 30, 80%,  80%)", "MemoryCache", "Memory cache resources");
+    addBlock("hsl( 36, 90%,  50%)", "MemoryCache", "Memory cache 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");
-    addBlock("hsl( 60, 80%,  60%)", "RenderTree.Used", "Render tree used");
 }
 
@@ -330 +334 @@
     if (result)
         return result;
-    return new WebInspector.MemoryBlockViewProperties("rgba(128, 128, 128, 0.8)", memoryBlock.name, memoryBlock.name);
+    return new WebInspector.MemoryBlockViewProperties("inherit", memoryBlock.name, memoryBlock.name);
 }