DevTools: fix front-end compilation problems after #399131

BUG=614935

Review-Url: https://codereview.chromium.org/2072173003
Cr-Commit-Position: refs/heads/master@{#400650}

third_party/WebKit/Source/devtools/front_end/timeline/TimelineTreeView.js

@@ -613,6 +613,17 @@ WebInspector.AggregatedTimelineTreeView.prototype = {
         return true;
     },
 
+    /**
+     * @return {!WebInspector.TimelineAggregator}
+     */
+    _createAggregator: function()
+    {
+         return new WebInspector.TimelineAggregator(
+             event => WebInspector.TimelineUIUtils.eventStyle(event).title,
+             event => WebInspector.TimelineUIUtils.eventStyle(event).category.name
+         );
+    },
+
     __proto__: WebInspector.TimelineTreeView.prototype,
 };
 
@@ -636,8 +647,7 @@ WebInspector.CallTreeTimelineTreeView.prototype = {
     _buildTree: function()
     {
         var topDown = this._buildTopDownTree(WebInspector.TimelineAggregator.eventId);
-        var aggregator = new WebInspector.TimelineAggregator(event => WebInspector.TimelineUIUtils.eventStyle(event));
-        return aggregator.performGrouping(topDown, this._groupBySetting.get());
+        return this._createAggregator().performGrouping(topDown, this._groupBySetting.get());
     },
 
     __proto__: WebInspector.AggregatedTimelineTreeView.prototype,
@@ -663,8 +673,7 @@ WebInspector.BottomUpTimelineTreeView.prototype = {
     _buildTree: function()
     {
         var topDown = this._buildTopDownTree(WebInspector.TimelineAggregator.eventId);
-        var aggregator = new WebInspector.TimelineAggregator(event => WebInspector.TimelineUIUtils.eventStyle(event));
-        return WebInspector.TimelineProfileTree.buildBottomUp(topDown, aggregator.groupFunction(this._groupBySetting.get()));
+        return WebInspector.TimelineProfileTree.buildBottomUp(topDown, this._createAggregator().groupFunction(this._groupBySetting.get()));
     },
 
     __proto__: WebInspector.AggregatedTimelineTreeView.prototype

third_party/WebKit/Source/devtools/front_end/timeline/TimelineUIUtils.js

@@ -313,7 +313,7 @@ WebInspector.TimelineUIUtils.interactionPhaseLabel = function(phase)
  */
 WebInspector.TimelineUIUtils.isUserFrame = function(frame)
 {
-    return frame.scriptId !== "0" && frame.url && !frame.url.startsWith("native ");
+    return frame.scriptId !== "0" && !(frame.url && frame.url.startsWith("native "));
 }
 
 /**

third_party/WebKit/Source/devtools/front_end/timeline_model/TimelineProfileTree.js

@@ -218,11 +218,13 @@ WebInspector.TimelineProfileTree.eventStackFrame = function(event)
 
 /**
  * @constructor
- * @param {function(!WebInspector.TracingModel.Event):{title: string, category: !WebInspector.TimelineCategory}} eventStyleMapper
+ * @param {function(!WebInspector.TracingModel.Event):string} titleMapper
+ * @param {function(!WebInspector.TracingModel.Event):string} categoryMapper
  */
-WebInspector.TimelineAggregator = function(eventStyleMapper)
+WebInspector.TimelineAggregator = function(titleMapper, categoryMapper)
 {
-    this._eventStyleMapper = eventStyleMapper;
+    this._titleMapper = titleMapper;
+    this._categoryMapper = categoryMapper;
     /** @type {!Map<string, !WebInspector.TimelineProfileTree.Node>} */
     this._groupNodes = new Map();
 }
@@ -337,8 +339,8 @@ WebInspector.TimelineAggregator.prototype = {
 
         switch (groupBy) {
         case WebInspector.TimelineAggregator.GroupBy.None: return null;
-        case WebInspector.TimelineAggregator.GroupBy.EventName: return node => node.event ? this._eventStyleMapper(node.event).title : "";
-        case WebInspector.TimelineAggregator.GroupBy.Category: return node => node.event ? this._eventStyleMapper(node.event).category.name : "";
+        case WebInspector.TimelineAggregator.GroupBy.EventName: return node => node.event ? this._titleMapper(node.event) : "";
+        case WebInspector.TimelineAggregator.GroupBy.Category: return node => node.event ? this._categoryMapper(node.event) : "";
         case WebInspector.TimelineAggregator.GroupBy.Subdomain: return groupByDomain.bind(null, false);
         case WebInspector.TimelineAggregator.GroupBy.Domain: return groupByDomain.bind(null, true);
         case WebInspector.TimelineAggregator.GroupBy.URL: return groupByURL;