| 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 58d8fc8d75a11051104bd4be131ffaec4c41c18a..25da14ff70a15abb5b3617ff559b7925f89ce8c7 100644
|
| --- a/third_party/WebKit/Source/devtools/front_end/sources/ThreadsSidebarPane.js
|
| +++ b/third_party/WebKit/Source/devtools/front_end/sources/ThreadsSidebarPane.js
|
| @@ -2,47 +2,47 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
| /**
|
| - * @implements {WebInspector.TargetManager.Observer}
|
| + * @implements {SDK.TargetManager.Observer}
|
| * @unrestricted
|
| */
|
| -WebInspector.ThreadsSidebarPane = class extends WebInspector.VBox {
|
| +Sources.ThreadsSidebarPane = class extends UI.VBox {
|
| constructor() {
|
| super();
|
|
|
| - /** @type {?WebInspector.UIList.Item} */
|
| + /** @type {?Sources.UIList.Item} */
|
| this._selectedListItem = null;
|
| - /** @type {!Map<!WebInspector.PendingTarget, !WebInspector.UIList.Item>} */
|
| + /** @type {!Map<!SDK.PendingTarget, !Sources.UIList.Item>} */
|
| this._pendingToListItem = new Map();
|
| - /** @type {!Map<!WebInspector.Target, !WebInspector.PendingTarget>} */
|
| + /** @type {!Map<!SDK.Target, !SDK.PendingTarget>} */
|
| this._targetToPending = new Map();
|
| - /** @type {?WebInspector.PendingTarget} */
|
| + /** @type {?SDK.PendingTarget} */
|
| this._mainTargetPending = null;
|
| - this.threadList = new WebInspector.UIList();
|
| + this.threadList = new Sources.UIList();
|
| this.threadList.show(this.element);
|
| - WebInspector.targetManager.addModelListener(
|
| - WebInspector.DebuggerModel, WebInspector.DebuggerModel.Events.DebuggerPaused, this._onDebuggerStateChanged,
|
| + SDK.targetManager.addModelListener(
|
| + SDK.DebuggerModel, SDK.DebuggerModel.Events.DebuggerPaused, this._onDebuggerStateChanged,
|
| this);
|
| - WebInspector.targetManager.addModelListener(
|
| - WebInspector.DebuggerModel, WebInspector.DebuggerModel.Events.DebuggerResumed, this._onDebuggerStateChanged,
|
| + SDK.targetManager.addModelListener(
|
| + SDK.DebuggerModel, SDK.DebuggerModel.Events.DebuggerResumed, this._onDebuggerStateChanged,
|
| this);
|
| - WebInspector.targetManager.addModelListener(
|
| - WebInspector.RuntimeModel, WebInspector.RuntimeModel.Events.ExecutionContextChanged,
|
| + SDK.targetManager.addModelListener(
|
| + SDK.RuntimeModel, SDK.RuntimeModel.Events.ExecutionContextChanged,
|
| this._onExecutionContextChanged, this);
|
| - WebInspector.context.addFlavorChangeListener(WebInspector.Target, this._targetChanged, this);
|
| - WebInspector.targetManager.addEventListener(
|
| - WebInspector.TargetManager.Events.NameChanged, this._targetNameChanged, this);
|
| - WebInspector.targetManager.addModelListener(WebInspector.SubTargetsManager, WebInspector.SubTargetsManager.Events.PendingTargetAdded, this._addTargetItem, this);
|
| - WebInspector.targetManager.addModelListener(WebInspector.SubTargetsManager, WebInspector.SubTargetsManager.Events.PendingTargetRemoved, this._pendingTargetRemoved, this);
|
| - WebInspector.targetManager.addModelListener(WebInspector.SubTargetsManager, WebInspector.SubTargetsManager.Events.PendingTargetAttached, this._addTargetItem, this);
|
| - WebInspector.targetManager.addModelListener(WebInspector.SubTargetsManager, WebInspector.SubTargetsManager.Events.PendingTargetDetached, this._targetDetached, this);
|
| - WebInspector.targetManager.observeTargets(this);
|
| + 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 WebInspector.targetManager.targets(WebInspector.Target.Capability.Target))
|
| - pendingTargets = pendingTargets.concat(WebInspector.SubTargetsManager.fromTarget(target).pendingTargets());
|
| + for (var target of SDK.targetManager.targets(SDK.Target.Capability.Target))
|
| + pendingTargets = pendingTargets.concat(SDK.SubTargetsManager.fromTarget(target).pendingTargets());
|
|
|
| pendingTargets
|
| - .sort(WebInspector.ThreadsSidebarPane._pendingTargetsComparator)
|
| + .sort(Sources.ThreadsSidebarPane._pendingTargetsComparator)
|
| .forEach(pendingTarget => this._addListItem(pendingTarget));
|
| }
|
|
|
| @@ -50,10 +50,10 @@ WebInspector.ThreadsSidebarPane = class extends WebInspector.VBox {
|
| * @return {boolean}
|
| */
|
| static shouldBeShown() {
|
| - if (WebInspector.targetManager.targets(WebInspector.Target.Capability.JS).length > 1)
|
| + if (SDK.targetManager.targets(SDK.Target.Capability.JS).length > 1)
|
| return true;
|
| - for (var target of WebInspector.targetManager.targets(WebInspector.Target.Capability.Target)) {
|
| - var pendingTargets = WebInspector.SubTargetsManager.fromTarget(target).pendingTargets();
|
| + 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;
|
| }
|
| @@ -63,8 +63,8 @@ WebInspector.ThreadsSidebarPane = class extends WebInspector.VBox {
|
| /**
|
| * Sorts show tha connected targets appear first, followed by pending subtargets.
|
| *
|
| - * @param {!WebInspector.PendingTarget} c1
|
| - * @param {!WebInspector.PendingTarget} c2
|
| + * @param {!SDK.PendingTarget} c1
|
| + * @param {!SDK.PendingTarget} c2
|
| * @return {number}
|
| */
|
| static _pendingTargetsComparator(c1, c2)
|
| @@ -82,28 +82,28 @@ WebInspector.ThreadsSidebarPane = class extends WebInspector.VBox {
|
| }
|
|
|
| /**
|
| - * @param {!WebInspector.Event} event
|
| + * @param {!Common.Event} event
|
| */
|
| _addTargetItem(event) {
|
| - this._addListItem(/** @type {!WebInspector.PendingTarget} */ (event.data));
|
| + this._addListItem(/** @type {!SDK.PendingTarget} */ (event.data));
|
| }
|
|
|
| /**
|
| - * @param {!WebInspector.Event} event
|
| + * @param {!Common.Event} event
|
| */
|
| _pendingTargetRemoved(event) {
|
| - this._removeListItem(/** @type {!WebInspector.PendingTarget} */ (event.data));
|
| + this._removeListItem(/** @type {!SDK.PendingTarget} */ (event.data));
|
| }
|
|
|
| /**
|
| - * @param {!WebInspector.Event} event
|
| + * @param {!Common.Event} event
|
| */
|
| _targetDetached(event) {
|
| - this._targetRemoved(/** @type {!WebInspector.PendingTarget} */ (event.data));
|
| + this._targetRemoved(/** @type {!SDK.PendingTarget} */ (event.data));
|
| }
|
|
|
| /**
|
| - * @param {!WebInspector.PendingTarget} pendingTarget
|
| + * @param {!SDK.PendingTarget} pendingTarget
|
| */
|
| _addListItem(pendingTarget) {
|
| var target = pendingTarget.target();
|
| @@ -112,16 +112,16 @@ WebInspector.ThreadsSidebarPane = class extends WebInspector.VBox {
|
|
|
| var listItem = this._pendingToListItem.get(pendingTarget);
|
| if (!listItem) {
|
| - listItem = new WebInspector.UIList.Item('', '', false);
|
| - listItem[WebInspector.ThreadsSidebarPane._pendingTargetSymbol] = pendingTarget;
|
| - listItem[WebInspector.ThreadsSidebarPane._targetSymbol] = target;
|
| + 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 = WebInspector.context.flavor(WebInspector.Target);
|
| + var currentTarget = UI.context.flavor(SDK.Target);
|
| if (currentTarget === target)
|
| this._selectListItem(listItem);
|
| if (target)
|
| @@ -130,55 +130,55 @@ WebInspector.ThreadsSidebarPane = class extends WebInspector.VBox {
|
|
|
| /**
|
| * @override
|
| - * @param {!WebInspector.Target} target
|
| + * @param {!SDK.Target} target
|
| */
|
| targetAdded(target) {
|
| - if (target !== WebInspector.targetManager.mainTarget())
|
| + if (target !== SDK.targetManager.mainTarget())
|
| return;
|
| console.assert(!this._mainTargetPending);
|
| - this._mainTargetPending = new WebInspector.ThreadsSidebarPane.MainTargetConnection(target);
|
| + this._mainTargetPending = new Sources.ThreadsSidebarPane.MainTargetConnection(target);
|
| this._addListItem(this._mainTargetPending);
|
| }
|
|
|
| /**
|
| * @override
|
| - * @param {!WebInspector.Target} target
|
| + * @param {!SDK.Target} target
|
| */
|
| targetRemoved(target) {
|
| - var subtargetManager = WebInspector.SubTargetsManager.fromTarget(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 === WebInspector.targetManager.mainTarget() && this._mainTargetPending) {
|
| + if (target === SDK.targetManager.mainTarget() && this._mainTargetPending) {
|
| this._targetRemoved(this._mainTargetPending);
|
| this._mainTargetPending = null;
|
| }
|
| }
|
|
|
| /**
|
| - * @param {!WebInspector.Event} event
|
| + * @param {!Common.Event} event
|
| */
|
| _targetNameChanged(event) {
|
| - var target = /** @type {!WebInspector.Target} */ (event.data);
|
| + var target = /** @type {!SDK.Target} */ (event.data);
|
| var listItem = this._listItemForTarget(target);
|
| if (listItem)
|
| listItem.setTitle(this._titleForPending(this._targetToPending.get(target)));
|
| }
|
|
|
| /**
|
| - * @param {!WebInspector.Event} event
|
| + * @param {!Common.Event} event
|
| */
|
| _targetChanged(event) {
|
| - var listItem = this._listItemForTarget(/** @type {!WebInspector.Target} */ (event.data));
|
| + var listItem = this._listItemForTarget(/** @type {!SDK.Target} */ (event.data));
|
| if (listItem)
|
| this._selectListItem(listItem);
|
| }
|
|
|
| /**
|
| - * @param {!WebInspector.Target} target
|
| - * @return {?WebInspector.UIList.Item}
|
| + * @param {!SDK.Target} target
|
| + * @return {?Sources.UIList.Item}
|
| */
|
| _listItemForTarget(target) {
|
| var pendingTarget = this._targetToPending.get(target);
|
| @@ -186,7 +186,7 @@ WebInspector.ThreadsSidebarPane = class extends WebInspector.VBox {
|
| }
|
|
|
| /**
|
| - * @param {!WebInspector.PendingTarget} pendingTarget
|
| + * @param {!SDK.PendingTarget} pendingTarget
|
| * @return {string}
|
| */
|
| _titleForPending(pendingTarget) {
|
| @@ -198,19 +198,19 @@ WebInspector.ThreadsSidebarPane = class extends WebInspector.VBox {
|
| }
|
|
|
| /**
|
| - * @param {!WebInspector.Event} event
|
| + * @param {!Common.Event} event
|
| */
|
| _onDebuggerStateChanged(event) {
|
| - var debuggerModel = /** @type {!WebInspector.DebuggerModel} */ (event.target);
|
| + var debuggerModel = /** @type {!SDK.DebuggerModel} */ (event.target);
|
| var pendingTarget = this._targetToPending.get(debuggerModel.target());
|
| this._updateDebuggerState(pendingTarget);
|
| }
|
|
|
| /**
|
| - * @param {!WebInspector.Event} event
|
| + * @param {!Common.Event} event
|
| */
|
| _onExecutionContextChanged(event) {
|
| - var executionContext = /** @type {!WebInspector.ExecutionContext} */ (event.data);
|
| + var executionContext = /** @type {!SDK.ExecutionContext} */ (event.data);
|
| if (!executionContext.isDefault)
|
| return;
|
| var pendingTarget = this._targetToPending.get(executionContext.target());
|
| @@ -220,18 +220,18 @@ WebInspector.ThreadsSidebarPane = class extends WebInspector.VBox {
|
| }
|
|
|
| /**
|
| - * @param {!WebInspector.PendingTarget} pendingTarget
|
| + * @param {!SDK.PendingTarget} pendingTarget
|
| */
|
| _updateDebuggerState(pendingTarget) {
|
| var listItem = this._pendingToListItem.get(pendingTarget);
|
| var target = pendingTarget.target();
|
| - var debuggerModel = target && WebInspector.DebuggerModel.fromTarget(target);
|
| + var debuggerModel = target && SDK.DebuggerModel.fromTarget(target);
|
| var isPaused = !!debuggerModel && debuggerModel.isPaused();
|
| - listItem.setSubtitle(WebInspector.UIString(isPaused ? 'paused' : ''));
|
| + listItem.setSubtitle(Common.UIString(isPaused ? 'paused' : ''));
|
| }
|
|
|
| /**
|
| - * @param {!WebInspector.UIList.Item} listItem
|
| + * @param {!Sources.UIList.Item} listItem
|
| */
|
| _selectListItem(listItem) {
|
| if (listItem === this._selectedListItem)
|
| @@ -245,20 +245,20 @@ WebInspector.ThreadsSidebarPane = class extends WebInspector.VBox {
|
| }
|
|
|
| /**
|
| - * @param {!WebInspector.UIList.Item} listItem
|
| + * @param {!Sources.UIList.Item} listItem
|
| */
|
| _onListItemClick(listItem) {
|
| - var pendingTarget = listItem[WebInspector.ThreadsSidebarPane._pendingTargetSymbol];
|
| + var pendingTarget = listItem[Sources.ThreadsSidebarPane._pendingTargetSymbol];
|
| var target = pendingTarget.target();
|
| if (!target)
|
| return;
|
| - WebInspector.context.setFlavor(WebInspector.Target, target);
|
| + UI.context.setFlavor(SDK.Target, target);
|
| listItem.element.scrollIntoViewIfNeeded();
|
| }
|
|
|
| /**
|
| - * @param {!WebInspector.UIList.Item} item
|
| - * @param {!WebInspector.PendingTarget} pendingTarget
|
| + * @param {!Sources.UIList.Item} item
|
| + * @param {!SDK.PendingTarget} pendingTarget
|
| */
|
| _updateListItem(item, pendingTarget) {
|
| item.setTitle(this._titleForPending(pendingTarget));
|
| @@ -275,14 +275,14 @@ WebInspector.ThreadsSidebarPane = class extends WebInspector.VBox {
|
| }
|
|
|
| /**
|
| - * @param {!WebInspector.Target} target
|
| + * @param {!SDK.Target} target
|
| */
|
| _selectNewlyAddedTarget(target) {
|
| - setTimeout(() => WebInspector.context.setFlavor(WebInspector.Target, target));
|
| + setTimeout(() => UI.context.setFlavor(SDK.Target, target));
|
| }
|
|
|
| /**
|
| - * @param {!WebInspector.PendingTarget} pendingTarget
|
| + * @param {!SDK.PendingTarget} pendingTarget
|
| * @return {!Promise}
|
| */
|
| _toggleConnection(pendingTarget) {
|
| @@ -294,14 +294,14 @@ WebInspector.ThreadsSidebarPane = class extends WebInspector.VBox {
|
| }
|
|
|
| /**
|
| - * @param {!WebInspector.PendingTarget} pendingTarget
|
| + * @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[WebInspector.ThreadsSidebarPane._targetSymbol];
|
| - item[WebInspector.ThreadsSidebarPane._targetSymbol] = null;
|
| + var target = item[Sources.ThreadsSidebarPane._targetSymbol];
|
| + item[Sources.ThreadsSidebarPane._targetSymbol] = null;
|
| this._targetToPending.remove(target);
|
| if (pendingTarget.canConnect())
|
| this._updateListItem(item, pendingTarget);
|
| @@ -310,7 +310,7 @@ WebInspector.ThreadsSidebarPane = class extends WebInspector.VBox {
|
| }
|
|
|
| /**
|
| - * @param {!WebInspector.PendingTarget} pendingTarget
|
| + * @param {!SDK.PendingTarget} pendingTarget
|
| */
|
| _removeListItem(pendingTarget) {
|
| var item = this._pendingToListItem.get(pendingTarget);
|
| @@ -321,15 +321,15 @@ WebInspector.ThreadsSidebarPane = class extends WebInspector.VBox {
|
| }
|
| };
|
|
|
| -WebInspector.ThreadsSidebarPane._pendingTargetSymbol = Symbol('_subtargetSymbol');
|
| -WebInspector.ThreadsSidebarPane._targetSymbol = Symbol('_targetSymbol');
|
| +Sources.ThreadsSidebarPane._pendingTargetSymbol = Symbol('_subtargetSymbol');
|
| +Sources.ThreadsSidebarPane._targetSymbol = Symbol('_targetSymbol');
|
|
|
| /**
|
| * @unrestricted
|
| */
|
| -WebInspector.ThreadsSidebarPane.MainTargetConnection = class extends WebInspector.PendingTarget {
|
| +Sources.ThreadsSidebarPane.MainTargetConnection = class extends SDK.PendingTarget {
|
| /**
|
| - * @param {!WebInspector.Target} target
|
| + * @param {!SDK.Target} target
|
| */
|
| constructor(target) {
|
| super('main-target-list-node-' + target.id(), target.title, false, null);
|
| @@ -338,7 +338,7 @@ WebInspector.ThreadsSidebarPane.MainTargetConnection = class extends WebInspecto
|
|
|
| /**
|
| * @override
|
| - * @return {!WebInspector.Target}
|
| + * @return {!SDK.Target}
|
| */
|
| target() {
|
| return this._target;
|
|
|