| Index: third_party/WebKit/Source/devtools/front_end/network/NetworkPanel.js
|
| diff --git a/third_party/WebKit/Source/devtools/front_end/network/NetworkPanel.js b/third_party/WebKit/Source/devtools/front_end/network/NetworkPanel.js
|
| index 4714f4c3083eec47d1ec5baf2fb46ef30b31dc29..ff330ea5e574b79106e7efdc6fc9f928440490a6 100644
|
| --- a/third_party/WebKit/Source/devtools/front_end/network/NetworkPanel.js
|
| +++ b/third_party/WebKit/Source/devtools/front_end/network/NetworkPanel.js
|
| @@ -49,9 +49,9 @@ WebInspector.NetworkPanel = function()
|
| /** @type {?WebInspector.NetworkPanel.FilmStripRecorder} */
|
| this._filmStripRecorder = null;
|
|
|
| - this._panelToolbar = new WebInspector.Toolbar("", this.element);
|
| + this._panelToolbar = new WebInspector.Toolbar("", this.contentElement);
|
| this._filterBar = new WebInspector.FilterBar("networkPanel", true);
|
| - this._filterBar.show(this.element);
|
| + this._filterBar.show(this.contentElement);
|
|
|
| // Create top overview component.
|
| this._overviewPane = new WebInspector.TimelineOverviewPane("network");
|
| @@ -64,7 +64,7 @@ WebInspector.NetworkPanel = function()
|
| this._splitWidget = new WebInspector.SplitWidget(true, false, "networkPanelSplitViewState");
|
| this._splitWidget.hideMain();
|
|
|
| - this._splitWidget.show(this.element);
|
| + this._splitWidget.show(this.contentElement);
|
|
|
| this._progressBarContainer = createElement("div");
|
| this._createToolbarButtons();
|
| @@ -285,7 +285,7 @@ WebInspector.NetworkPanel.prototype = {
|
| {
|
| var toggled = this._networkLogShowOverviewSetting.get();
|
| if (toggled)
|
| - this._overviewPane.show(this.element, this._splitWidget.element);
|
| + this._overviewPane.show(this.contentElement, this._splitWidget.element);
|
| else
|
| this._overviewPane.detach();
|
| this.doResize();
|
| @@ -299,7 +299,7 @@ WebInspector.NetworkPanel.prototype = {
|
| this._filmStripView.setMode(WebInspector.FilmStripView.Modes.FrameBased);
|
| this._filmStripView.element.classList.add("network-film-strip");
|
| this._filmStripRecorder = new WebInspector.NetworkPanel.FilmStripRecorder(this._networkLogView.timeCalculator(), this._filmStripView);
|
| - this._filmStripView.show(this.element, this.element.firstElementChild);
|
| + this._filmStripView.show(this.contentElement, this._networkLogShowOverviewSetting.get() ? this._overviewPane.element : this._splitWidget.element);
|
| this._filmStripView.addEventListener(WebInspector.FilmStripView.Events.FrameSelected, this._onFilmFrameSelected, this);
|
| this._filmStripView.addEventListener(WebInspector.FilmStripView.Events.FrameEnter, this._onFilmFrameEnter, this);
|
| this._filmStripView.addEventListener(WebInspector.FilmStripView.Events.FrameExit, this._onFilmFrameExit, this);
|
| @@ -514,7 +514,7 @@ WebInspector.NetworkPanel.prototype = {
|
| contextMenu.appendItem(WebInspector.UIString.capitalize("Reveal in Network ^panel"), reveal.bind(this, request));
|
| }
|
|
|
| - if (event.target.isSelfOrDescendant(this.element))
|
| + if (event.target.isSelfOrDescendant(this.contentElement))
|
| return;
|
|
|
| if (target instanceof WebInspector.Resource) {
|
|
|