Skip to content

Commit 1b1313f

Browse files
committed
[DevTools] fixed coverage in Node.js frontend
We should not check for resource tree model when inspecting Node.js target. [email protected] [email protected] (cherry picked from commit 8af9bb9) Bug: chromium:787754 Change-Id: I04503a249acc05182524da40f83765e6ad7c37a5 Reviewed-on: https://chromium-review.googlesource.com/881468 Commit-Queue: Aleksey Kozyatinskiy <[email protected]> Reviewed-by: Dmitry Gozman <[email protected]> Cr-Original-Commit-Position: refs/heads/master@{#531342} Reviewed-on: https://chromium-review.googlesource.com/884729 Reviewed-by: Aleksey Kozyatinskiy <[email protected]> Cr-Commit-Position: refs/branch-heads/3325@{#74} Cr-Branched-From: bc084a8-refs/heads/master@{#530369}
1 parent bf03fcb commit 1b1313f

File tree

1 file changed

+31
-20
lines changed

1 file changed

+31
-20
lines changed

third_party/WebKit/Source/devtools/front_end/coverage/CoverageView.js

Lines changed: 31 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,12 @@ Coverage.CoverageView = class extends UI.VBox {
2525
this._toggleRecordButton = UI.Toolbar.createActionButton(this._toggleRecordAction);
2626
toolbar.appendToolbarItem(this._toggleRecordButton);
2727

28-
var startWithReloadAction =
29-
/** @type {!UI.Action }*/ (UI.actionRegistry.action('coverage.start-with-reload'));
30-
this._startWithReloadButton = UI.Toolbar.createActionButton(startWithReloadAction);
31-
toolbar.appendToolbarItem(this._startWithReloadButton);
28+
if (!Runtime.queryParam('nodeFrontend')) {
29+
var startWithReloadAction =
30+
/** @type {!UI.Action }*/ (UI.actionRegistry.action('coverage.start-with-reload'));
31+
this._startWithReloadButton = UI.Toolbar.createActionButton(startWithReloadAction);
32+
toolbar.appendToolbarItem(this._startWithReloadButton);
33+
}
3234
this._clearButton = new UI.ToolbarButton(Common.UIString('Clear all'), 'largeicon-clear');
3335
this._clearButton.addEventListener(UI.ToolbarButton.Events.Click, this._clear.bind(this));
3436
toolbar.appendToolbarItem(this._clearButton);
@@ -64,12 +66,17 @@ Coverage.CoverageView = class extends UI.VBox {
6466
*/
6567
_buildLandingPage() {
6668
var recordButton = UI.createInlineButton(UI.Toolbar.createActionButton(this._toggleRecordAction));
67-
var reloadButton = UI.createInlineButton(UI.Toolbar.createActionButtonForId('coverage.start-with-reload'));
6869
var widget = new UI.VBox();
69-
var message = UI.formatLocalized(
70-
'Click the record button %s to start capturing coverage.\n' +
71-
'Click the reload button %s to reload and start capturing coverage.',
72-
[recordButton, reloadButton]);
70+
var message;
71+
if (this._startWithReloadButton) {
72+
var reloadButton = UI.createInlineButton(UI.Toolbar.createActionButtonForId('coverage.start-with-reload'));
73+
message = UI.formatLocalized(
74+
'Click the record button %s to start capturing coverage.\n' +
75+
'Click the reload button %s to reload and start capturing coverage.',
76+
[recordButton, reloadButton]);
77+
} else {
78+
message = UI.formatLocalized('Click the record button %s to start capturing coverage.', [recordButton]);
79+
}
7380
message.classList.add('message');
7481
widget.contentElement.appendChild(message);
7582
widget.element.classList.add('landing-page');
@@ -110,25 +117,26 @@ Coverage.CoverageView = class extends UI.VBox {
110117
var mainTarget = SDK.targetManager.mainTarget();
111118
if (!mainTarget)
112119
return;
113-
this._resourceTreeModel = /** @type {?SDK.ResourceTreeModel} */ (mainTarget.model(SDK.ResourceTreeModel));
114-
if (!this._resourceTreeModel)
115-
return;
116120
if (!this._model || reload)
117121
this._model = new Coverage.CoverageModel(mainTarget);
118122
Host.userMetrics.actionTaken(Host.UserMetrics.Action.CoverageStarted);
119123
if (!this._model.start())
120124
return;
121-
this._resourceTreeModel.addEventListener(
122-
SDK.ResourceTreeModel.Events.MainFrameNavigated, this._onMainFrameNavigated, this);
125+
this._resourceTreeModel = /** @type {?SDK.ResourceTreeModel} */ (mainTarget.model(SDK.ResourceTreeModel));
126+
if (this._resourceTreeModel) {
127+
this._resourceTreeModel.addEventListener(
128+
SDK.ResourceTreeModel.Events.MainFrameNavigated, this._onMainFrameNavigated, this);
129+
}
123130
this._decorationManager = new Coverage.CoverageDecorationManager(this._model);
124131
this._toggleRecordAction.setToggled(true);
125132
this._clearButton.setEnabled(false);
126-
this._startWithReloadButton.setEnabled(false);
133+
if (this._startWithReloadButton)
134+
this._startWithReloadButton.setEnabled(false);
127135
this._filterInput.setEnabled(true);
128136
if (this._landingPage.isShowing())
129137
this._landingPage.detach();
130138
this._listView.show(this._coverageResultsElement);
131-
if (reload)
139+
if (reload && this._resourceTreeModel)
132140
this._resourceTreeModel.reloadPage();
133141
else
134142
this._poll();
@@ -146,13 +154,16 @@ Coverage.CoverageView = class extends UI.VBox {
146154
clearTimeout(this._pollTimer);
147155
delete this._pollTimer;
148156
}
149-
this._resourceTreeModel.removeEventListener(
150-
SDK.ResourceTreeModel.Events.MainFrameNavigated, this._onMainFrameNavigated, this);
151-
this._resourceTreeModel = null;
157+
if (this._resourceTreeModel) {
158+
this._resourceTreeModel.removeEventListener(
159+
SDK.ResourceTreeModel.Events.MainFrameNavigated, this._onMainFrameNavigated, this);
160+
this._resourceTreeModel = null;
161+
}
152162
var updatedEntries = await this._model.stop();
153163
this._updateViews(updatedEntries);
154164
this._toggleRecordAction.setToggled(false);
155-
this._startWithReloadButton.setEnabled(true);
165+
if (this._startWithReloadButton)
166+
this._startWithReloadButton.setEnabled(true);
156167
this._clearButton.setEnabled(true);
157168
}
158169

0 commit comments

Comments
 (0)