Bug 1197613 - Generalize GC marker names in filter list. r=fitzgen

This commit is contained in:
Jordan Santell 2015-08-27 21:06:06 -07:00
parent 9d1fcc770c
commit 521f027e30
3 changed files with 10 additions and 4 deletions

View File

@ -354,13 +354,16 @@ const Formatters = {
return marker.name || L10N.getStr("marker.label.unknown");
},
GCLabel: function (marker={}) {
GCLabel: function (marker) {
if (!marker) {
return L10N.getStr("marker.label.garbageCollection2");
}
// Only if a `nonincrementalReason` exists, do we want to label
// this as a non incremental GC event.
if ("nonincrementalReason" in marker) {
return L10N.getStr("marker.label.garbageCollection.nonIncremental");
}
return L10N.getStr("marker.label.garbageCollection");
return L10N.getStr("marker.label.garbageCollection.incremental");
},
JSLabel: function (marker={}) {

View File

@ -19,6 +19,8 @@ add_task(function () {
"getMarkerLabel() returns a simple label");
equal(Utils.getMarkerLabel({ name: "Javascript", causeName: "setTimeout handler" }), "setTimeout",
"getMarkerLabel() returns a label defined via function");
equal(Utils.getMarkerLabel({ name: "GarbageCollection", causeName: "ALLOC_TRIGGER" }), "Incremental GC",
"getMarkerLabel() returns a label for a function that is generalizable");
ok(Utils.getMarkerFields({ name: "Paint" }).length === 0,
"getMarkerFields() returns an empty array when no fields defined");
@ -53,7 +55,7 @@ add_task(function () {
equal(Utils.getMarkerClassName("Javascript"), "Function Call",
"getMarkerClassName() returns correct string when defined via function");
equal(Utils.getMarkerClassName("GarbageCollection"), "Incremental GC",
equal(Utils.getMarkerClassName("GarbageCollection"), "Garbage Collection",
"getMarkerClassName() returns correct string when defined via function");
equal(Utils.getMarkerClassName("Reflow"), "Layout",
"getMarkerClassName() returns correct string when defined via string");

View File

@ -23,7 +23,8 @@ marker.label.parseHTML=Parse HTML
marker.label.parseXML=Parse XML
marker.label.domevent=DOM Event
marker.label.consoleTime=Console
marker.label.garbageCollection=Incremental GC
marker.label.garbageCollection2=Garbage Collection
marker.label.garbageCollection.incremental=Incremental GC
marker.label.garbageCollection.nonIncremental=Non-incremental GC
marker.label.cycleCollection=Cycle Collection
marker.label.cycleCollection.forgetSkippable=CC Graph Reduction