summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authormnaganov@chromium.org <mnaganov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-28 19:41:09 +0000
committermnaganov@chromium.org <mnaganov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-28 19:41:09 +0000
commit342688ed5c5e4ee1fb79de98fe1c481047583233 (patch)
tree7908c4ade3dafa4257bdbff0aed628e57a5a78f4 /webkit
parent2a409538977a7f85ba52abca9477310371d7bfdd (diff)
downloadchromium_src-342688ed5c5e4ee1fb79de98fe1c481047583233.zip
chromium_src-342688ed5c5e4ee1fb79de98fe1c481047583233.tar.gz
chromium_src-342688ed5c5e4ee1fb79de98fe1c481047583233.tar.bz2
DevTools Heap profiler: catch up with WebKit r47861.
BUG=none TEST=none Review URL: http://codereview.chromium.org/175012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24776 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/glue/devtools/js/heap_profiler_panel.js13
1 files changed, 5 insertions, 8 deletions
diff --git a/webkit/glue/devtools/js/heap_profiler_panel.js b/webkit/glue/devtools/js/heap_profiler_panel.js
index a1b3fb9..eb1dffa 100644
--- a/webkit/glue/devtools/js/heap_profiler_panel.js
+++ b/webkit/glue/devtools/js/heap_profiler_panel.js
@@ -192,11 +192,7 @@ WebInspector.HeapSnapshotView = function(parent, snapshot)
this.showCountDeltaAsPercent = true;
this.showSizeDeltaAsPercent = true;
- // TODO(mnaganov): Fix in WebKit: SummaryBar must not use global resourceCategories.
- WebInspector.resourceCategories["code"] = {title: WebInspector.UIString("Code")};
- WebInspector.resourceCategories["data"] = {title: WebInspector.UIString("Objects and Data")};
-
- this.summaryBar = new WebInspector.SummaryBar(this.summaryColors, this.summaryOrder);
+ this.summaryBar = new WebInspector.SummaryBar(this.categories);
this.summaryBar.element.id = "heap-snapshot-summary";
this.summaryBar.calculator = new WebInspector.HeapSummaryCalculator(snapshot.used);
this.element.appendChild(this.summaryBar.element);
@@ -234,9 +230,10 @@ WebInspector.HeapSnapshotView = function(parent, snapshot)
WebInspector.HeapSnapshotView.prototype = {
- summaryColors: {data: {r: 47, g: 102, b: 236}, code: {r: 255, g: 121, b: 0}, other: {r: 186, g: 186, b: 186}},
-
- summaryOrder: ["code", "data", "other"],
+ get categories()
+ {
+ return {code: {title: WebInspector.UIString("Code"), color: {r: 255, g: 121, b: 0}}, data: {title: WebInspector.UIString("Objects and Data"), color: {r: 47, g: 102, b: 236}}, other: {title: WebInspector.UIString("Other"), color: {r: 186, g: 186, b: 186}}};
+ },
get statusBarItems()
{