Skip to content

Commit

Permalink
merge updates from official devtools
Browse files Browse the repository at this point in the history
CHROME-REV:30b618ccf67018972c4d8aaea54bd32fb5f9a95e
CHROME-TAG:81.0.4023.1
  • Loading branch information
darwin committed Jan 10, 2020
2 parents ada6790 + 5155c4a commit d2b49e0
Show file tree
Hide file tree
Showing 118 changed files with 1,862 additions and 1,943 deletions.
29 changes: 27 additions & 2 deletions resources/unpacked/devtools/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -464,12 +464,14 @@ all_devtools_modules = [
"front_end/accessibility/ARIAMetadata.js",
"front_end/accessibility/AXBreadcrumbsPane.js",
"front_end/animation/animation.js",
"front_end/animation/animation-legacy.js",
"front_end/animation/AnimationGroupPreviewUI.js",
"front_end/animation/AnimationModel.js",
"front_end/animation/AnimationScreenshotPopover.js",
"front_end/animation/AnimationTimeline.js",
"front_end/animation/AnimationUI.js",
"front_end/audits/audits.js",
"front_end/audits/audits-legacy.js",
"front_end/audits/AuditsController.js",
"front_end/audits/AuditsPanel.js",
"front_end/audits/AuditsProtocolService.js",
Expand All @@ -481,6 +483,7 @@ all_devtools_modules = [
"front_end/audits/lighthouse/report.js",
"front_end/audits/RadioSetting.js",
"front_end/bindings/bindings.js",
"front_end/bindings/bindings-legacy.js",
"front_end/bindings/BlackboxManager.js",
"front_end/bindings/BreakpointManager.js",
"front_end/bindings/CompilerScriptMapping.js",
Expand All @@ -499,6 +502,7 @@ all_devtools_modules = [
"front_end/bindings/StylesSourceMapping.js",
"front_end/bindings/TempFile.js",
"front_end/browser_debugger/browser_debugger.js",
"front_end/browser_debugger/browser_debugger-legacy.js",
"front_end/browser_debugger/DOMBreakpointsSidebarPane.js",
"front_end/browser_debugger/EventListenerBreakpointsSidebarPane.js",
"front_end/browser_debugger/ObjectEventListenersSidebarPane.js",
Expand Down Expand Up @@ -595,13 +599,16 @@ all_devtools_modules = [
"front_end/console/ConsoleViewMessage.js",
"front_end/console/ConsoleViewport.js",
"front_end/cookie_table/cookie_table.js",
"front_end/cookie_table/cookie_table-legacy.js",
"front_end/cookie_table/CookiesTable.js",
"front_end/coverage/coverage.js",
"front_end/coverage/coverage-legacy.js",
"front_end/coverage/CoverageDecorationManager.js",
"front_end/coverage/CoverageListView.js",
"front_end/coverage/CoverageModel.js",
"front_end/coverage/CoverageView.js",
"front_end/css_overview/css_overview.js",
"front_end/css_overview/css_overview-legacy.js",
"front_end/css_overview/CSSOverviewCompletedView.js",
"front_end/css_overview/CSSOverviewController.js",
"front_end/css_overview/CSSOverviewModel.js",
Expand All @@ -611,12 +618,14 @@ all_devtools_modules = [
"front_end/css_overview/CSSOverviewStartView.js",
"front_end/css_overview/CSSOverviewUnusedDeclarations.js",
"front_end/data_grid/data_grid.js",
"front_end/data_grid/data_grid-legacy.js",
"front_end/data_grid/DataGrid.js",
"front_end/data_grid/ShowMoreDataGridNode.js",
"front_end/data_grid/SortableDataGrid.js",
"front_end/data_grid/ViewportDataGrid.js",
"front_end/diff/diff_match_patch.js",
"front_end/diff/diff.js",
"front_end/diff/diff-legacy.js",
"front_end/diff/DiffWrapper.js",
"front_end/dom_extension/dom_extension.js",
"front_end/dom_extension/DOMExtension.js",
Expand Down Expand Up @@ -653,6 +662,7 @@ all_devtools_modules = [
"front_end/emulation/DevicesSettingsTab.js",
"front_end/emulation/EmulatedDevices.js",
"front_end/emulation/emulation.js",
"front_end/emulation/emulation-legacy.js",
"front_end/emulation/GeolocationsSettingsTab.js",
"front_end/emulation/InspectedPagePlaceholder.js",
"front_end/emulation/MediaQueryInspector.js",
Expand Down Expand Up @@ -681,6 +691,7 @@ all_devtools_modules = [
"front_end/formatter_worker/JavaScriptOutline.js",
"front_end/formatter_worker/RelaxedJSONParser.js",
"front_end/formatter/formatter.js",
"front_end/formatter/formatter-legacy.js",
"front_end/formatter/FormatterWorkerPool.js",
"front_end/formatter/ScriptFormatter.js",
"front_end/formatter/SourceFormatter.js",
Expand Down Expand Up @@ -1322,12 +1333,14 @@ copied_devtools_modules = [
"$resources_out_dir/accessibility/ARIAMetadata.js",
"$resources_out_dir/accessibility/AXBreadcrumbsPane.js",
"$resources_out_dir/animation/animation.js",
"$resources_out_dir/animation/animation-legacy.js",
"$resources_out_dir/animation/AnimationGroupPreviewUI.js",
"$resources_out_dir/animation/AnimationModel.js",
"$resources_out_dir/animation/AnimationScreenshotPopover.js",
"$resources_out_dir/animation/AnimationTimeline.js",
"$resources_out_dir/animation/AnimationUI.js",
"$resources_out_dir/audits/audits.js",
"$resources_out_dir/audits/audits-legacy.js",
"$resources_out_dir/audits/AuditsController.js",
"$resources_out_dir/audits/AuditsPanel.js",
"$resources_out_dir/audits/AuditsProtocolService.js",
Expand All @@ -1339,6 +1352,7 @@ copied_devtools_modules = [
"$resources_out_dir/audits/lighthouse/report.js",
"$resources_out_dir/audits/RadioSetting.js",
"$resources_out_dir/bindings/bindings.js",
"$resources_out_dir/bindings/bindings-legacy.js",
"$resources_out_dir/bindings/BlackboxManager.js",
"$resources_out_dir/bindings/BreakpointManager.js",
"$resources_out_dir/bindings/CompilerScriptMapping.js",
Expand All @@ -1357,6 +1371,7 @@ copied_devtools_modules = [
"$resources_out_dir/bindings/StylesSourceMapping.js",
"$resources_out_dir/bindings/TempFile.js",
"$resources_out_dir/browser_debugger/browser_debugger.js",
"$resources_out_dir/browser_debugger/browser_debugger-legacy.js",
"$resources_out_dir/browser_debugger/DOMBreakpointsSidebarPane.js",
"$resources_out_dir/browser_debugger/EventListenerBreakpointsSidebarPane.js",
"$resources_out_dir/browser_debugger/ObjectEventListenersSidebarPane.js",
Expand Down Expand Up @@ -1453,13 +1468,16 @@ copied_devtools_modules = [
"$resources_out_dir/console/ConsoleViewMessage.js",
"$resources_out_dir/console/ConsoleViewport.js",
"$resources_out_dir/cookie_table/cookie_table.js",
"$resources_out_dir/cookie_table/cookie_table-legacy.js",
"$resources_out_dir/cookie_table/CookiesTable.js",
"$resources_out_dir/coverage/coverage.js",
"$resources_out_dir/coverage/coverage-legacy.js",
"$resources_out_dir/coverage/CoverageDecorationManager.js",
"$resources_out_dir/coverage/CoverageListView.js",
"$resources_out_dir/coverage/CoverageModel.js",
"$resources_out_dir/coverage/CoverageView.js",
"$resources_out_dir/css_overview/css_overview.js",
"$resources_out_dir/css_overview/css_overview-legacy.js",
"$resources_out_dir/css_overview/CSSOverviewCompletedView.js",
"$resources_out_dir/css_overview/CSSOverviewController.js",
"$resources_out_dir/css_overview/CSSOverviewModel.js",
Expand All @@ -1469,12 +1487,14 @@ copied_devtools_modules = [
"$resources_out_dir/css_overview/CSSOverviewStartView.js",
"$resources_out_dir/css_overview/CSSOverviewUnusedDeclarations.js",
"$resources_out_dir/data_grid/data_grid.js",
"$resources_out_dir/data_grid/data_grid-legacy.js",
"$resources_out_dir/data_grid/DataGrid.js",
"$resources_out_dir/data_grid/ShowMoreDataGridNode.js",
"$resources_out_dir/data_grid/SortableDataGrid.js",
"$resources_out_dir/data_grid/ViewportDataGrid.js",
"$resources_out_dir/diff/diff_match_patch.js",
"$resources_out_dir/diff/diff.js",
"$resources_out_dir/diff/diff-legacy.js",
"$resources_out_dir/diff/DiffWrapper.js",
"$resources_out_dir/dom_extension/dom_extension.js",
"$resources_out_dir/dom_extension/DOMExtension.js",
Expand Down Expand Up @@ -1511,6 +1531,7 @@ copied_devtools_modules = [
"$resources_out_dir/emulation/DevicesSettingsTab.js",
"$resources_out_dir/emulation/EmulatedDevices.js",
"$resources_out_dir/emulation/emulation.js",
"$resources_out_dir/emulation/emulation-legacy.js",
"$resources_out_dir/emulation/GeolocationsSettingsTab.js",
"$resources_out_dir/emulation/InspectedPagePlaceholder.js",
"$resources_out_dir/emulation/MediaQueryInspector.js",
Expand All @@ -1525,6 +1546,7 @@ copied_devtools_modules = [
"$resources_out_dir/extensions/ExtensionTraceProvider.js",
"$resources_out_dir/extensions/ExtensionView.js",
"$resources_out_dir/formatter/formatter.js",
"$resources_out_dir/formatter/formatter-legacy.js",
"$resources_out_dir/formatter/FormatterWorkerPool.js",
"$resources_out_dir/formatter/ScriptFormatter.js",
"$resources_out_dir/formatter/SourceFormatter.js",
Expand Down Expand Up @@ -2215,8 +2237,11 @@ action("generate_devtools_grd") {
"front_end",
]

args = ["--file-list", "{{response_file_name}}", "--relative_path_dirs" ] +
rebase_path(relative_path_dirs, root_build_dir) +
args = [
"--file-list",
"{{response_file_name}}",
"--relative_path_dirs",
] + rebase_path(relative_path_dirs, root_build_dir) +
[
"--images",
rebase_path("front_end/Images", root_build_dir),
Expand Down
4 changes: 2 additions & 2 deletions resources/unpacked/devtools/DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ vars = {
'buildtools_revision': '8d2132841536523249669813b928e29144d487f9',

'depot_tools_url': 'https://chromium.googlesource.com/chromium/tools/depot_tools.git',
'depot_tools_revision': '081c5b5979689733fe4bd1a7618943a061cc353f',
'depot_tools_revision': '13928b7e7f1a37e5e70cae53aba089f88bbbccfc',

'inspector_protocol_url': 'https://chromium.googlesource.com/deps/inspector_protocol',
'inspector_protocol_revision': 'dee0c0c65cc2df6284e75ae9fca083dc604c9fca',
'inspector_protocol_revision': '32a87e9a751db8f2903532134a7c8fc6932620ba',

'clang_format_url': 'https://chromium.googlesource.com/chromium/llvm-project/cfe/tools/clang-format.git',
'clang_format_revision': '96636aa0e9f047f17447f2d45a094d0b59ed7917',
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,16 @@
// Copyright (c) 2015 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

import {AnimationGroup} from './AnimationModel.js'; // eslint-disable-line no-unused-vars
import {AnimationUI} from './AnimationUI.js';

/**
* @unrestricted
*/
export default class AnimationGroupPreviewUI {
export class AnimationGroupPreviewUI {
/**
* @param {!Animation.AnimationModel.AnimationGroup} model
* @param {!AnimationGroup} model
*/
constructor(model) {
this._model = model;
Expand Down Expand Up @@ -68,19 +72,7 @@ export default class AnimationGroupPreviewUI {
const y = Math.floor(this._viewBoxHeight / Math.max(6, numberOfAnimations) * i + 1);
line.setAttribute('y1', y);
line.setAttribute('y2', y);
line.style.stroke = Animation.AnimationUI.Color(this._model.animations()[i]);
line.style.stroke = AnimationUI.Color(this._model.animations()[i]);
}
}
}

/* Legacy exported object */
self.Animation = self.Animation || {};

/* Legacy exported object */
Animation = Animation || {};

/**
* @constructor
* @unrestricted
*/
Animation.AnimationGroupPreviewUI = AnimationGroupPreviewUI;
Loading

0 comments on commit d2b49e0

Please sign in to comment.