Skip to content

Commit 699cf5a

Browse files
committed
squash 'resources/unpacked/devtools' changes from 8f5fe51..f044be5
f044be5 DevTools: Add setting to toggle default mouse wheel scroll/zoom flamechart behavior. ceced39 DevTools: support object destructuring in pretty print 8ecaab1 DevTools: Fix isCaretAtEndOfPrompt if ghost text is visible 89b7146 DevTools: remove stray error messages while devtools on devtools. 9a11b0d DevTools: Avoid reflow when selecting items in TreeOutline 29c0f8f ChromeDriver: Handle key events properly on Mac daf5c5e DevTools: add use strict in check gn 39dc3c9 DevTools: Account for border when measuring StylesSidebarPane section be7df7e DevTools: Clean up selection 26630bd DevTools: Make the performance recording 'Stop' button default. 49541bc Revert "DevTools: remove stray error messages while devtools on devtools." 42660a4 DevTools: migrate ComputedStyleWidget to shadow 312df77 DevTools: Promisify searchInContent calls. f3c2a82 DevTools: kill DebuggerWorkspaceBinding.{push,pop,set}SourceMapping ea2a4d8 DevTools: remove stray error messages while devtools on devtools. 7ac8e75 Timeline: fix saving when switching models trough history dialog 44b1ff8 DevTools: check BUILD.gn file as part of PRESUBMIT 8a42b07 Added refresh button to category view of cache storage and indexeddb 74345fa Right-click 'Refresh' on database now updates object store view, also fixed IndexedDB view crash. fd95b42 DevTools: remove UIString.capitalize. 1f347da DevTools: Avoid a race in WorkspaceDiff when UISourceCodes are removed 6b26576 Revert of [DevTools] Show icon in top toolbar when Node target is available (patchset #3 id:40001 of https://codereview.chromium.org/2890973002/ ) 514aac9 DevTools: Limit screenshot overview popover height. 3bb3592 DevTools: migrate MetricsSidebarPane to shadow 573c227 DevTools: reveal and highlight dom nodes when searching in elements panel. ba9bc87 DevTools: Extract formatter module 6c19df3 DevTools: rename Multimap.(remove|removeAll) into delete and deleteAll 9da32f8 DevTools: migrate SSP Classes and ElementState toolbar widgets to shadow 87b2fbd DevTools: make EventListenersView a proper widget a552498 DevTools: fix offset condition in console viewport _selectedText and add tests 3c20bd7 DevTools: Add close button to Audits2 dialog 68603e6 DevTools: linkify terminal errors in the term extension. 5b62640 DevTools: Promisify domains clean up git-subtree-dir: resources/unpacked/devtools git-subtree-split: f044be5
1 parent faf51da commit 699cf5a

File tree

142 files changed

+1559
-1712
lines changed

Some content is hidden

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

142 files changed

+1559
-1712
lines changed

Diff for: .eslintrc.js

-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ module.exports = {
3838
"markers": ["*"]
3939
}],
4040
"eqeqeq": [2],
41-
"arrow-body-style": [2, "as-needed"],
4241
"accessor-pairs": [2, {
4342
"getWithoutSet": false,
4443
"setWithoutGet": false

Diff for: BUILD.gn

+14-7
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,6 @@ all_devtools_files = [
109109
"front_end/common/Color.js",
110110
"front_end/common/Console.js",
111111
"front_end/common/ContentProvider.js",
112-
"front_end/common/FormatterWorkerPool.js",
113112
"front_end/common/module.json",
114113
"front_end/common/ModuleExtensionInterfaces.js",
115114
"front_end/common/Object.js",
@@ -171,22 +170,26 @@ all_devtools_files = [
171170
"front_end/dom_extension/DOMExtension.js",
172171
"front_end/dom_extension/module.json",
173172
"front_end/elements/breadcrumbs.css",
173+
"front_end/elements/classesPaneWidget.css",
174174
"front_end/elements/ClassesPaneWidget.js",
175175
"front_end/elements/ColorSwatchPopoverIcon.js",
176176
"front_end/elements/ComputedStyleModel.js",
177177
"front_end/elements/computedStyleSidebarPane.css",
178+
"front_end/elements/computedStyleWidgetTree.css",
178179
"front_end/elements/ComputedStyleWidget.js",
179180
"front_end/elements/ElementsBreadcrumbs.js",
180181
"front_end/elements/elementsPanel.css",
181182
"front_end/elements/ElementsPanel.js",
182183
"front_end/elements/ElementsSidebarPane.js",
184+
"front_end/elements/elementStatePaneWidget.css",
183185
"front_end/elements/ElementStatePaneWidget.js",
184186
"front_end/elements/ElementsTreeElement.js",
185187
"front_end/elements/ElementsTreeElementHighlighter.js",
186188
"front_end/elements/elementsTreeOutline.css",
187189
"front_end/elements/ElementsTreeOutline.js",
188190
"front_end/elements/EventListenersWidget.js",
189191
"front_end/elements/InspectElementModeController.js",
192+
"front_end/elements/metricsSidebarPane.css",
190193
"front_end/elements/MetricsSidebarPane.js",
191194
"front_end/elements/module.json",
192195
"front_end/elements/platformFontsWidget.css",
@@ -224,6 +227,9 @@ all_devtools_files = [
224227
"front_end/extensions/ExtensionServer.js",
225228
"front_end/extensions/ExtensionView.js",
226229
"front_end/extensions/module.json",
230+
"front_end/formatter/FormatterWorkerPool.js",
231+
"front_end/formatter/module.json",
232+
"front_end/formatter/ScriptFormatter.js",
227233
"front_end/formatter_worker.js",
228234
"front_end/formatter_worker.json",
229235
"front_end/formatter_worker/AcornTokenizer.js",
@@ -298,7 +304,6 @@ all_devtools_files = [
298304
"front_end/main/GCActionDelegate.js",
299305
"front_end/main/Main.js",
300306
"front_end/main/module.json",
301-
"front_end/main/nodeIcon.css",
302307
"front_end/main/remoteDebuggingTerminatedScreen.css",
303308
"front_end/main/renderingOptions.css",
304309
"front_end/main/RenderingOptions.js",
@@ -572,7 +577,6 @@ all_devtools_files = [
572577
"front_end/sources/RevisionHistoryView.js",
573578
"front_end/sources/scopeChainSidebarPane.css",
574579
"front_end/sources/ScopeChainSidebarPane.js",
575-
"front_end/sources/ScriptFormatter.js",
576580
"front_end/sources/ScriptFormatterEditorAction.js",
577581
"front_end/sources/serviceWorkersSidebar.css",
578582
"front_end/sources/SimpleHistoryManager.js",
@@ -815,7 +819,6 @@ devtools_image_files = [
815819
"front_end/Images/ic_warning_black_18dp.svg",
816820
"front_end/Images/navigationControls.png",
817821
"front_end/Images/navigationControls_2x.png",
818-
"front_end/Images/nodeIcon.png",
819822
"front_end/Images/popoverArrows.png",
820823
"front_end/Images/profileGroupIcon.png",
821824
"front_end/Images/profileIcon.png",
@@ -860,7 +863,7 @@ generated_scripts = [
860863
"$resources_out_dir/SupportedCSSProperties.js",
861864
]
862865

863-
generated_resources = [
866+
generated_applications = [
864867
"$resources_out_dir/inspector.html",
865868
"$resources_out_dir/inspector.js",
866869
"$resources_out_dir/toolbox.html",
@@ -869,8 +872,9 @@ generated_resources = [
869872
"$resources_out_dir/formatter_worker.js",
870873
"$resources_out_dir/heap_snapshot_worker.js",
871874
"$resources_out_dir/utility_shared_worker.js",
875+
]
872876

873-
# this contains non-autostart non-remote modules only.
877+
generated_non_autostart_non_remote_modules = [
874878
"$resources_out_dir/animation/animation_module.js",
875879
"$resources_out_dir/audits/audits_module.js",
876880
"$resources_out_dir/audits2/audits2_module.js",
@@ -885,6 +889,7 @@ generated_resources = [
885889
"$resources_out_dir/diff/diff_module.js",
886890
"$resources_out_dir/elements/elements_module.js",
887891
"$resources_out_dir/event_listeners/event_listeners_module.js",
892+
"$resources_out_dir/formatter/formatter_module.js",
888893
"$resources_out_dir/heap_snapshot_model/heap_snapshot_model_module.js",
889894
"$resources_out_dir/inline_editor/inline_editor_module.js",
890895
"$resources_out_dir/layer_viewer/layer_viewer_module.js",
@@ -902,13 +907,15 @@ generated_resources = [
902907
"$resources_out_dir/snippets/snippets_module.js",
903908
"$resources_out_dir/source_frame/source_frame_module.js",
904909
"$resources_out_dir/sources/sources_module.js",
905-
"$resources_out_dir/terminal/terminal_module.js",
906910
"$resources_out_dir/text_editor/text_editor_module.js",
907911
"$resources_out_dir/timeline_model/timeline_model_module.js",
908912
"$resources_out_dir/timeline/timeline_module.js",
909913
"$resources_out_dir/workspace_diff/workspace_diff_module.js",
910914
]
911915

916+
generated_resources =
917+
generated_applications + generated_non_autostart_non_remote_modules
918+
912919
generated_remote_modules = [
913920
"$resources_out_dir/accessibility/accessibility_module.js",
914921
"$resources_out_dir/audits2_worker/audits2_worker_module.js",

Diff for: PRESUBMIT.py

+21
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,26 @@ def _CheckNodeAndNPMModules(input_api, output_api):
4444
return [output_api.PresubmitNotifyResult(out)]
4545

4646

47+
def _CheckBuildGN(input_api, output_api):
48+
original_sys_path = sys.path
49+
try:
50+
sys.path = sys.path + [input_api.os_path.join(input_api.PresubmitLocalPath(), "scripts")]
51+
import install_node_deps
52+
finally:
53+
sys.path = original_sys_path
54+
55+
node_path, _ = install_node_deps.resolve_node_paths()
56+
57+
script_path = input_api.os_path.join(input_api.PresubmitLocalPath(), "scripts", "check_gn.js")
58+
process = input_api.subprocess.Popen(
59+
[node_path, script_path], stdout=input_api.subprocess.PIPE, stderr=input_api.subprocess.STDOUT)
60+
out, _ = process.communicate()
61+
62+
if process.returncode != 0:
63+
return [output_api.PresubmitError(out)]
64+
return [output_api.PresubmitNotifyResult(out)]
65+
66+
4767
def _CheckFormat(input_api, output_api):
4868

4969
def popen(args):
@@ -185,6 +205,7 @@ def _CheckCSSViolations(input_api, output_api):
185205
def CheckChangeOnUpload(input_api, output_api):
186206
results = []
187207
results.extend(_CheckNodeAndNPMModules(input_api, output_api))
208+
results.extend(_CheckBuildGN(input_api, output_api))
188209
results.extend(_CheckFormat(input_api, output_api))
189210
results.extend(_CheckDevtoolsStyle(input_api, output_api))
190211
results.extend(_CompileDevtoolsFrontend(input_api, output_api))

Diff for: front_end/Images/nodeIcon.png

-1.63 KB
Binary file not shown.

Diff for: front_end/Tests.js

+55
Original file line numberDiff line numberDiff line change
@@ -662,6 +662,61 @@
662662
step1();
663663
};
664664

665+
TestSuite.prototype.testDispatchKeyEventShowsAutoFill = function() {
666+
var test = this;
667+
var receivedReady = false;
668+
669+
function signalToShowAutofill() {
670+
SDK.targetManager.mainTarget().inputAgent().invoke_dispatchKeyEvent(
671+
{type: 'rawKeyDown', key: 'Down', windowsVirtualKeyCode: 40, nativeVirtualKeyCode: 40});
672+
SDK.targetManager.mainTarget().inputAgent().invoke_dispatchKeyEvent(
673+
{type: 'keyUp', key: 'Down', windowsVirtualKeyCode: 40, nativeVirtualKeyCode: 40});
674+
}
675+
676+
function selectTopAutoFill() {
677+
SDK.targetManager.mainTarget().inputAgent().invoke_dispatchKeyEvent(
678+
{type: 'rawKeyDown', key: 'Down', windowsVirtualKeyCode: 40, nativeVirtualKeyCode: 40});
679+
SDK.targetManager.mainTarget().inputAgent().invoke_dispatchKeyEvent(
680+
{type: 'keyUp', key: 'Down', windowsVirtualKeyCode: 40, nativeVirtualKeyCode: 40});
681+
SDK.targetManager.mainTarget().inputAgent().invoke_dispatchKeyEvent(
682+
{type: 'rawKeyDown', key: 'Enter', windowsVirtualKeyCode: 13, nativeVirtualKeyCode: 13});
683+
SDK.targetManager.mainTarget().inputAgent().invoke_dispatchKeyEvent(
684+
{type: 'keyUp', key: 'Enter', windowsVirtualKeyCode: 13, nativeVirtualKeyCode: 13});
685+
686+
test.evaluateInConsole_('document.getElementById("name").value', onResultOfInput);
687+
}
688+
689+
function onResultOfInput(value) {
690+
// Console adds "" around the response.
691+
test.assertEquals('"Abbf"', value);
692+
test.releaseControl();
693+
}
694+
695+
function onConsoleMessage(event) {
696+
var message = event.data.messageText;
697+
if (message === 'ready' && !receivedReady) {
698+
receivedReady = true;
699+
signalToShowAutofill();
700+
}
701+
// This log comes from the browser unittest code.
702+
if (message === 'didShowSuggestions')
703+
selectTopAutoFill();
704+
}
705+
706+
this.takeControl();
707+
708+
// It is possible for the ready console messagage to be already received but not handled
709+
// or received later. This ensures we can catch both cases.
710+
ConsoleModel.consoleModel.addEventListener(ConsoleModel.ConsoleModel.Events.MessageAdded, onConsoleMessage, this);
711+
712+
var messages = ConsoleModel.consoleModel.messages();
713+
if (messages.length) {
714+
var text = messages[0].messageText;
715+
this.assertEquals('ready', text);
716+
signalToShowAutofill();
717+
}
718+
};
719+
665720
TestSuite.prototype.testDispatchKeyEventDoesNotCrash = function() {
666721
SDK.targetManager.mainTarget().inputAgent().invoke_dispatchKeyEvent(
667722
{type: 'rawKeyDown', windowsVirtualKeyCode: 0x23, key: 'End'});

Diff for: front_end/audits/AuditRules.js

+9-9
Original file line numberDiff line numberDiff line change
@@ -484,7 +484,7 @@ Audits.AuditRules.UnusedCssRule = class extends Audits.AuditRule {
484484
};
485485

486486
/**
487-
* @typedef {!{sourceURL: string, rules: !Array.<!Common.FormatterWorkerPool.CSSStyleRule>}}
487+
* @typedef {!{sourceURL: string, rules: !Array.<!Formatter.FormatterWorkerPool.CSSStyleRule>}}
488488
*/
489489
Audits.AuditRules.ParsedStyleSheet;
490490

@@ -517,11 +517,11 @@ Audits.AuditRules.StyleSheetProcessor = class {
517517

518518
var allRules = [];
519519
this._currentStyleSheetHeader.requestContent().then(
520-
content => Common.formatterWorkerPool.parseCSS(content || '', onRulesParsed.bind(this)));
520+
content => Formatter.formatterWorkerPool().parseCSS(content || '', onRulesParsed.bind(this)));
521521

522522
/**
523523
* @param {boolean} isLastChunk
524-
* @param {!Array<!Common.FormatterWorkerPool.CSSRule>} rules
524+
* @param {!Array<!Formatter.FormatterWorkerPool.CSSRule>} rules
525525
* @this {Audits.AuditRules.StyleSheetProcessor}
526526
*/
527527
function onRulesParsed(isLastChunk, rules) {
@@ -532,7 +532,7 @@ Audits.AuditRules.StyleSheetProcessor = class {
532532
}
533533

534534
/**
535-
* @param {!Array.<!Common.FormatterWorkerPool.CSSRule>} rules
535+
* @param {!Array.<!Formatter.FormatterWorkerPool.CSSRule>} rules
536536
*/
537537
_onStyleSheetParsed(rules) {
538538
if (this._progress.isCanceled()) {
@@ -1205,7 +1205,7 @@ Audits.AuditRules.CSSRuleBase = class extends Audits.AuditRule {
12051205

12061206
/**
12071207
* @param {!Audits.AuditRules.ParsedStyleSheet} styleSheet
1208-
* @param {!Common.FormatterWorkerPool.CSSStyleRule} rule
1208+
* @param {!Formatter.FormatterWorkerPool.CSSStyleRule} rule
12091209
* @param {!Audits.AuditRuleResult} result
12101210
*/
12111211
_visitRule(styleSheet, rule, result) {
@@ -1234,7 +1234,7 @@ Audits.AuditRules.CSSRuleBase = class extends Audits.AuditRule {
12341234

12351235
/**
12361236
* @param {!Audits.AuditRules.ParsedStyleSheet} styleSheet
1237-
* @param {!Common.FormatterWorkerPool.CSSStyleRule} rule
1237+
* @param {!Formatter.FormatterWorkerPool.CSSStyleRule} rule
12381238
* @param {!Audits.AuditRuleResult} result
12391239
*/
12401240
visitRule(styleSheet, rule, result) {
@@ -1243,7 +1243,7 @@ Audits.AuditRules.CSSRuleBase = class extends Audits.AuditRule {
12431243

12441244
/**
12451245
* @param {!Audits.AuditRules.ParsedStyleSheet} styleSheet
1246-
* @param {!Common.FormatterWorkerPool.CSSStyleRule} rule
1246+
* @param {!Formatter.FormatterWorkerPool.CSSStyleRule} rule
12471247
* @param {!Audits.AuditRuleResult} result
12481248
*/
12491249
didVisitRule(styleSheet, rule, result) {
@@ -1252,8 +1252,8 @@ Audits.AuditRules.CSSRuleBase = class extends Audits.AuditRule {
12521252

12531253
/**
12541254
* @param {!Audits.AuditRules.ParsedStyleSheet} styleSheet
1255-
* @param {!Common.FormatterWorkerPool.CSSStyleRule} rule
1256-
* @param {!Common.FormatterWorkerPool.CSSProperty} property
1255+
* @param {!Formatter.FormatterWorkerPool.CSSStyleRule} rule
1256+
* @param {!Formatter.FormatterWorkerPool.CSSProperty} property
12571257
* @param {!Audits.AuditRuleResult} result
12581258
*/
12591259
visitProperty(styleSheet, rule, property, result) {

Diff for: front_end/audits/module.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@
2424
"components",
2525
"extensions",
2626
"network_log",
27-
"object_ui"
27+
"object_ui",
28+
"formatter"
2829
],
2930
"scripts": [
3031
"AuditsPanel.js",

Diff for: front_end/audits2/Audits2Panel.js

+9
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,10 @@ Audits2.Audits2Panel = class extends UI.PanelWithSidebar {
169169
this._dialog.setOutsideClickCallback(event => event.consume(true));
170170
var root = UI.createShadowRootWithCoreStyles(this._dialog.contentElement, 'audits2/audits2Dialog.css');
171171
var auditsViewElement = root.createChild('div', 'audits2-view');
172+
173+
var closeButton = auditsViewElement.createChild('div', 'dialog-close-button', 'dt-close-button');
174+
closeButton.addEventListener('click', () => this._cancelAndClose());
175+
172176
var uiElement = auditsViewElement.createChild('div');
173177
var headerElement = uiElement.createChild('header');
174178
this._headerTitleElement = headerElement.createChild('p');
@@ -304,6 +308,11 @@ Audits2.Audits2Panel = class extends UI.PanelWithSidebar {
304308
delete this._emulationOutlineEnabledBefore;
305309
}
306310

311+
_cancelAndClose() {
312+
this._cancel();
313+
this._hideDialog();
314+
}
315+
307316
_cancel() {
308317
if (this._auditRunning) {
309318
this._updateStatus(Common.UIString('Cancelling\u2026'));

Diff for: front_end/audits2/audits2Dialog.css

+6
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,12 @@
1010
align-items: center;
1111
}
1212

13+
.audits2-view .dialog-close-button {
14+
position: absolute;
15+
top: 10px;
16+
right: 10px;
17+
}
18+
1319
header {
1420
color: #666;
1521
font-weight: bold;

Diff for: front_end/bindings/BreakpointManager.js

+2-18
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,6 @@ Bindings.BreakpointManager = class extends Common.Object {
5656
this._workspace.addEventListener(Workspace.Workspace.Events.ProjectRemoved, this._projectRemoved, this);
5757
this._workspace.addEventListener(Workspace.Workspace.Events.UISourceCodeAdded, this._uiSourceCodeAdded, this);
5858
this._workspace.addEventListener(Workspace.Workspace.Events.UISourceCodeRemoved, this._uiSourceCodeRemoved, this);
59-
this._debuggerWorkspaceBinding.addEventListener(
60-
Bindings.DebuggerWorkspaceBinding.Events.SourceMappingChanged, this._uiSourceCodeMappingChanged, this);
6159

6260
targetManager.observeModels(SDK.DebuggerModel, this);
6361
}
@@ -152,7 +150,7 @@ Bindings.BreakpointManager = class extends Common.Object {
152150
breakpointItem.enabled);
153151
}
154152
}
155-
this._provisionalBreakpoints.removeAll(url);
153+
this._provisionalBreakpoints.deleteAll(url);
156154
this._storage.unmute();
157155
}
158156

@@ -172,20 +170,6 @@ Bindings.BreakpointManager = class extends Common.Object {
172170
this._removeUISourceCode(uiSourceCode);
173171
}
174172

175-
/**
176-
* @param {!Common.Event} event
177-
*/
178-
_uiSourceCodeMappingChanged(event) {
179-
var uiSourceCode = /** @type {!Workspace.UISourceCode} */ (event.data.uiSourceCode);
180-
var isIdentity = /** @type {boolean} */ (event.data.isIdentity);
181-
var debuggerModel = /** @type {!SDK.DebuggerModel} */ (event.data.debuggerModel);
182-
if (isIdentity)
183-
return;
184-
var breakpoints = this._breakpointsForPrimaryUISourceCode.get(uiSourceCode) || [];
185-
for (var i = 0; i < breakpoints.length; ++i)
186-
breakpoints[i]._updateInDebuggerForModel(debuggerModel);
187-
}
188-
189173
/**
190174
* @param {!Workspace.UISourceCode} uiSourceCode
191175
*/
@@ -412,7 +396,7 @@ Bindings.BreakpointManager = class extends Common.Object {
412396
breakpoints.remove(breakpoint);
413397
if (removeFromStorage)
414398
this._storage._removeBreakpoint(breakpoint);
415-
this._provisionalBreakpoints.remove(breakpoint._url, breakpoint);
399+
this._provisionalBreakpoints.delete(breakpoint._url, breakpoint);
416400
}
417401

418402
/**

0 commit comments

Comments
 (0)