Changeset 119386 in webkit

Timestamp:

Jun 4, 2012 5:02:24 AM (12 years ago)

Author:

loislo@chromium.org

Message:

Web Inspector: add unknown size to the memory pie-chart legend
​https://bugs.webkit.org/show_bug.cgi?id=88081

Patch by Yury Semikhatsky <​yurys@chromium.org> on 2012-06-04
Reviewed by Pavel Feldman.

Added "Unknown" part size to the memory pie-chart legend.

• inspector/front-end/NativeMemorySnapshotView.js:

(WebInspector.NativeMemoryProfileType.prototype.buttonClicked.didReceiveMemorySnapshot):
(WebInspector.NativeMemoryProfileType.prototype.buttonClicked):
(WebInspector.MemoryBlockViewProperties._initialize):
(WebInspector.NativeMemoryPieChart.prototype._paint):

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-06-04  Yury Semikhatsky  <yurys@chromium.org>
+
+        Web Inspector: add unknown size to the memory pie-chart legend
+        https://bugs.webkit.org/show_bug.cgi?id=88081
+
+        Reviewed by Pavel Feldman.
+
+        Added "Unknown" part size to the memory pie-chart legend.
+
+        * inspector/front-end/NativeMemorySnapshotView.js:
+        (WebInspector.NativeMemoryProfileType.prototype.buttonClicked.didReceiveMemorySnapshot):
+        (WebInspector.NativeMemoryProfileType.prototype.buttonClicked):
+        (WebInspector.MemoryBlockViewProperties._initialize):
+        (WebInspector.NativeMemoryPieChart.prototype._paint):
+
 2012-06-04  Mike West  <mkwst@chromium.org>
 

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

@@ -94 +94 @@
         function didReceiveMemorySnapshot(error, memoryBlock)
         {
+            if (memoryBlock.size && memoryBlock.children) {
+                var knownSize = 0;
+                for (var i = 0; i < memoryBlock.children.length; i++) {
+                    var size = memoryBlock.children[i].size;
+                    if (size)
+                        knownSize += size;
+                }
+                var unknownSize = memoryBlock.size - knownSize;
+
+                if (unknownSize) {
+                    memoryBlock.children.push({
+                        name: "Unknown",
+                        size: unknownSize
+                    });
+                }
+            }
             profileHeader._memoryBlock = memoryBlock;
             profileHeader.isTemporary = false;
@@ -199 +215 @@
         WebInspector.MemoryBlockViewProperties._standardBlocks[name] = new WebInspector.MemoryBlockViewProperties(fillStyle, name, WebInspector.UIString(description));
     }
-    addBlock("rgba(240, 240, 250, 0.8)", "ProcessPrivateMemory", "Total");
+    addBlock("rgba(255, 255, 255, 0.8)", "ProcessPrivateMemory", "Total");
+    addBlock("rgba(240, 240, 250, 0.8)", "Unknown", "Unknown");
     addBlock("rgba(250, 200, 200, 0.8)", "JSHeapAllocated", "JavaScript heap");
     addBlock("rgba(200, 250, 200, 0.8)", "JSHeapUsed", "Used JavaScript heap");
@@ -282 +299 @@
         ctx.arc(x, y, radius, 0, Math.PI*2, false);
         ctx.lineWidth = 1;
-        ctx.fillStyle = WebInspector.MemoryBlockViewProperties._forMemoryBlock(this._memorySnapshot)._fillStyle;
         ctx.strokeStyle = "rgba(130, 130, 130, 0.8)";
-        ctx.fill();
         ctx.stroke();
         ctx.closePath();
@@ -315 +330 @@
         }
 
-        if (memoryBlock.children) {
-            var total = memoryBlock.size;
-            for (var i = 0; i < memoryBlock.children.length; i++) {
-                var child = memoryBlock.children[i];
-                if (!child.size)
-                    continue;
-                var viewProperties = WebInspector.MemoryBlockViewProperties._forMemoryBlock(child);
-                var angleSpan = Math.PI * 2 * (child.size / total);
-                ctx.beginPath();
-                ctx.moveTo(x, y);
-                ctx.lineTo(x + radius * Math.cos(currentAngle), y + radius * Math.sin(currentAngle));
-                ctx.arc(x, y, radius, currentAngle, currentAngle + angleSpan, false);
-                ctx.lineWidth = 0.5;
-                ctx.lineTo(x, y);
-                ctx.fillStyle = viewProperties._fillStyle;
-                ctx.strokeStyle = "rgba(100, 100, 100, 0.8)";
-                ctx.fill();
-                ctx.stroke();
-                ctx.closePath();
-
-                paintPercentAndLabel(child.size / total, viewProperties._description, currentAngle + angleSpan / 2);
-
-                currentAngle += angleSpan;
-            }
+        if (!memoryBlock.children)
+            return;
+        var total = memoryBlock.size;
+        for (var i = 0; i < memoryBlock.children.length; i++) {
+            var child = memoryBlock.children[i];
+            if (!child.size)
+                continue;
+            var viewProperties = WebInspector.MemoryBlockViewProperties._forMemoryBlock(child);
+            var angleSpan = Math.PI * 2 * (child.size / total);
+            ctx.beginPath();
+            ctx.moveTo(x, y);
+            ctx.lineTo(x + radius * Math.cos(currentAngle), y + radius * Math.sin(currentAngle));
+            ctx.arc(x, y, radius, currentAngle, currentAngle + angleSpan, false);
+            ctx.lineWidth = 0.5;
+            ctx.lineTo(x, y);
+            ctx.fillStyle = viewProperties._fillStyle;
+            ctx.strokeStyle = "rgba(100, 100, 100, 0.8)";
+            ctx.fill();
+            ctx.stroke();
+            ctx.closePath();
+
+            paintPercentAndLabel(child.size / total, viewProperties._description, currentAngle + angleSpan / 2);
+
+            currentAngle += angleSpan;
         }
-
-        var fraction = 1 - (currentAngle - startAngle) / (2 * Math.PI);
-        var midAngle = (currentAngle + startAngle + 2 * Math.PI) / 2;
-        paintPercentAndLabel(fraction, WebInspector.UIString("Unknown"), midAngle);
     },