Skip to content

Commit

Permalink
Merge remote-tracking branch 'official/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
darwin committed Nov 1, 2020
2 parents a8be8e7 + 7c25055 commit a030fd2
Show file tree
Hide file tree
Showing 477 changed files with 8,196 additions and 31,567 deletions.
1 change: 1 addition & 0 deletions AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -34,3 +34,4 @@ Karntino Areros <[email protected]>
Luke Swiderski <[email protected]>
Anthony Xie <[email protected]>
Krishnal Ciccolella <[email protected]>
Will Hernandez‬ <[email protected]>
10 changes: 5 additions & 5 deletions DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ use_relative_paths = True

vars = {
'build_url': 'https://chromium.googlesource.com/chromium/src/build.git',
'build_revision': '0401de79c7264d72452bc01a4a054a44f3861c31',
'build_revision': 'e3b5e06bae36be022a637de9ee5589cd87f4a094',

'buildtools_url': 'https://chromium.googlesource.com/chromium/src/buildtools.git',
'buildtools_revision': '98881a1297863de584fad20fb671e8c44ad1a7d0',

'depot_tools_url': 'https://chromium.googlesource.com/chromium/tools/depot_tools.git',
'depot_tools_revision': '77cd4b459b10e96b4023da12e4ca280ef3d0489a',
'depot_tools_revision': '9396c2b0646a73f3cbe53b06424c53bddb8064d3',

'inspector_protocol_url': 'https://chromium.googlesource.com/deps/inspector_protocol',
'inspector_protocol_revision': '351a2b717e7cd0e59c3d81505c1a803673667dac',
Expand All @@ -27,11 +27,11 @@ vars = {

# Chromium build number for unit tests. It should be regularly updated to
# the content of https://commondatastorage.googleapis.com/chromium-browser-snapshots/Linux_x64/LAST_CHANGE
'chromium_linux': '821100',
'chromium_linux': '823001',
# the content of https://commondatastorage.googleapis.com/chromium-browser-snapshots/Win_x64/LAST_CHANGE
'chromium_win': '821083',
'chromium_win': '822999',
# the content of https://commondatastorage.googleapis.com/chromium-browser-snapshots/Mac/LAST_CHANGE
'chromium_mac': '821071',
'chromium_mac': '822999',
}

# Only these hosts are allowed for dependencies in this DEPS file.
Expand Down
4 changes: 3 additions & 1 deletion all_devtools_files.gni
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ all_devtools_files = [
"front_end/components/imagePreview.css",
"front_end/components/jsUtils.css",
"front_end/components/module.json",
"front_end/console_counters/errorWarningCounter.css",
"front_end/console_counters/warningErrorCounter.css",
"front_end/console_counters/module.json",
"front_end/console_test_runner/console_test_runner.js",
"front_end/console_test_runner/module.json",
Expand Down Expand Up @@ -254,6 +254,8 @@ all_devtools_files = [
"front_end/issues/descriptions/cspEvalViolation.md",
"front_end/issues/descriptions/cspInlineViolation.md",
"front_end/issues/descriptions/cspURLViolation.md",
"front_end/issues/descriptions/cspTrustedTypesSinkViolation.md",
"front_end/issues/descriptions/cspTrustedTypesPolicyViolation.md",
"front_end/issues/descriptions/mixedContent.md",
"front_end/issues/issuesPane.css",
"front_end/issues/issuesTree.css",
Expand Down
29 changes: 20 additions & 9 deletions all_devtools_modules.gni
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ all_typescript_module_sources = [
"common/Runnable.js",
"common/SegmentedRange.js",
"common/Settings.js",
"common/SimpleHistoryManager.js",
"common/StringOutputStream.js",
"common/TextDictionary.js",
"common/Throttler.js",
Expand Down Expand Up @@ -133,10 +134,6 @@ all_typescript_module_sources = [
# dirac - end
"dom_extension/DOMExtension.js",
"elements/Adorner.js",
"elements/CSSAngle.js",
"elements/CSSAngleRegex.js",
"elements/CSSAngleUtils.js",
"elements/CSSAngle_bridge.js",
"elements/CSSPropertyIconResolver.js",
"elements/ClassesPaneWidget.js",
"elements/ColorSwatchPopoverIcon.js",
Expand Down Expand Up @@ -232,6 +229,10 @@ all_typescript_module_sources = [
"i18n/i18nImpl.js",
"inline_editor/BezierEditor.js",
"inline_editor/BezierUI.js",
"inline_editor/CSSAngle.js",
"inline_editor/CSSAngleRegex.js",
"inline_editor/CSSAngleUtils.js",
"inline_editor/CSSAngle_bridge.js",
"inline_editor/CSSShadowEditor.js",
"inline_editor/CSSShadowModel.js",
"inline_editor/CSSVarSwatch.js",
Expand Down Expand Up @@ -267,6 +268,7 @@ all_typescript_module_sources = [
"lighthouse/LighthouseProtocolService.js",
"lighthouse/LighthouseReportRenderer.js",
"lighthouse/LighthouseReportSelector.js",
"lighthouse/LighthouseReporterTypes.js",
"lighthouse/LighthouseStartView.js",
"lighthouse/LighthouseStatusView.js",
"lighthouse/RadioSetting.js",
Expand Down Expand Up @@ -354,6 +356,7 @@ all_typescript_module_sources = [
"platform/UIString.js",
"platform/array-utilities.js",
"platform/date-utilities.js",
"platform/map-utilities.js",
"platform/number-utilities.js",
"platform/set-utilities.js",
"platform/string-utilities.js",
Expand Down Expand Up @@ -521,7 +524,6 @@ all_typescript_module_sources = [
"sources/ScriptFormatterEditorAction.js",
"sources/ScriptOriginPlugin.js",
"sources/SearchSourcesView.js",
"sources/SimpleHistoryManager.js",
"sources/SnippetsPlugin.js",
"sources/SourceMapNamesResolver.js",
"sources/SourcesNavigator.js",
Expand Down Expand Up @@ -599,7 +601,10 @@ all_typescript_module_sources = [
"third_party/marked/package/lib/marked.esm.js",
"third_party/puppeteer/package/lib/esm/puppeteer/api-docs-entry.js",
"third_party/puppeteer/package/lib/esm/puppeteer/common/Accessibility.js",
"third_party/puppeteer/package/lib/esm/puppeteer/common/AriaQueryHandler.js",
"third_party/puppeteer/package/lib/esm/puppeteer/common/Browser.js",
"third_party/puppeteer/package/lib/esm/puppeteer/common/BrowserConnector.js",
"third_party/puppeteer/package/lib/esm/puppeteer/common/BrowserWebSocketTransport.js",
"third_party/puppeteer/package/lib/esm/puppeteer/common/Connection.js",
"third_party/puppeteer/package/lib/esm/puppeteer/common/ConnectionTransport.js",
"third_party/puppeteer/package/lib/esm/puppeteer/common/ConsoleMessage.js",
Expand All @@ -624,6 +629,7 @@ all_typescript_module_sources = [
"third_party/puppeteer/package/lib/esm/puppeteer/common/NetworkManager.js",
"third_party/puppeteer/package/lib/esm/puppeteer/common/PDFOptions.js",
"third_party/puppeteer/package/lib/esm/puppeteer/common/Page.js",
"third_party/puppeteer/package/lib/esm/puppeteer/common/Product.js",
"third_party/puppeteer/package/lib/esm/puppeteer/common/Puppeteer.js",
"third_party/puppeteer/package/lib/esm/puppeteer/common/PuppeteerViewport.js",
"third_party/puppeteer/package/lib/esm/puppeteer/common/QueryHandler.js",
Expand All @@ -632,20 +638,25 @@ all_typescript_module_sources = [
"third_party/puppeteer/package/lib/esm/puppeteer/common/TimeoutSettings.js",
"third_party/puppeteer/package/lib/esm/puppeteer/common/Tracing.js",
"third_party/puppeteer/package/lib/esm/puppeteer/common/USKeyboardLayout.js",
"third_party/puppeteer/package/lib/esm/puppeteer/common/WebSocketTransport.js",
"third_party/puppeteer/package/lib/esm/puppeteer/common/WebWorker.js",
"third_party/puppeteer/package/lib/esm/puppeteer/common/assert.js",
"third_party/puppeteer/package/lib/esm/puppeteer/common/fetch.js",
"third_party/puppeteer/package/lib/esm/puppeteer/common/helper.js",
"third_party/puppeteer/package/lib/esm/puppeteer/environment.js",
"third_party/puppeteer/package/lib/esm/puppeteer/index-core.js",
"third_party/puppeteer/package/lib/esm/puppeteer/index.js",
"third_party/puppeteer/package/lib/esm/puppeteer/initialize.js",
"third_party/puppeteer/package/lib/esm/puppeteer/initialize-node.js",
"third_party/puppeteer/package/lib/esm/puppeteer/initialize-web.js",
"third_party/puppeteer/package/lib/esm/puppeteer/node-puppeteer-core.js",
"third_party/puppeteer/package/lib/esm/puppeteer/node.js",
"third_party/puppeteer/package/lib/esm/puppeteer/node/BrowserFetcher.js",
"third_party/puppeteer/package/lib/esm/puppeteer/node/BrowserRunner.js",
"third_party/puppeteer/package/lib/esm/puppeteer/node/LaunchOptions.js",
"third_party/puppeteer/package/lib/esm/puppeteer/node/Launcher.js",
"third_party/puppeteer/package/lib/esm/puppeteer/node/NodeWebSocketTransport.js",
"third_party/puppeteer/package/lib/esm/puppeteer/node/PipeTransport.js",
"third_party/puppeteer/package/lib/esm/puppeteer/node/Puppeteer.js",
"third_party/puppeteer/package/lib/esm/puppeteer/node/install.js",
"third_party/puppeteer/package/lib/esm/puppeteer/revisions.js",
"third_party/puppeteer/package/lib/esm/puppeteer/web.js",
"third_party/puppeteer/package/lib/esm/vendor/mitt/src/index.js",
"third_party/wasmparser/package/dist/esm/WasmDis.js",
"third_party/wasmparser/package/dist/esm/WasmParser.js",
Expand Down
36 changes: 27 additions & 9 deletions devtools_grd_files.gni
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,13 @@ grd_files_release_sources = [
"front_end/Images/cssoverview_icons_2x.png",
"front_end/Images/elements_panel_icon.svg",
"front_end/Images/errorWave.svg",
"front_end/Images/flex-align-content-center-icon.svg",
"front_end/Images/flex-align-content-end-icon.svg",
"front_end/Images/flex-align-content-space-around-icon.svg",
"front_end/Images/flex-align-content-space-between-icon.svg",
"front_end/Images/flex-align-content-space-evenly-icon.svg",
"front_end/Images/flex-align-content-start-icon.svg",
"front_end/Images/flex-align-content-stretch-icon.svg",
"front_end/Images/flex-direction-icon.svg",
"front_end/Images/ic_info_black_18dp.svg",
"front_end/Images/ic_page_next_16x16_icon.svg",
Expand Down Expand Up @@ -431,6 +438,7 @@ grd_files_debug_sources = [
"front_end/common/Runnable.js",
"front_end/common/SegmentedRange.js",
"front_end/common/Settings.js",
"front_end/common/SimpleHistoryManager.js",
"front_end/common/StringOutputStream.js",
"front_end/common/TextDictionary.js",
"front_end/common/Throttler.js",
Expand Down Expand Up @@ -488,10 +496,6 @@ grd_files_debug_sources = [
# dirac end
"front_end/dom_extension/DOMExtension.js",
"front_end/elements/Adorner.js",
"front_end/elements/CSSAngle.js",
"front_end/elements/CSSAngleRegex.js",
"front_end/elements/CSSAngleUtils.js",
"front_end/elements/CSSAngle_bridge.js",
"front_end/elements/CSSPropertyIconResolver.js",
"front_end/elements/ClassesPaneWidget.js",
"front_end/elements/ColorSwatchPopoverIcon.js",
Expand Down Expand Up @@ -587,6 +591,10 @@ grd_files_debug_sources = [
"front_end/i18n/i18nImpl.js",
"front_end/inline_editor/BezierEditor.js",
"front_end/inline_editor/BezierUI.js",
"front_end/inline_editor/CSSAngle.js",
"front_end/inline_editor/CSSAngleRegex.js",
"front_end/inline_editor/CSSAngleUtils.js",
"front_end/inline_editor/CSSAngle_bridge.js",
"front_end/inline_editor/CSSShadowEditor.js",
"front_end/inline_editor/CSSShadowModel.js",
"front_end/inline_editor/CSSVarSwatch.js",
Expand Down Expand Up @@ -622,6 +630,7 @@ grd_files_debug_sources = [
"front_end/lighthouse/LighthouseProtocolService.js",
"front_end/lighthouse/LighthouseReportRenderer.js",
"front_end/lighthouse/LighthouseReportSelector.js",
"front_end/lighthouse/LighthouseReporterTypes.js",
"front_end/lighthouse/LighthouseStartView.js",
"front_end/lighthouse/LighthouseStatusView.js",
"front_end/lighthouse/RadioSetting.js",
Expand Down Expand Up @@ -709,6 +718,7 @@ grd_files_debug_sources = [
"front_end/platform/UIString.js",
"front_end/platform/array-utilities.js",
"front_end/platform/date-utilities.js",
"front_end/platform/map-utilities.js",
"front_end/platform/number-utilities.js",
"front_end/platform/set-utilities.js",
"front_end/platform/string-utilities.js",
Expand Down Expand Up @@ -876,7 +886,6 @@ grd_files_debug_sources = [
"front_end/sources/ScriptFormatterEditorAction.js",
"front_end/sources/ScriptOriginPlugin.js",
"front_end/sources/SearchSourcesView.js",
"front_end/sources/SimpleHistoryManager.js",
"front_end/sources/SnippetsPlugin.js",
"front_end/sources/SourceMapNamesResolver.js",
"front_end/sources/SourcesNavigator.js",
Expand Down Expand Up @@ -957,7 +966,10 @@ grd_files_debug_sources = [
"front_end/third_party/marked/package/lib/marked.esm.js",
"front_end/third_party/puppeteer/package/lib/esm/puppeteer/api-docs-entry.js",
"front_end/third_party/puppeteer/package/lib/esm/puppeteer/common/Accessibility.js",
"front_end/third_party/puppeteer/package/lib/esm/puppeteer/common/AriaQueryHandler.js",
"front_end/third_party/puppeteer/package/lib/esm/puppeteer/common/Browser.js",
"front_end/third_party/puppeteer/package/lib/esm/puppeteer/common/BrowserConnector.js",
"front_end/third_party/puppeteer/package/lib/esm/puppeteer/common/BrowserWebSocketTransport.js",
"front_end/third_party/puppeteer/package/lib/esm/puppeteer/common/Connection.js",
"front_end/third_party/puppeteer/package/lib/esm/puppeteer/common/ConnectionTransport.js",
"front_end/third_party/puppeteer/package/lib/esm/puppeteer/common/ConsoleMessage.js",
Expand All @@ -982,6 +994,7 @@ grd_files_debug_sources = [
"front_end/third_party/puppeteer/package/lib/esm/puppeteer/common/NetworkManager.js",
"front_end/third_party/puppeteer/package/lib/esm/puppeteer/common/PDFOptions.js",
"front_end/third_party/puppeteer/package/lib/esm/puppeteer/common/Page.js",
"front_end/third_party/puppeteer/package/lib/esm/puppeteer/common/Product.js",
"front_end/third_party/puppeteer/package/lib/esm/puppeteer/common/Puppeteer.js",
"front_end/third_party/puppeteer/package/lib/esm/puppeteer/common/PuppeteerViewport.js",
"front_end/third_party/puppeteer/package/lib/esm/puppeteer/common/QueryHandler.js",
Expand All @@ -990,20 +1003,25 @@ grd_files_debug_sources = [
"front_end/third_party/puppeteer/package/lib/esm/puppeteer/common/TimeoutSettings.js",
"front_end/third_party/puppeteer/package/lib/esm/puppeteer/common/Tracing.js",
"front_end/third_party/puppeteer/package/lib/esm/puppeteer/common/USKeyboardLayout.js",
"front_end/third_party/puppeteer/package/lib/esm/puppeteer/common/WebSocketTransport.js",
"front_end/third_party/puppeteer/package/lib/esm/puppeteer/common/WebWorker.js",
"front_end/third_party/puppeteer/package/lib/esm/puppeteer/common/assert.js",
"front_end/third_party/puppeteer/package/lib/esm/puppeteer/common/fetch.js",
"front_end/third_party/puppeteer/package/lib/esm/puppeteer/common/helper.js",
"front_end/third_party/puppeteer/package/lib/esm/puppeteer/environment.js",
"front_end/third_party/puppeteer/package/lib/esm/puppeteer/index-core.js",
"front_end/third_party/puppeteer/package/lib/esm/puppeteer/index.js",
"front_end/third_party/puppeteer/package/lib/esm/puppeteer/initialize.js",
"front_end/third_party/puppeteer/package/lib/esm/puppeteer/initialize-node.js",
"front_end/third_party/puppeteer/package/lib/esm/puppeteer/initialize-web.js",
"front_end/third_party/puppeteer/package/lib/esm/puppeteer/node-puppeteer-core.js",
"front_end/third_party/puppeteer/package/lib/esm/puppeteer/node.js",
"front_end/third_party/puppeteer/package/lib/esm/puppeteer/node/BrowserFetcher.js",
"front_end/third_party/puppeteer/package/lib/esm/puppeteer/node/BrowserRunner.js",
"front_end/third_party/puppeteer/package/lib/esm/puppeteer/node/LaunchOptions.js",
"front_end/third_party/puppeteer/package/lib/esm/puppeteer/node/Launcher.js",
"front_end/third_party/puppeteer/package/lib/esm/puppeteer/node/NodeWebSocketTransport.js",
"front_end/third_party/puppeteer/package/lib/esm/puppeteer/node/PipeTransport.js",
"front_end/third_party/puppeteer/package/lib/esm/puppeteer/node/Puppeteer.js",
"front_end/third_party/puppeteer/package/lib/esm/puppeteer/node/install.js",
"front_end/third_party/puppeteer/package/lib/esm/puppeteer/revisions.js",
"front_end/third_party/puppeteer/package/lib/esm/puppeteer/web.js",
"front_end/third_party/puppeteer/package/lib/esm/vendor/mitt/src/index.js",
"front_end/third_party/wasmparser/package/dist/esm/WasmDis.js",
"front_end/third_party/wasmparser/package/dist/esm/WasmParser.js",
Expand Down
7 changes: 7 additions & 0 deletions devtools_image_files.gni
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,13 @@ devtools_image_files = [
"elements_panel_icon.svg",
"errorWave.svg",
"flex-direction-icon.svg",
"flex-align-content-center-icon.svg",
"flex-align-content-start-icon.svg",
"flex-align-content-end-icon.svg",
"flex-align-content-space-around-icon.svg",
"flex-align-content-space-between-icon.svg",
"flex-align-content-space-evenly-icon.svg",
"flex-align-content-stretch-icon.svg",
"ic_info_black_18dp.svg",
"ic_page_next_16x16_icon.svg",
"ic_page_prev_16x16_icon.svg",
Expand Down
4 changes: 3 additions & 1 deletion docs/workflows.md
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,12 @@ This works with Chromium 79 or later.
<path-to-chrome>/chrome --custom-devtools-frontend=file://$(realpath out/Default/resources/inspector)
```

Note that `(realpath out/Default/resources/inspector)` expands to the absolute path to build artifacts for DevTools frontend.
Note that `$(realpath out/Default/resources/inspector)` expands to the absolute path to build artifacts for DevTools frontend.

Open DevTools via F12 on Windows/Linux or Cmd+Option+I on Mac.

If you get errors along the line of `Uncaught TypeError: Cannot read property 'setInspectedTabId'` you probably specified an incorrect path - the path has to be absolute. On Mac and Linux, the file url will start with __three__ slashes: `file:///Users/...`.

Tip: You can inspect DevTools with DevTools by undocking DevTools and then opening a second instance of DevTools (F12 on Windows/Linux, Cmd+Option+I on Mac).

##### Running from remote URL
Expand Down
1 change: 1 addition & 0 deletions front_end/Images/flex-align-content-center-icon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions front_end/Images/flex-align-content-end-icon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions front_end/Images/flex-align-content-space-around-icon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions front_end/Images/flex-align-content-space-between-icon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions front_end/Images/flex-align-content-space-evenly-icon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions front_end/Images/flex-align-content-start-icon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions front_end/Images/flex-align-content-stretch-icon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit a030fd2

Please sign in to comment.