Chromium Code Reviews| Index: third_party/WebKit/Source/devtools/front_end/timeline/TimelineTreeView.js |
| diff --git a/third_party/WebKit/Source/devtools/front_end/timeline/TimelineTreeView.js b/third_party/WebKit/Source/devtools/front_end/timeline/TimelineTreeView.js |
| index cd96356b88d07c6723f379e23f018f8164f8618a..0dc3a04e7463a30c8904a4f7fef7704e86e4afd4 100644 |
| --- a/third_party/WebKit/Source/devtools/front_end/timeline/TimelineTreeView.js |
| +++ b/third_party/WebKit/Source/devtools/front_end/timeline/TimelineTreeView.js |
| @@ -489,6 +489,8 @@ WebInspector.AggregatedTimelineTreeView.prototype = { |
| _displayInfoForGroupNode: function(node) |
| { |
| var categories = WebInspector.TimelineUIUtils.categories(); |
| + var color = node.id ? WebInspector.TimelineUIUtils.eventColor(node.event) : categories["other"].color; |
| + |
| switch (this._groupBySetting.get()) { |
| case WebInspector.TimelineAggregator.GroupBy.Category: |
| var category = categories[node.id] || categories["other"]; |
| @@ -503,7 +505,16 @@ WebInspector.AggregatedTimelineTreeView.prototype = { |
| name = this._executionContextNamesByOrigin.get(name) || name; |
| return { |
| name: name || WebInspector.UIString("unattributed"), |
| - color: node.id ? WebInspector.TimelineUIUtils.eventColor(node.event) : categories["other"].color |
| + color: color |
| + } |
|
alph
2016/05/26 07:23:20
missing ;
|
| + |
| + case WebInspector.TimelineAggregator.GroupBy.EventName: |
| + var name = node.event.name === WebInspector.TimelineModel.RecordType.JSFrame ? |
| + WebInspector.UIString("Execute Script") : WebInspector.TimelineUIUtils.eventTitle(node.event); |
|
alph
2016/05/26 07:23:21
Strange name. Maybe "JavaScript"?
|
| + return { |
| + name: name, |
| + color: node.event.name === WebInspector.TimelineModel.RecordType.JSFrame ? |
| + WebInspector.TimelineUIUtils.eventStyle(node.event).category.color : color |
| } |
|
alph
2016/05/26 07:23:21
missing ;
|
| case WebInspector.TimelineAggregator.GroupBy.URL: |
| @@ -514,7 +525,7 @@ WebInspector.AggregatedTimelineTreeView.prototype = { |
| } |
| return { |
| name: node.id || WebInspector.UIString("unattributed"), |
| - color: node.id ? WebInspector.TimelineUIUtils.eventColor(node.event) : categories["other"].color |
| + color: color |
| } |
|
alph
2016/05/26 07:23:21
ditto
|
| }, |
| @@ -539,6 +550,7 @@ WebInspector.AggregatedTimelineTreeView.prototype = { |
| this._groupByCombobox.select(option); |
| } |
| addGroupingOption.call(this, WebInspector.UIString("No Grouping"), WebInspector.TimelineAggregator.GroupBy.None); |
| + addGroupingOption.call(this, WebInspector.UIString("Group by Activity"), WebInspector.TimelineAggregator.GroupBy.EventName); |
| addGroupingOption.call(this, WebInspector.UIString("Group by Category"), WebInspector.TimelineAggregator.GroupBy.Category); |
| addGroupingOption.call(this, WebInspector.UIString("Group by Domain"), WebInspector.TimelineAggregator.GroupBy.Domain); |
| addGroupingOption.call(this, WebInspector.UIString("Group by Subdomain"), WebInspector.TimelineAggregator.GroupBy.Subdomain); |