Skip to content

Commit 2156612

Browse files
darwindarwin
committed
merge updates from official devtools
CHROME-REV:e9334d4528d0096449a0843154f4cea489d1a5f8 CHROME-TAG:81.0.4021.1
2 parents 3493eda + 68ef427 commit 2156612

File tree

75 files changed

+2223
-1340
lines changed

Some content is hidden

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

75 files changed

+2223
-1340
lines changed

‎resources/unpacked/devtools/.eslintignore

+1
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,5 @@ front_end/protocol_externs.js
1818
front_end/javascript_metadata/NativeFunctions.js
1919
front_end/sdk/wasm_source_map/pkg/wasm_source_map.js
2020
front_end/third_party/
21+
front_end/wasmparser_worker.js
2122
scripts/

‎resources/unpacked/devtools/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ npm-debug.log
2727
/front_end/accessibility/ARIAProperties.js
2828
/front_end/formatter_worker.js
2929
/front_end/heap_snapshot_worker.js
30+
/front_end/wasmparser_worker.js
3031

3132
/build
3233
/buildtools

‎resources/unpacked/devtools/BUILD.gn

+62-22
Original file line numberDiff line numberDiff line change
@@ -218,8 +218,6 @@ all_devtools_files = [
218218
"front_end/node_debugger/module.json",
219219
"front_end/node_main/module.json",
220220
"front_end/node_main/nodeConnectionsPanel.css",
221-
"front_end/node_main/NodeConnectionsPanel.js",
222-
"front_end/node_main/NodeMain.js",
223221
"front_end/object_ui/customPreviewComponent.css",
224222
"front_end/object_ui/module.json",
225223
"front_end/object_ui/objectPopover.css",
@@ -273,36 +271,16 @@ all_devtools_files = [
273271
"front_end/protocol/module.json",
274272
"front_end/quick_open/filteredListWidget.css",
275273
"front_end/quick_open/module.json",
276-
"front_end/resources/ApplicationCacheItemsView.js",
277-
"front_end/resources/ApplicationCacheModel.js",
278-
"front_end/resources/ApplicationPanelSidebar.js",
279274
"front_end/resources/appManifestView.css",
280-
"front_end/resources/AppManifestView.js",
281-
"front_end/resources/BackgroundServiceModel.js",
282275
"front_end/resources/backgroundServiceView.css",
283-
"front_end/resources/BackgroundServiceView.js",
284276
"front_end/resources/clearStorageView.css",
285-
"front_end/resources/ClearStorageView.js",
286277
"front_end/resources/cookieItemsView.css",
287-
"front_end/resources/CookieItemsView.js",
288-
"front_end/resources/DatabaseModel.js",
289-
"front_end/resources/DatabaseQueryView.js",
290-
"front_end/resources/DatabaseTableView.js",
291-
"front_end/resources/DOMStorageItemsView.js",
292-
"front_end/resources/DOMStorageModel.js",
293-
"front_end/resources/IndexedDBModel.js",
294278
"front_end/resources/indexedDBViews.css",
295-
"front_end/resources/IndexedDBViews.js",
296279
"front_end/resources/module.json",
297280
"front_end/resources/resourcesPanel.css",
298-
"front_end/resources/ResourcesPanel.js",
299-
"front_end/resources/ResourcesSection.js",
300281
"front_end/resources/resourcesSidebar.css",
301282
"front_end/resources/serviceWorkerCacheViews.css",
302-
"front_end/resources/ServiceWorkerCacheViews.js",
303283
"front_end/resources/serviceWorkersView.css",
304-
"front_end/resources/ServiceWorkersView.js",
305-
"front_end/resources/StorageItemsView.js",
306284
"front_end/screencast/module.json",
307285
"front_end/screencast/screencastView.css",
308286
"front_end/sdk_test_runner/module.json",
@@ -359,6 +337,9 @@ all_devtools_files = [
359337
"front_end/text_utils/module.json",
360338
"front_end/third_party/fabricjs/fabric.js",
361339
"front_end/third_party/fabricjs/module.json",
340+
"front_end/third_party/wasmparser/module.json",
341+
"front_end/third_party/wasmparser/WasmDis.js",
342+
"front_end/third_party/wasmparser/WasmParser.js",
362343
"front_end/timeline_model/module.json",
363344
"front_end/timeline/CountersGraph.js",
364345
"front_end/timeline/EventsTimelineTreeView.js",
@@ -431,6 +412,8 @@ all_devtools_files = [
431412
"front_end/ui/tooltip.css",
432413
"front_end/ui/treeoutline.css",
433414
"front_end/ui/viewContainers.css",
415+
"front_end/wasmparser_worker.json",
416+
"front_end/wasmparser_worker/module.json",
434417
"front_end/web_audio/audioContextSelector.css",
435418
"front_end/web_audio/module.json",
436419
"front_end/web_audio/webAudio.css",
@@ -759,6 +742,7 @@ all_devtools_modules = [
759742
"front_end/help/ReleaseNoteText.js",
760743
"front_end/help/ReleaseNoteView.js",
761744
"front_end/host/host.js",
745+
"front_end/host/host-legacy.js",
762746
"front_end/host/InspectorFrontendHost.js",
763747
"front_end/host/InspectorFrontendHostAPI.js",
764748
"front_end/host/Platform.js",
@@ -830,6 +814,9 @@ all_devtools_modules = [
830814
"front_end/network/RequestTimingView.js",
831815
"front_end/network/ResourceWebSocketFrameView.js",
832816
"front_end/network/SignedExchangeInfoView.js",
817+
"front_end/node_main/node_main.js",
818+
"front_end/node_main/NodeMain.js",
819+
"front_end/node_main/NodeConnectionsPanel.js",
833820
"front_end/object_ui/CustomPreviewComponent.js",
834821
"front_end/object_ui/JavaScriptAutocomplete.js",
835822
"front_end/object_ui/JavaScriptREPL.js",
@@ -875,6 +862,27 @@ all_devtools_modules = [
875862
"front_end/quick_open/HelpQuickOpen.js",
876863
"front_end/quick_open/quick_open.js",
877864
"front_end/quick_open/QuickOpen.js",
865+
"front_end/resources/resources.js",
866+
"front_end/resources/StorageItemsView.js",
867+
"front_end/resources/ServiceWorkersView.js",
868+
"front_end/resources/ServiceWorkerCacheViews.js",
869+
"front_end/resources/ResourcesSection.js",
870+
"front_end/resources/ResourcesPanel.js",
871+
"front_end/resources/IndexedDBViews.js",
872+
"front_end/resources/IndexedDBModel.js",
873+
"front_end/resources/DatabaseTableView.js",
874+
"front_end/resources/DatabaseQueryView.js",
875+
"front_end/resources/DatabaseModel.js",
876+
"front_end/resources/DOMStorageModel.js",
877+
"front_end/resources/DOMStorageItemsView.js",
878+
"front_end/resources/CookieItemsView.js",
879+
"front_end/resources/ClearStorageView.js",
880+
"front_end/resources/BackgroundServiceView.js",
881+
"front_end/resources/BackgroundServiceModel.js",
882+
"front_end/resources/ApplicationPanelSidebar.js",
883+
"front_end/resources/ApplicationCacheModel.js",
884+
"front_end/resources/ApplicationCacheItemsView.js",
885+
"front_end/resources/AppManifestView.js",
878886
"front_end/root.js",
879887
"front_end/root.js",
880888
"front_end/Runtime.js",
@@ -1084,6 +1092,9 @@ all_devtools_modules = [
10841092
"front_end/ui/XLink.js",
10851093
"front_end/ui/XWidget.js",
10861094
"front_end/ui/ZoomManager.js",
1095+
"front_end/wasmparser_worker.unbundled.js",
1096+
"front_end/wasmparser_worker/wasmparser_worker.js",
1097+
"front_end/wasmparser_worker/WasmParserWorker.js",
10871098
"front_end/web_audio/AudioContextContentBuilder.js",
10881099
"front_end/web_audio/AudioContextSelector.js",
10891100
"front_end/web_audio/graph_visualizer/EdgeView.js",
@@ -1534,6 +1545,7 @@ copied_devtools_modules = [
15341545
"$resources_out_dir/help/ReleaseNoteText.js",
15351546
"$resources_out_dir/help/ReleaseNoteView.js",
15361547
"$resources_out_dir/host/host.js",
1548+
"$resources_out_dir/host/host-legacy.js",
15371549
"$resources_out_dir/host/InspectorFrontendHost.js",
15381550
"$resources_out_dir/host/InspectorFrontendHostAPI.js",
15391551
"$resources_out_dir/host/Platform.js",
@@ -1605,6 +1617,9 @@ copied_devtools_modules = [
16051617
"$resources_out_dir/network/RequestTimingView.js",
16061618
"$resources_out_dir/network/ResourceWebSocketFrameView.js",
16071619
"$resources_out_dir/network/SignedExchangeInfoView.js",
1620+
"$resources_out_dir/node_main/node_main.js",
1621+
"$resources_out_dir/node_main/NodeMain.js",
1622+
"$resources_out_dir/node_main/NodeConnectionsPanel.js",
16081623
"$resources_out_dir/object_ui/CustomPreviewComponent.js",
16091624
"$resources_out_dir/object_ui/JavaScriptAutocomplete.js",
16101625
"$resources_out_dir/object_ui/JavaScriptREPL.js",
@@ -1650,6 +1665,27 @@ copied_devtools_modules = [
16501665
"$resources_out_dir/quick_open/HelpQuickOpen.js",
16511666
"$resources_out_dir/quick_open/quick_open.js",
16521667
"$resources_out_dir/quick_open/QuickOpen.js",
1668+
"$resources_out_dir/resources/resources.js",
1669+
"$resources_out_dir/resources/StorageItemsView.js",
1670+
"$resources_out_dir/resources/ServiceWorkersView.js",
1671+
"$resources_out_dir/resources/ServiceWorkerCacheViews.js",
1672+
"$resources_out_dir/resources/ResourcesSection.js",
1673+
"$resources_out_dir/resources/ResourcesPanel.js",
1674+
"$resources_out_dir/resources/IndexedDBViews.js",
1675+
"$resources_out_dir/resources/IndexedDBModel.js",
1676+
"$resources_out_dir/resources/DatabaseTableView.js",
1677+
"$resources_out_dir/resources/DatabaseQueryView.js",
1678+
"$resources_out_dir/resources/DatabaseModel.js",
1679+
"$resources_out_dir/resources/DOMStorageModel.js",
1680+
"$resources_out_dir/resources/DOMStorageItemsView.js",
1681+
"$resources_out_dir/resources/CookieItemsView.js",
1682+
"$resources_out_dir/resources/ClearStorageView.js",
1683+
"$resources_out_dir/resources/BackgroundServiceView.js",
1684+
"$resources_out_dir/resources/BackgroundServiceModel.js",
1685+
"$resources_out_dir/resources/ApplicationPanelSidebar.js",
1686+
"$resources_out_dir/resources/ApplicationCacheModel.js",
1687+
"$resources_out_dir/resources/ApplicationCacheItemsView.js",
1688+
"$resources_out_dir/resources/AppManifestView.js",
16531689
"$resources_out_dir/root.js",
16541690
"$resources_out_dir/Runtime.js",
16551691
"$resources_out_dir/screencast/InputModel.js",
@@ -1856,6 +1892,8 @@ copied_devtools_modules = [
18561892
"$resources_out_dir/ui/XLink.js",
18571893
"$resources_out_dir/ui/XWidget.js",
18581894
"$resources_out_dir/ui/ZoomManager.js",
1895+
"$resources_out_dir/wasmparser_worker/wasmparser_worker.js",
1896+
"$resources_out_dir/wasmparser_worker/WasmParserWorker.js",
18591897
"$resources_out_dir/web_audio/AudioContextContentBuilder.js",
18601898
"$resources_out_dir/web_audio/AudioContextSelector.js",
18611899
"$resources_out_dir/web_audio/graph_visualizer/EdgeView.js",
@@ -1984,6 +2022,7 @@ generated_test_modules = [
19842022
generated_worker_bundles = [
19852023
"$resources_out_dir/formatter_worker.js",
19862024
"$resources_out_dir/heap_snapshot_worker.js",
2025+
"$resources_out_dir/wasmparser_worker.js",
19872026
]
19882027

19892028
devtools_applications = [
@@ -1998,6 +2037,7 @@ devtools_applications = [
19982037
"node_app",
19992038
"shell",
20002039
"toolbox",
2040+
"wasmparser_worker",
20012041
"worker_app",
20022042
]
20032043

‎resources/unpacked/devtools/DEPS

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,16 @@
44

55
vars = {
66
'build_url': 'https://chromium.googlesource.com/chromium/src/build.git',
7-
'build_revision': '9e124309ddc6c56ea6da6c731ad2ae0c5aa2d078',
7+
'build_revision': '6e49eefa473f1335c0e23579d70c2ab108a29e82',
88

99
'buildtools_url': 'https://chromium.googlesource.com/chromium/src/buildtools.git',
1010
'buildtools_revision': '8d2132841536523249669813b928e29144d487f9',
1111

1212
'depot_tools_url': 'https://chromium.googlesource.com/chromium/tools/depot_tools.git',
13-
'depot_tools_revision': 'cf50f77484421e2b2f2b8f08c740c7055febac8b',
13+
'depot_tools_revision': '3a797afd61ff49d783b9b319e6cdfb33d493e3f4',
1414

1515
'inspector_protocol_url': 'https://chromium.googlesource.com/deps/inspector_protocol',
16-
'inspector_protocol_revision': '3b0551d3904f7fc067e78905ce697002187fa7a5',
16+
'inspector_protocol_revision': 'b29d8a5d2bb56b3e555bb27a0e035a9d571c5f28',
1717

1818
'clang_format_url': 'https://chromium.googlesource.com/chromium/llvm-project/cfe/tools/clang-format.git',
1919
'clang_format_revision': '96636aa0e9f047f17447f2d45a094d0b59ed7917',

‎resources/unpacked/devtools/PRESUBMIT.py

+7-8
Original file line numberDiff line numberDiff line change
@@ -229,28 +229,27 @@ def _CommonChecks(input_api, output_api):
229229
results.extend(input_api.canned_checks.CheckChangeHasNoCrAndHasOnlyOneEol(input_api, output_api))
230230
results.extend(input_api.canned_checks.CheckChangeHasNoStrayWhitespace(input_api, output_api))
231231
results.extend(input_api.canned_checks.CheckGenderNeutral(input_api, output_api))
232-
return results
233-
234-
235-
def CheckChangeOnUpload(input_api, output_api):
236-
results = []
237-
results.extend(_CommonChecks(input_api, output_api))
238232
results.extend(_CheckBuildGN(input_api, output_api))
239233
results.extend(_CheckJSON(input_api, output_api))
240234
results.extend(_CheckFormat(input_api, output_api))
241235
results.extend(_CheckDevtoolsStyle(input_api, output_api))
242236
results.extend(_CheckOptimizeSVGHashes(input_api, output_api))
243237
results.extend(_CheckCSSViolations(input_api, output_api))
244-
results.extend(_CheckDevtoolsLocalization(input_api, output_api))
245238
results.extend(_CheckChangesAreExclusiveToDirectory(input_api, output_api))
246239
return results
247240

248241

242+
def CheckChangeOnUpload(input_api, output_api):
243+
results = []
244+
results.extend(_CommonChecks(input_api, output_api))
245+
results.extend(_CheckDevtoolsLocalization(input_api, output_api))
246+
return results
247+
248+
249249
def CheckChangeOnCommit(input_api, output_api):
250250
results = []
251251
results.extend(_CommonChecks(input_api, output_api))
252252
results.extend(_CheckDevtoolsLocalization(input_api, output_api, True))
253-
results.extend(_CheckChangesAreExclusiveToDirectory(input_api, output_api))
254253
results.extend(input_api.canned_checks.CheckChangeHasDescription(input_api, output_api))
255254
return results
256255

‎resources/unpacked/devtools/front_end/bindings/ResourceScriptMapping.js

+6-1
Original file line numberDiff line numberDiff line change
@@ -104,10 +104,13 @@ export default class ResourceScriptMapping {
104104
if (!scriptFile._hasScripts([script])) {
105105
return null;
106106
}
107-
const lineNumber = rawLocation.lineNumber - (script.isInlineScriptWithSourceURL() ? script.lineOffset : 0);
107+
let lineNumber = rawLocation.lineNumber - (script.isInlineScriptWithSourceURL() ? script.lineOffset : 0);
108108
let columnNumber = rawLocation.columnNumber || 0;
109109
if (script.isInlineScriptWithSourceURL() && !lineNumber && columnNumber) {
110110
columnNumber -= script.columnOffset;
111+
} else if (script.isWasmDisassembly()) {
112+
lineNumber = script.wasmDisassemblyLine(columnNumber);
113+
columnNumber = 0;
111114
}
112115
return uiSourceCode.uiLocation(lineNumber, columnNumber);
113116
}
@@ -128,6 +131,8 @@ export default class ResourceScriptMapping {
128131
if (script.isInlineScriptWithSourceURL()) {
129132
return [this._debuggerModel.createRawLocation(
130133
script, lineNumber + script.lineOffset, lineNumber ? columnNumber : columnNumber + script.columnOffset)];
134+
} else if (script.isWasmDisassembly()) {
135+
return [script.wasmByteLocation(lineNumber)];
131136
}
132137
return [this._debuggerModel.createRawLocation(script, lineNumber, columnNumber)];
133138
}

0 commit comments

Comments
 (0)