Skip to content

Commit faf51da

Browse files
darwindarwin
committed
squash 'resources/unpacked/devtools' changes from 7a4580b..8f5fe51
8f5fe51 Exposes the resource type of an intercepted resource aedf8f1 DevTools: Add keyboard focus highlight when focusing window c3cf6b3 Revert "[DevTools] Display usage & quota information" 00fca8f DevTools: Promisify DOMDebugger protocol domain. 55bec15 DevTools: move styles sidebar toolbar into StylesSidebarPane f437817 DevTools: allow setting individual console filter levels. f0d250d [DevTools] Display usage & quota information 33413c0 DevTools: Promisify CSS protocol domain. a073969 [DevTools] Make UI.ListModel more array-like and iterable d498fe3 DevTools: update text inputs to new style cdb324c DevTools: update buttons to new style d03677a DevTools: jsdoc for showToolbarPane in Elements 1b3e4c2 Timeline: add shortcuts for showing prev/next recordings f4e6cd3 DevTools: update dropdowns to new style ff98574 DevTools: fix BUILD.gn for network_priorities_module git-subtree-dir: resources/unpacked/devtools git-subtree-split: 8f5fe51
1 parent 079e8ef commit faf51da

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+787
-809
lines changed

‎BUILD.gn

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -890,6 +890,7 @@ generated_resources = [
890890
"$resources_out_dir/layer_viewer/layer_viewer_module.js",
891891
"$resources_out_dir/layers/layers_module.js",
892892
"$resources_out_dir/network/network_module.js",
893+
"$resources_out_dir/network_priorities/network_priorities_module.js",
893894
"$resources_out_dir/object_ui/object_ui_module.js",
894895
"$resources_out_dir/perf_ui/perf_ui_module.js",
895896
"$resources_out_dir/profiler/profiler_module.js",

‎front_end/Tests.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -847,10 +847,10 @@
847847

848848
function onExecutionContexts() {
849849
var consoleView = Console.ConsoleView.instance();
850-
var items = consoleView._consoleContextSelector._items;
850+
var selector = consoleView._consoleContextSelector;
851851
var values = [];
852-
for (var i = 0; i < items.length(); ++i)
853-
values.push(consoleView._consoleContextSelector._titleFor(items.itemAtIndex(i)));
852+
for (var item of selector._items)
853+
values.push(selector._titleFor(item));
854854
test.assertEquals('top', values[0]);
855855
test.assertEquals('Simple content script', values[1]);
856856
test.releaseControl();

‎front_end/audits2/Audits2Panel.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ Audits2.Audits2Panel = class extends UI.PanelWithSidebar {
159159
'click', () => InspectorFrontendHost.openInNewTab('https://developers.google.com/web/tools/lighthouse/'));
160160

161161
var newButton = UI.createTextButton(
162-
Common.UIString('Perform an audit\u2026'), this._showLauncherUI.bind(this), 'material-button default');
162+
Common.UIString('Perform an audit\u2026'), this._showLauncherUI.bind(this), '', true /* primary */);
163163
landingCenter.appendChild(newButton);
164164
this.setDefaultFocusedElement(newButton);
165165
}
@@ -190,10 +190,10 @@ Audits2.Audits2Panel = class extends UI.PanelWithSidebar {
190190

191191
var buttonsRow = uiElement.createChild('div', 'audits2-dialog-buttons hbox');
192192
this._startButton =
193-
UI.createTextButton(Common.UIString('Run audit'), this._start.bind(this), 'material-button default');
193+
UI.createTextButton(Common.UIString('Run audit'), this._start.bind(this), '', true /* primary */);
194194
this._updateStartButtonEnabled();
195195
buttonsRow.appendChild(this._startButton);
196-
this._cancelButton = UI.createTextButton(Common.UIString('Cancel'), this._cancel.bind(this), 'material-button');
196+
this._cancelButton = UI.createTextButton(Common.UIString('Cancel'), this._cancel.bind(this));
197197
buttonsRow.appendChild(this._cancelButton);
198198

199199
this._dialog.setSizeBehavior(UI.GlassPane.SizeBehavior.SetExactWidthMaxHeight);

‎front_end/bindings/StylesSourceMapping.js

Lines changed: 6 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -218,28 +218,17 @@ Bindings.StylesSourceMapping = class {
218218
* @param {boolean} majorChange
219219
* @return {!Promise<?string>}
220220
*/
221-
_setStyleContent(uiSourceCode, content, majorChange) {
221+
async _setStyleContent(uiSourceCode, content, majorChange) {
222222
var styleSheetIds = this._cssModel.styleSheetIdsForURL(uiSourceCode.url());
223223
if (!styleSheetIds.length)
224-
return Promise.resolve(/** @type {?string} */ ('No stylesheet found: ' + uiSourceCode.url()));
225-
224+
return 'No stylesheet found: ' + uiSourceCode.url();
226225
this._isSettingContent = true;
226+
var promises = styleSheetIds.map(id => this._cssModel.setStyleSheetText(id, content, majorChange));
227227

228-
/**
229-
* @param {?string} error
230-
* @this {Bindings.StylesSourceMapping}
231-
* @return {?string}
232-
*/
233-
function callback(error) {
234-
delete this._isSettingContent;
235-
return error || null;
236-
}
237-
238-
var promises = [];
239-
for (var i = 0; i < styleSheetIds.length; ++i)
240-
promises.push(this._cssModel.setStyleSheetText(styleSheetIds[i], content, majorChange));
228+
var results = await Promise.all(promises);
241229

242-
return Promise.all(promises).spread(callback.bind(this));
230+
delete this._isSettingContent;
231+
return results.find(error => !!error);
243232
}
244233

245234
/**

‎front_end/color_picker/Spectrum.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,8 @@ ColorPicker.Spectrum = class extends UI.VBox {
8585
this._displayContainer = this.contentElement.createChild('div', 'spectrum-text source-code');
8686
this._textValues = [];
8787
for (var i = 0; i < 4; ++i) {
88-
var inputValue = this._displayContainer.createChild('input', 'spectrum-text-value');
88+
var inputValue = UI.createInput('spectrum-text-value');
89+
this._displayContainer.appendChild(inputValue);
8990
inputValue.maxLength = 4;
9091
this._textValues.push(inputValue);
9192
inputValue.addEventListener('keydown', this._inputChanged.bind(this), false);
@@ -97,7 +98,8 @@ ColorPicker.Spectrum = class extends UI.VBox {
9798

9899
// HEX display.
99100
this._hexContainer = this.contentElement.createChild('div', 'spectrum-text spectrum-text-hex source-code');
100-
this._hexValue = this._hexContainer.createChild('input', 'spectrum-text-value');
101+
this._hexValue = UI.createInput('spectrum-text-value');
102+
this._hexContainer.appendChild(this._hexValue);
101103
this._hexValue.maxLength = 7;
102104
this._hexValue.addEventListener('keydown', this._inputChanged.bind(this), false);
103105
this._hexValue.addEventListener('input', this._inputChanged.bind(this), false);

‎front_end/console/ConsoleContextSelector.js

Lines changed: 24 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ Console.ConsoleContextSelector = class {
9999
}
100100

101101
_updateGlasspaneSize() {
102-
var maxHeight = this._rowHeight * (Math.min(this._items.length(), 9));
102+
var maxHeight = this._rowHeight * (Math.min(this._items.length, 9));
103103
this._glassPane.setMaxContentSize(new UI.Size(315, maxHeight));
104104
this._list.viewportResized();
105105
}
@@ -130,7 +130,7 @@ Console.ConsoleContextSelector = class {
130130
var currentExecutionContext = this._list.selectedItem();
131131
if (!currentExecutionContext)
132132
break;
133-
var nextExecutionContext = this._items.itemAtIndex(this._list.selectedIndex() + 1);
133+
var nextExecutionContext = this._items.at(this._list.selectedIndex() + 1);
134134
if (nextExecutionContext && this._depthFor(currentExecutionContext) < this._depthFor(nextExecutionContext))
135135
handled = this._list.selectNextItem(false, false);
136136
break;
@@ -140,9 +140,9 @@ Console.ConsoleContextSelector = class {
140140
break;
141141
var depth = this._depthFor(currentExecutionContext);
142142
for (var i = this._list.selectedIndex() - 1; i >= 0; i--) {
143-
if (this._depthFor(this._items.itemAtIndex(i)) < depth) {
143+
if (this._depthFor(this._items.at(i)) < depth) {
144144
handled = true;
145-
this._list.selectItem(this._items.itemAtIndex(i), false);
145+
this._list.selectItem(this._items.at(i), false);
146146
break;
147147
}
148148
}
@@ -154,18 +154,18 @@ Console.ConsoleContextSelector = class {
154154
handled = this._list.selectItemNextPage(false);
155155
break;
156156
case 'Home':
157-
for (var i = 0; i < this._items.length(); i++) {
158-
if (this.isItemSelectable(this._items.itemAtIndex(i))) {
159-
this._list.selectItem(this._items.itemAtIndex(i));
157+
for (var i = 0; i < this._items.length; i++) {
158+
if (this.isItemSelectable(this._items.at(i))) {
159+
this._list.selectItem(this._items.at(i));
160160
handled = true;
161161
break;
162162
}
163163
}
164164
break;
165165
case 'End':
166-
for (var i = this._items.length() - 1; i >= 0; i--) {
167-
if (this.isItemSelectable(this._items.itemAtIndex(i))) {
168-
this._list.selectItem(this._items.itemAtIndex(i));
166+
for (var i = this._items.length - 1; i >= 0; i--) {
167+
if (this.isItemSelectable(this._items.at(i))) {
168+
this._list.selectItem(this._items.at(i));
169169
handled = true;
170170
break;
171171
}
@@ -195,8 +195,8 @@ Console.ConsoleContextSelector = class {
195195
if (event.key.length === 1) {
196196
var selectedIndex = this._list.selectedIndex();
197197
var letter = event.key.toUpperCase();
198-
for (var i = 0; i < this._items.length(); i++) {
199-
var context = this._items.itemAtIndex((selectedIndex + i + 1) % this._items.length());
198+
for (var i = 0; i < this._items.length; i++) {
199+
var context = this._items.at((selectedIndex + i + 1) % this._items.length);
200200
if (this._titleFor(context).toUpperCase().startsWith(letter)) {
201201
this._list.selectItem(context);
202202
break;
@@ -299,7 +299,7 @@ Console.ConsoleContextSelector = class {
299299
if (!executionContext.target().hasJSCapability())
300300
return;
301301

302-
this._items.insertItemWithComparator(executionContext, executionContext.runtimeModel.executionContextComparator());
302+
this._items.insertWithComparator(executionContext, executionContext.runtimeModel.executionContextComparator());
303303

304304
if (executionContext === UI.context.flavor(SDK.ExecutionContext))
305305
this._updateSelectionTitle();
@@ -320,7 +320,7 @@ Console.ConsoleContextSelector = class {
320320
*/
321321
_onExecutionContextChanged(event) {
322322
var executionContext = /** @type {!SDK.ExecutionContext} */ (event.data);
323-
if (this._items.indexOfItem(executionContext) === -1)
323+
if (this._items.indexOf(executionContext) === -1)
324324
return;
325325
this._executionContextDestroyed(executionContext);
326326
this._executionContextCreated(executionContext);
@@ -331,10 +331,11 @@ Console.ConsoleContextSelector = class {
331331
* @param {!SDK.ExecutionContext} executionContext
332332
*/
333333
_executionContextDestroyed(executionContext) {
334-
if (this._items.indexOfItem(executionContext) === -1)
334+
var index = this._items.indexOf(executionContext);
335+
if (index === -1)
335336
return;
336337
this._disposeExecutionContextBadge(executionContext);
337-
this._items.removeItem(executionContext);
338+
this._items.remove(index);
338339
this._updateGlasspaneSize();
339340
}
340341

@@ -352,7 +353,7 @@ Console.ConsoleContextSelector = class {
352353
*/
353354
_executionContextChangedExternally(event) {
354355
var executionContext = /** @type {?SDK.ExecutionContext} */ (event.data);
355-
if (!executionContext || this._items.indexOfItem(executionContext) === -1)
356+
if (!executionContext || this._items.indexOf(executionContext) === -1)
356357
return;
357358
this._list.selectItem(executionContext);
358359
this._updateSelectedContext();
@@ -386,11 +387,7 @@ Console.ConsoleContextSelector = class {
386387
* @return {boolean}
387388
*/
388389
_hasTopContext() {
389-
for (var i = 0; i < this._items.length(); i++) {
390-
if (this._isTopContext(this._items.itemAtIndex(i)))
391-
return true;
392-
}
393-
return false;
390+
return this._items.some(executionContext => this._isTopContext(executionContext));
394391
}
395392

396393
/**
@@ -406,9 +403,9 @@ Console.ConsoleContextSelector = class {
406403
* @param {!SDK.RuntimeModel} runtimeModel
407404
*/
408405
modelRemoved(runtimeModel) {
409-
for (var i = 0; i < this._items.length(); i++) {
410-
if (this._items.itemAtIndex(i).runtimeModel === runtimeModel)
411-
this._executionContextDestroyed(this._items.itemAtIndex(i));
406+
for (var i = 0; i < this._items.length; i++) {
407+
if (this._items.at(i).runtimeModel === runtimeModel)
408+
this._executionContextDestroyed(this._items.at(i));
412409
}
413410
}
414411

@@ -523,8 +520,7 @@ Console.ConsoleContextSelector = class {
523520
*/
524521
_callFrameSelectedInModel(event) {
525522
var debuggerModel = /** @type {!SDK.DebuggerModel} */ (event.data);
526-
for (var i = 0; i < this._items.length(); i++) {
527-
var executionContext = this._items.itemAtIndex(i);
523+
for (var executionContext of this._items) {
528524
if (executionContext.debuggerModel === debuggerModel) {
529525
this._disposeExecutionContextBadge(executionContext);
530526
this._list.refreshItem(executionContext);
@@ -537,8 +533,7 @@ Console.ConsoleContextSelector = class {
537533
*/
538534
_frameNavigated(event) {
539535
var frameId = event.data.id;
540-
for (var i = 0; i < this._items.length(); i++) {
541-
var executionContext = this._items.itemAtIndex(i);
536+
for (var executionContext of this._items) {
542537
if (frameId === executionContext.frameId) {
543538
this._disposeExecutionContextBadge(executionContext);
544539
this._list.refreshItem(executionContext);

‎front_end/console/ConsoleView.js

Lines changed: 92 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,8 @@ Console.ConsoleView = class extends UI.VBox {
7171
toolbar.appendToolbarItem(this._consoleContextSelector.toolbarItem());
7272
toolbar.appendSeparator();
7373
toolbar.appendToolbarItem(this._filter._textFilterUI);
74-
toolbar.appendToolbarItem(this._filter._levelComboBox);
74+
toolbar.appendToolbarItem(this._filter._levelMenuButton);
75+
toolbar.appendToolbarItem(this._filter._levelMenuButtonArrow);
7576
toolbar.appendToolbarItem(this._progressToolbarItem);
7677
toolbar.appendSpacer();
7778
toolbar.appendToolbarItem(this._filterStatusText);
@@ -1007,8 +1008,8 @@ Console.ConsoleViewFilter = class {
10071008
this._filterChanged = filterChangedCallback;
10081009

10091010
this._messageURLFiltersSetting = Common.settings.createSetting('messageURLFilters', {});
1010-
this._messageLevelFiltersSetting =
1011-
Common.settings.createSetting('messageLevelFilters2', ConsoleModel.ConsoleMessage.MessageLevel.Info);
1011+
this._messageLevelFiltersSetting = Console.ConsoleViewFilter.levelFilterSetting();
1012+
10121013
this._hideNetworkMessagesSetting = Common.moduleSetting('hideNetworkMessages');
10131014
this._filterByExecutionContextSetting = Common.moduleSetting('selectedContextFilterEnabled');
10141015
this._filterByConsoleAPISetting = Common.moduleSetting('consoleAPIFilterEnabled');
@@ -1022,15 +1023,92 @@ Console.ConsoleViewFilter = class {
10221023
this._textFilterUI = new UI.ToolbarInput(Common.UIString('Filter'), 0.2, 1, true);
10231024
this._textFilterUI.addEventListener(UI.ToolbarInput.Event.TextChanged, this._textFilterChanged, this);
10241025

1025-
var levels = [
1026-
{value: ConsoleModel.ConsoleMessage.MessageLevel.Verbose, label: Common.UIString('Verbose')},
1027-
{value: ConsoleModel.ConsoleMessage.MessageLevel.Info, label: Common.UIString('Info'), default: true},
1028-
{value: ConsoleModel.ConsoleMessage.MessageLevel.Warning, label: Common.UIString('Warnings')},
1029-
{value: ConsoleModel.ConsoleMessage.MessageLevel.Error, label: Common.UIString('Errors')}
1030-
];
1026+
this._levelLabels = {};
1027+
this._levelLabels[ConsoleModel.ConsoleMessage.MessageLevel.Verbose] = Common.UIString('Verbose');
1028+
this._levelLabels[ConsoleModel.ConsoleMessage.MessageLevel.Info] = Common.UIString('Info');
1029+
this._levelLabels[ConsoleModel.ConsoleMessage.MessageLevel.Warning] = Common.UIString('Warnings');
1030+
this._levelLabels[ConsoleModel.ConsoleMessage.MessageLevel.Error] = Common.UIString('Errors');
1031+
1032+
this._levelMenuButton = new UI.ToolbarText('');
1033+
this._levelMenuButtonArrow = new UI.ToolbarItem(UI.Icon.create('smallicon-triangle-down'));
1034+
this._levelMenuButton.element.addEventListener('click', this._showLevelContextMenu.bind(this));
1035+
this._levelMenuButtonArrow.element.addEventListener('click', this._showLevelContextMenu.bind(this));
1036+
1037+
this._updateLevelMenuButtonText();
1038+
this._messageLevelFiltersSetting.addChangeListener(this._updateLevelMenuButtonText.bind(this));
1039+
}
1040+
1041+
/**
1042+
* @return {!Common.Setting}
1043+
*/
1044+
static levelFilterSetting() {
1045+
return Common.settings.createSetting('messageLevelFilters', Console.ConsoleViewFilter.defaultLevelsFilterValue());
1046+
}
1047+
1048+
/**
1049+
* @return {!Object<string, boolean>}
1050+
*/
1051+
static allLevelsFilterValue() {
1052+
var result = {};
1053+
for (var name of Object.values(ConsoleModel.ConsoleMessage.MessageLevel))
1054+
result[name] = true;
1055+
return result;
1056+
}
1057+
1058+
/**
1059+
* @return {!Object<string, boolean>}
1060+
*/
1061+
static defaultLevelsFilterValue() {
1062+
var result = Console.ConsoleViewFilter.allLevelsFilterValue();
1063+
result[ConsoleModel.ConsoleMessage.MessageLevel.Verbose] = false;
1064+
return result;
1065+
}
1066+
1067+
_updateLevelMenuButtonText() {
1068+
var isAll = true;
1069+
var isDefault = true;
1070+
var allValue = Console.ConsoleViewFilter.allLevelsFilterValue();
1071+
var defaultValue = Console.ConsoleViewFilter.defaultLevelsFilterValue();
1072+
1073+
var text = null;
1074+
var levels = this._messageLevelFiltersSetting.get();
1075+
for (var name of Object.values(ConsoleModel.ConsoleMessage.MessageLevel)) {
1076+
isAll = isAll && levels[name] === allValue[name];
1077+
isDefault = isDefault && levels[name] === defaultValue[name];
1078+
if (levels[name])
1079+
text = text ? Common.UIString('Custom levels') : Common.UIString('%s only', this._levelLabels[name]);
1080+
}
1081+
if (isAll)
1082+
text = Common.UIString('All levels');
1083+
else if (isDefault)
1084+
text = Common.UIString('Default levels');
1085+
else
1086+
text = text || Common.UIString('Hide all');
1087+
this._levelMenuButton.setText(text);
1088+
}
1089+
1090+
/**
1091+
* @param {!Event} event
1092+
*/
1093+
_showLevelContextMenu(event) {
1094+
var setting = this._messageLevelFiltersSetting;
1095+
var levels = setting.get();
1096+
1097+
var contextMenu = new UI.ContextMenu(event, true);
1098+
contextMenu.appendItem(
1099+
Common.UIString('Default'), () => setting.set(Console.ConsoleViewFilter.defaultLevelsFilterValue()));
1100+
contextMenu.appendSeparator();
1101+
for (var level in this._levelLabels)
1102+
contextMenu.appendCheckboxItem(this._levelLabels[level], toggleShowLevel.bind(null, level), levels[level]);
1103+
contextMenu.show();
10311104

1032-
this._levelComboBox =
1033-
new UI.ToolbarSettingComboBox(levels, this._messageLevelFiltersSetting, Common.UIString('Level'));
1105+
/**
1106+
* @param {string} level
1107+
*/
1108+
function toggleShowLevel(level) {
1109+
levels[level] = !levels[level];
1110+
setting.set(levels);
1111+
}
10341112
}
10351113

10361114
_textFilterChanged() {
@@ -1104,9 +1182,8 @@ Console.ConsoleViewFilter = class {
11041182
if (message.url && this._messageURLFiltersSetting.get()[message.url])
11051183
return false;
11061184

1107-
var filterOrdinal = ConsoleModel.ConsoleMessage.MessageLevel.ordinal(
1108-
/** @type {!ConsoleModel.ConsoleMessage.MessageLevel} */ (this._messageLevelFiltersSetting.get()));
1109-
if (message.level && ConsoleModel.ConsoleMessage.MessageLevel.ordinal(message.level) < filterOrdinal)
1185+
var levels = this._messageLevelFiltersSetting.get();
1186+
if (!levels[message.level])
11101187
return false;
11111188

11121189
if (this._filterRegex) {
@@ -1126,7 +1203,7 @@ Console.ConsoleViewFilter = class {
11261203

11271204
reset() {
11281205
this._messageURLFiltersSetting.set({});
1129-
this._messageLevelFiltersSetting.set(ConsoleModel.ConsoleMessage.MessageLevel.Info);
1206+
this._messageLevelFiltersSetting.set(Console.ConsoleViewFilter.defaultLevelsFilterValue());
11301207
this._filterByExecutionContextSetting.set(false);
11311208
this._filterByConsoleAPISetting.set(false);
11321209
this._hideNetworkMessagesSetting.set(false);

0 commit comments

Comments
 (0)