Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(826)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: third_party/WebKit/Source/devtools/front_end/sources/ThreadsSidebarPane.js

Issue 2625223002: [DevTools] Dedicated frontend for debugging Node. (Closed)
Patch Set: test fix Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/WebKit/Source/devtools/front_end/sources/SourcesPanel.js ('k') | third_party/WebKit/Source/devtools/front_end/sources/sourcesPanel.css » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/devtools/front_end/sources/ThreadsSidebarPane.js
diff --git a/third_party/WebKit/Source/devtools/front_end/sources/ThreadsSidebarPane.js b/third_party/WebKit/Source/devtools/front_end/sources/ThreadsSidebarPane.js
index 8247d9e5001c12e635ddfe55cc8c67d7cac758e9..a5258f39c5d96c98bab27b4703ec3a9682721ec8 100644
--- a/third_party/WebKit/Source/devtools/front_end/sources/ThreadsSidebarPane.js
+++ b/third_party/WebKit/Source/devtools/front_end/sources/ThreadsSidebarPane.js
@@ -11,14 +11,14 @@ Sources.ThreadsSidebarPane = class extends UI.VBox {
/** @type {?Sources.UIList.Item} */
this._selectedListItem = null;
- /** @type {!Map<!SDK.PendingTarget, !Sources.UIList.Item>} */
- this._pendingToListItem = new Map();
- /** @type {!Map<!SDK.Target, !SDK.PendingTarget>} */
- this._targetToPending = new Map();
- /** @type {?SDK.PendingTarget} */
- this._mainTargetPending = null;
+ /** @type {!Map<!SDK.Target, !Sources.UIList.Item>} */
+ this._targetToListItem = new Map();
+
this.threadList = new Sources.UIList();
this.threadList.show(this.element);
+
+ this._availableNodeTargetsElement = this.element.createChild('div', 'hidden available-node-targets');
+
SDK.targetManager.addModelListener(
SDK.DebuggerModel, SDK.DebuggerModel.Events.DebuggerPaused, this._onDebuggerStateChanged, this);
SDK.targetManager.addModelListener(
@@ -28,102 +28,51 @@ Sources.ThreadsSidebarPane = class extends UI.VBox {
UI.context.addFlavorChangeListener(SDK.Target, this._targetChanged, this);
SDK.targetManager.addEventListener(SDK.TargetManager.Events.NameChanged, this._targetNameChanged, this);
SDK.targetManager.addModelListener(
- SDK.SubTargetsManager, SDK.SubTargetsManager.Events.PendingTargetAdded, this._addTargetItem, this);
- SDK.targetManager.addModelListener(
- SDK.SubTargetsManager, SDK.SubTargetsManager.Events.PendingTargetRemoved, this._pendingTargetRemoved, this);
- SDK.targetManager.addModelListener(
- SDK.SubTargetsManager, SDK.SubTargetsManager.Events.PendingTargetAttached, this._addTargetItem, this);
- SDK.targetManager.addModelListener(
- SDK.SubTargetsManager, SDK.SubTargetsManager.Events.PendingTargetDetached, this._targetDetached, this);
- SDK.targetManager.observeTargets(this);
-
- var pendingTargets = [];
- for (var target of SDK.targetManager.targets(SDK.Target.Capability.Target))
- pendingTargets = pendingTargets.concat(SDK.SubTargetsManager.fromTarget(target).pendingTargets());
-
- pendingTargets.sort(Sources.ThreadsSidebarPane._pendingTargetsComparator)
- .forEach(pendingTarget => this._addListItem(pendingTarget));
+ SDK.SubTargetsManager, SDK.SubTargetsManager.Events.AvailableNodeTargetsChanged,
+ this._availableNodeTargetsChanged, this);
+ SDK.targetManager.observeTargets(this, SDK.Target.Capability.JS);
+ this._availableNodeTargetsChanged();
}
/**
* @return {boolean}
*/
static shouldBeShown() {
- if (SDK.targetManager.targets(SDK.Target.Capability.JS).length > 1)
+ var minJSTargets = Runtime.queryParam('nodeFrontend') ? 1 : 2;
+ if (SDK.targetManager.targets(SDK.Target.Capability.JS).length >= minJSTargets)
+ return true;
+ if (Sources.ThreadsSidebarPane.availableNodeTargetsCount())
return true;
- for (var target of SDK.targetManager.targets(SDK.Target.Capability.Target)) {
- var pendingTargets = SDK.SubTargetsManager.fromTarget(target).pendingTargets();
- if (pendingTargets.some(pendingTarget => pendingTarget.canConnect()))
- return true;
- }
return false;
}
/**
- * Sorts show tha connected targets appear first, followed by pending subtargets.
- *
- * @param {!SDK.PendingTarget} c1
- * @param {!SDK.PendingTarget} c2
* @return {number}
*/
- static _pendingTargetsComparator(c1, c2) {
- var t1 = c1.target();
- var t2 = c2.target();
- var name1 = t1 ? t1.name() : c1.name();
- var name2 = t2 ? t2.name() : c2.name();
- if (!!t1 === !!t2) { // Either both are connected or disconnected
- return name1.toLowerCase().localeCompare(name2.toLowerCase());
- } else if (t1) {
- return -1;
- }
- return 1;
- }
-
- /**
- * @param {!Common.Event} event
- */
- _addTargetItem(event) {
- this._addListItem(/** @type {!SDK.PendingTarget} */ (event.data));
- }
+ static availableNodeTargetsCount() {
+ var count = 0;
+ for (var target of SDK.targetManager.targets(SDK.Target.Capability.Target))
+ count += SDK.SubTargetsManager.fromTarget(target).availableNodeTargetsCount();
- /**
- * @param {!Common.Event} event
- */
- _pendingTargetRemoved(event) {
- this._removeListItem(/** @type {!SDK.PendingTarget} */ (event.data));
+ return count;
}
- /**
- * @param {!Common.Event} event
- */
- _targetDetached(event) {
- this._targetRemoved(/** @type {!SDK.PendingTarget} */ (event.data));
- }
-
- /**
- * @param {!SDK.PendingTarget} pendingTarget
- */
- _addListItem(pendingTarget) {
- var target = pendingTarget.target();
- if (!pendingTarget.canConnect() && !(target && target.hasJSCapability()))
+ _availableNodeTargetsChanged() {
+ var count = Sources.ThreadsSidebarPane.availableNodeTargetsCount();
+ if (!count) {
+ this._availableNodeTargetsElement.classList.add('hidden');
return;
-
- var listItem = this._pendingToListItem.get(pendingTarget);
- if (!listItem) {
- listItem = new Sources.UIList.Item('', '', false);
- listItem[Sources.ThreadsSidebarPane._pendingTargetSymbol] = pendingTarget;
- listItem[Sources.ThreadsSidebarPane._targetSymbol] = target;
- this._pendingToListItem.set(pendingTarget, listItem);
- this.threadList.addItem(listItem);
- listItem.element.addEventListener('click', this._onListItemClick.bind(this, listItem), false);
}
- this._updateListItem(listItem, pendingTarget);
- this._updateDebuggerState(pendingTarget);
- var currentTarget = UI.context.flavor(SDK.Target);
- if (currentTarget === target)
- this._selectListItem(listItem);
- if (target)
- this._targetToPending.set(target, pendingTarget);
+ this._availableNodeTargetsElement.removeChildren();
+ this._availableNodeTargetsElement.createTextChild(
+ count === 1 ? Common.UIString('Node instance available.') :
+ Common.UIString('%d Node instances available.', count));
+ var link = this._availableNodeTargetsElement.createChild('span', 'link');
+ link.textContent = Common.UIString('Connect');
+ link.addEventListener('click', () => {
+ InspectorFrontendHost.openNodeFrontend();
+ }, false);
+ this._availableNodeTargetsElement.classList.remove('hidden');
}
/**
@@ -131,11 +80,16 @@ Sources.ThreadsSidebarPane = class extends UI.VBox {
* @param {!SDK.Target} target
*/
targetAdded(target) {
- if (target !== SDK.targetManager.mainTarget())
- return;
- console.assert(!this._mainTargetPending);
- this._mainTargetPending = new Sources.ThreadsSidebarPane.MainTargetConnection(target);
- this._addListItem(this._mainTargetPending);
+ var listItem = new Sources.UIList.Item('', '', false);
+ listItem.element.addEventListener('click', this._onListItemClick.bind(this, listItem, target), false);
+ this._targetToListItem.set(target, listItem);
+ this.threadList.addItem(listItem);
+ listItem.setTitle(this._titleForTarget(target));
+ this._updateDebuggerState(target);
+
+ var currentTarget = UI.context.flavor(SDK.Target);
+ if (currentTarget === target)
+ this._selectListItem(listItem);
}
/**
@@ -143,16 +97,11 @@ Sources.ThreadsSidebarPane = class extends UI.VBox {
* @param {!SDK.Target} target
*/
targetRemoved(target) {
- var subtargetManager = SDK.SubTargetsManager.fromTarget(target);
- var pendingTargets = subtargetManager ? subtargetManager.pendingTargets() : [];
- for (var pendingTarget of pendingTargets) {
- if (pendingTarget.target())
- this._targetRemoved(pendingTarget);
- }
- if (target === SDK.targetManager.mainTarget() && this._mainTargetPending) {
- this._targetRemoved(this._mainTargetPending);
- this._mainTargetPending = null;
- }
+ var item = this._targetToListItem.get(target);
+ if (!item)
+ return;
+ this.threadList.removeItem(item);
+ this._targetToListItem.delete(target);
}
/**
@@ -160,37 +109,25 @@ Sources.ThreadsSidebarPane = class extends UI.VBox {
*/
_targetNameChanged(event) {
var target = /** @type {!SDK.Target} */ (event.data);
- var listItem = this._listItemForTarget(target);
+ var listItem = this._targetToListItem.get(target);
if (listItem)
- listItem.setTitle(this._titleForPending(this._targetToPending.get(target)));
+ listItem.setTitle(this._titleForTarget(target));
}
/**
* @param {!Common.Event} event
*/
_targetChanged(event) {
- var listItem = this._listItemForTarget(/** @type {!SDK.Target} */ (event.data));
+ var listItem = this._targetToListItem.get(/** @type {!SDK.Target} */ (event.data));
if (listItem)
this._selectListItem(listItem);
}
/**
* @param {!SDK.Target} target
- * @return {?Sources.UIList.Item}
- */
- _listItemForTarget(target) {
- var pendingTarget = this._targetToPending.get(target);
- return this._pendingToListItem.get(pendingTarget) || null;
- }
-
- /**
- * @param {!SDK.PendingTarget} pendingTarget
* @return {string}
*/
- _titleForPending(pendingTarget) {
- var target = pendingTarget.target();
- if (!target)
- return pendingTarget.name();
+ _titleForTarget(target) {
var executionContext = target.runtimeModel.defaultExecutionContext();
return executionContext && executionContext.label() ? executionContext.label() : target.name();
}
@@ -200,8 +137,7 @@ Sources.ThreadsSidebarPane = class extends UI.VBox {
*/
_onDebuggerStateChanged(event) {
var debuggerModel = /** @type {!SDK.DebuggerModel} */ (event.data);
- var pendingTarget = this._targetToPending.get(debuggerModel.target());
- this._updateDebuggerState(pendingTarget);
+ this._updateDebuggerState(debuggerModel.target());
}
/**
@@ -209,23 +145,20 @@ Sources.ThreadsSidebarPane = class extends UI.VBox {
*/
_onExecutionContextChanged(event) {
var executionContext = /** @type {!SDK.ExecutionContext} */ (event.data);
- if (!executionContext.isDefault)
- return;
- var pendingTarget = this._targetToPending.get(executionContext.target());
- var listItem = this._pendingToListItem.get(pendingTarget);
- if (listItem && executionContext.label())
- listItem.setTitle(executionContext.label());
+ var target = executionContext.target();
+ var listItem = this._targetToListItem.get(target);
+ if (listItem)
+ listItem.setTitle(this._titleForTarget(target));
}
/**
- * @param {!SDK.PendingTarget} pendingTarget
+ * @param {!SDK.Target} target
*/
- _updateDebuggerState(pendingTarget) {
- var listItem = this._pendingToListItem.get(pendingTarget);
- var target = pendingTarget.target();
- var debuggerModel = target && SDK.DebuggerModel.fromTarget(target);
- var isPaused = !!debuggerModel && debuggerModel.isPaused();
- listItem.setSubtitle(Common.UIString(isPaused ? 'paused' : ''));
+ _updateDebuggerState(target) {
+ var listItem = this._targetToListItem.get(target);
+ var debuggerModel = SDK.DebuggerModel.fromTarget(target);
+ console.assert(debuggerModel);
+ listItem.setSubtitle(Common.UIString(debuggerModel.isPaused() ? 'paused' : ''));
}
/**
@@ -244,109 +177,12 @@ Sources.ThreadsSidebarPane = class extends UI.VBox {
/**
* @param {!Sources.UIList.Item} listItem
+ * @param {!SDK.Target} target
*/
- _onListItemClick(listItem) {
- var pendingTarget = listItem[Sources.ThreadsSidebarPane._pendingTargetSymbol];
- var target = pendingTarget.target();
- if (!target)
- return;
+ _onListItemClick(listItem, target) {
UI.context.setFlavor(SDK.Target, target);
listItem.element.scrollIntoViewIfNeeded();
}
-
- /**
- * @param {!Sources.UIList.Item} item
- * @param {!SDK.PendingTarget} pendingTarget
- */
- _updateListItem(item, pendingTarget) {
- item.setTitle(this._titleForPending(pendingTarget));
- item.setSubtitle('');
- var target = pendingTarget.target();
- var action = null;
- var actionLabel = null;
- if (pendingTarget.canConnect()) {
- actionLabel = target ? 'Disconnect' : 'Connect';
- action = this._toggleConnection.bind(this, pendingTarget);
- }
- item.setAction(actionLabel, action);
- item.setDimmed(!target);
- }
-
- /**
- * @param {!SDK.Target} target
- */
- _selectNewlyAddedTarget(target) {
- setTimeout(() => UI.context.setFlavor(SDK.Target, target));
- }
-
- /**
- * @param {!SDK.PendingTarget} pendingTarget
- * @return {!Promise}
- */
- _toggleConnection(pendingTarget) {
- var target = pendingTarget.target();
- if (target)
- return pendingTarget.detach();
- else
- return pendingTarget.attach().then(target => this._selectNewlyAddedTarget(target));
- }
-
- /**
- * @param {!SDK.PendingTarget} pendingTarget
- */
- _targetRemoved(pendingTarget) {
- var item = this._pendingToListItem.get(pendingTarget);
- if (!item) // Not all targets are represented in the UI.
- return;
- var target = item[Sources.ThreadsSidebarPane._targetSymbol];
- item[Sources.ThreadsSidebarPane._targetSymbol] = null;
- this._targetToPending.remove(target);
- if (pendingTarget.canConnect())
- this._updateListItem(item, pendingTarget);
- else
- this._removeListItem(pendingTarget);
- }
-
- /**
- * @param {!SDK.PendingTarget} pendingTarget
- */
- _removeListItem(pendingTarget) {
- var item = this._pendingToListItem.get(pendingTarget);
- if (!item)
- return;
- this.threadList.removeItem(item);
- this._pendingToListItem.delete(pendingTarget);
- }
};
-Sources.ThreadsSidebarPane._pendingTargetSymbol = Symbol('_subtargetSymbol');
Sources.ThreadsSidebarPane._targetSymbol = Symbol('_targetSymbol');
-
-/**
- * @unrestricted
- */
-Sources.ThreadsSidebarPane.MainTargetConnection = class extends SDK.PendingTarget {
- /**
- * @param {!SDK.Target} target
- */
- constructor(target) {
- super('main-target-list-node-' + target.id(), target.title, false, null);
- this._target = target;
- }
-
- /**
- * @override
- * @return {!SDK.Target}
- */
- target() {
- return this._target;
- }
-
- /**
- * @override
- * @return {string}
- */
- name() {
- return this._target.name();
- }
-};
« no previous file with comments | « third_party/WebKit/Source/devtools/front_end/sources/SourcesPanel.js ('k') | third_party/WebKit/Source/devtools/front_end/sources/sourcesPanel.css » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698