Commit 31f31a2f authored by allada's avatar allada Committed by Commit bot

[Devtools] Setup network groupping to show bars for collapsed nodes

This patch will now show bars for nodes that are collapsed and contain
nodes that have bars inside them.

See: http://imgur.com/a/egUwg

R=dgozman
BUG=664704

Review-Url: https://codereview.chromium.org/2591043003
Cr-Commit-Position: refs/heads/master@{#440779}
parent 7d56282c
...@@ -308,10 +308,16 @@ Network.NetworkWaterfallColumn = class extends UI.VBox { ...@@ -308,10 +308,16 @@ Network.NetworkWaterfallColumn = class extends UI.VBox {
var rowOffset = this._rowHeight * i; var rowOffset = this._rowHeight * i;
var node = nodes[i]; var node = nodes[i];
this._decorateRow(context, node, i, rowOffset - this._scrollTop); this._decorateRow(context, node, i, rowOffset - this._scrollTop);
var drawNodes = [];
if (node.hasChildren() && !node.expanded)
drawNodes = /** @type {!Array<!Network.NetworkNode>} */ (node.flatChildren());
drawNodes.push(node);
for (var drawNode of drawNodes) {
if (useTimingBars) if (useTimingBars)
this._drawTimingBars(context, node, rowOffset - this._scrollTop); this._drawTimingBars(context, drawNode, rowOffset - this._scrollTop);
else else
this._drawSimplifiedBars(context, node, rowOffset - this._scrollTop); this._drawSimplifiedBars(context, drawNode, rowOffset - this._scrollTop);
}
} }
this._drawEventDividers(context); this._drawEventDividers(context);
context.restore(); context.restore();
...@@ -434,7 +440,6 @@ Network.NetworkWaterfallColumn = class extends UI.VBox { ...@@ -434,7 +440,6 @@ Network.NetworkWaterfallColumn = class extends UI.VBox {
* @param {number} y * @param {number} y
*/ */
_drawSimplifiedBars(context, node, y) { _drawSimplifiedBars(context, node, y) {
// TODO(allada) This should draw bars for groupped requests.
var request = node.request(); var request = node.request();
if (!request) if (!request)
return; return;
...@@ -553,7 +558,6 @@ Network.NetworkWaterfallColumn = class extends UI.VBox { ...@@ -553,7 +558,6 @@ Network.NetworkWaterfallColumn = class extends UI.VBox {
* @param {number} y * @param {number} y
*/ */
_drawTimingBars(context, node, y) { _drawTimingBars(context, node, y) {
// TODO(allada) This should draw bars for groupped requests.
var request = node.request(); var request = node.request();
if (!request) if (!request)
return; return;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment