Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-03 10:33:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1151703 - Part 2: Show XML and HTML parsing markers in the performance tool; r=jsantell

Browse Source
This commit is contained in:
Nick Fitzgerald 2015-04-08 11:25:56 -07:00
parent 67317ac3db
commit 8d460f9783
3 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
browser/devtools/shared/timeline/global.js
View File

@ -53,6 +53,16 @@ const TIMELINE_BLUEPRINT = {
colorName: "highlight-lightorange",
label: L10N.getStr("timeline.label.javascript2")
},
"Parse HTML": {
group: 1,
colorName: "highlight-purple",
label: L10N.getStr("timeline.label.parseHTML")
},
"Parse XML": {
group: 1,
colorName: "highlight-purple",
label: L10N.getStr("timeline.label.parseXML")
},
"ConsoleTime": {
group: 2,
colorName: "highlight-bluegrey",

2
browser/locales/en-US/chrome/browser/devtools/timeline.properties
View File

@ -40,6 +40,8 @@ timeline.label.styles2=Recalculate Style
timeline.label.reflow2=Layout
timeline.label.paint=Paint
timeline.label.javascript2=Function Call
timeline.label.parseHTML=Parse HTML
timeline.label.parseXML=Parse XML
timeline.label.domevent=DOM Event
timeline.label.consoleTime=Console

2
toolkit/devtools/server/actors/timeline.js
View File

@ -184,7 +184,7 @@ let TimelineActor = exports.TimelineActor = protocol.ActorClass({
let markers = [];
for (let docShell of this.docShells) {
markers = [...markers, ...docShell.popProfileTimelineMarkers()];
markers.push(...docShell.popProfileTimelineMarkers());
}
// The docshell may return markers with stack traces attached.