From ba4e61e908b63ab44cd99888e650e7be44ce4239 Mon Sep 17 00:00:00 2001 From: Tim van der Lippe Date: Thu, 15 Apr 2021 16:09:25 +0100 Subject: [PATCH] Move screencast to panels/screencast R=aerotwist@chromium.org Bug: 1187573 Change-Id: Icb5e51d18e3cc4949cee6000b5cbc03877ff437a Reviewed-on: https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/2828128 Commit-Queue: Tim van der Lippe Reviewed-by: Paul Lewis --- config/gni/all_devtools_files.gni | 4 +- config/gni/all_devtools_modules.gni | 6 +-- config/gni/devtools_grd_files.gni | 10 ++-- config/gni/devtools_module_entrypoints.gni | 4 +- front_end/BUILD.gn | 2 +- front_end/core/i18n/locales/en-US.json | 48 +++++++++---------- front_end/core/i18n/locales/en-XL.json | 48 +++++++++---------- front_end/entrypoints/inspector/BUILD.gn | 2 +- front_end/entrypoints/inspector/inspector.js | 2 +- .../entrypoints/inspector/inspector.json | 2 +- front_end/{ => panels}/screencast/BUILD.gn | 14 +++--- .../{ => panels}/screencast/InputModel.ts | 2 +- front_end/{ => panels}/screencast/OWNERS | 0 .../{ => panels}/screencast/ScreencastApp.ts | 10 ++-- .../{ => panels}/screencast/ScreencastView.ts | 14 +++--- front_end/{ => panels}/screencast/module.json | 0 .../screencast/screencast-meta.ts | 8 ++-- .../{ => panels}/screencast/screencast.ts | 0 .../screencast/screencastView.css | 0 .../front_end/missing_entrypoints/BUILD.gn | 2 +- .../missing_entrypoints_test.ts | 2 +- 21 files changed, 90 insertions(+), 90 deletions(-) rename front_end/{ => panels}/screencast/BUILD.gn (64%) rename front_end/{ => panels}/screencast/InputModel.ts (98%) rename front_end/{ => panels}/screencast/OWNERS (100%) rename front_end/{ => panels}/screencast/ScreencastApp.ts (94%) rename front_end/{ => panels}/screencast/ScreencastView.ts (98%) rename front_end/{ => panels}/screencast/module.json (100%) rename front_end/{ => panels}/screencast/screencast-meta.ts (84%) rename front_end/{ => panels}/screencast/screencast.ts (100%) rename front_end/{ => panels}/screencast/screencastView.css (100%) diff --git a/config/gni/all_devtools_files.gni b/config/gni/all_devtools_files.gni index 504b35cec9..234e831a34 100644 --- a/config/gni/all_devtools_files.gni +++ b/config/gni/all_devtools_files.gni @@ -255,8 +255,8 @@ all_devtools_files = [ "front_end/panels/application/serviceWorkerCacheViews.css", "front_end/panels/application/serviceWorkersView.css", "front_end/panels/application/serviceWorkerUpdateCycleView.css", - "front_end/screencast/module.json", - "front_end/screencast/screencastView.css", + "front_end/panels/screencast/module.json", + "front_end/panels/screencast/screencastView.css", "front_end/legacy_test_runner/sdk_test_runner/sdk_test_runner.js", "front_end/panels/search/module.json", "front_end/panels/search/searchResultsPane.css", diff --git a/config/gni/all_devtools_modules.gni b/config/gni/all_devtools_modules.gni index 10ab2f3890..1dcd412cae 100644 --- a/config/gni/all_devtools_modules.gni +++ b/config/gni/all_devtools_modules.gni @@ -465,6 +465,9 @@ all_typescript_module_sources = [ "panels/profiler/ProfilesPanel.js", "panels/profiler/TopDownProfileDataGrid.js", "panels/protocol_monitor/ProtocolMonitor.js", + "panels/screencast/InputModel.js", + "panels/screencast/ScreencastApp.js", + "panels/screencast/ScreencastView.js", "panels/search/SearchConfig.js", "panels/search/SearchResultsPane.js", "panels/search/SearchView.js", @@ -481,9 +484,6 @@ all_typescript_module_sources = [ "recorder/RecordingScriptWriter.js", "recorder/RecordingSession.js", "recorder/Steps.js", - "screencast/InputModel.js", - "screencast/ScreencastApp.js", - "screencast/ScreencastView.js", "security/SecurityModel.js", "security/SecurityPanel.js", "settings/FrameworkIgnoreListSettingsTab.js", diff --git a/config/gni/devtools_grd_files.gni b/config/gni/devtools_grd_files.gni index 1e8c24fb1d..66023e95cc 100644 --- a/config/gni/devtools_grd_files.gni +++ b/config/gni/devtools_grd_files.gni @@ -363,6 +363,8 @@ grd_files_release_sources = [ "front_end/panels/protocol_monitor/protocol_monitor-meta.js", "front_end/panels/protocol_monitor/protocol_monitor.js", "front_end/panels/protocol_monitor/protocol_monitor_module.js", + "front_end/panels/screencast/screencast-meta.js", + "front_end/panels/screencast/screencast.js", "front_end/panels/search/search-legacy.js", "front_end/panels/search/search.js", "front_end/panels/search/search_module.js", @@ -371,8 +373,6 @@ grd_files_release_sources = [ "front_end/quick_open/quick_open.js", "front_end/quick_open/quick_open_module.js", "front_end/recorder/recorder.js", - "front_end/screencast/screencast-meta.js", - "front_end/screencast/screencast.js", "front_end/security/security-legacy.js", "front_end/security/security-meta.js", "front_end/security/security.js", @@ -920,6 +920,9 @@ grd_files_debug_sources = [ "front_end/panels/profiler/ProfilesPanel.js", "front_end/panels/profiler/TopDownProfileDataGrid.js", "front_end/panels/protocol_monitor/ProtocolMonitor.js", + "front_end/panels/screencast/InputModel.js", + "front_end/panels/screencast/ScreencastApp.js", + "front_end/panels/screencast/ScreencastView.js", "front_end/panels/search/SearchConfig.js", "front_end/panels/search/SearchResultsPane.js", "front_end/panels/search/SearchView.js", @@ -936,9 +939,6 @@ grd_files_debug_sources = [ "front_end/recorder/RecordingScriptWriter.js", "front_end/recorder/RecordingSession.js", "front_end/recorder/Steps.js", - "front_end/screencast/InputModel.js", - "front_end/screencast/ScreencastApp.js", - "front_end/screencast/ScreencastView.js", "front_end/security/SecurityModel.js", "front_end/security/SecurityPanel.js", "front_end/settings/FrameworkIgnoreListSettingsTab.js", diff --git a/config/gni/devtools_module_entrypoints.gni b/config/gni/devtools_module_entrypoints.gni index 33aa45bc26..75a964a0cd 100644 --- a/config/gni/devtools_module_entrypoints.gni +++ b/config/gni/devtools_module_entrypoints.gni @@ -142,14 +142,14 @@ devtools_module_entrypoint_sources = [ "panels/profiler/profiler.js", "panels/protocol_monitor/protocol_monitor-meta.js", "panels/protocol_monitor/protocol_monitor.js", + "panels/screencast/screencast-meta.js", + "panels/screencast/screencast.js", "panels/search/search-legacy.js", "panels/search/search.js", "quick_open/quick_open-legacy.js", "quick_open/quick_open-meta.js", "quick_open/quick_open.js", "recorder/recorder.js", - "screencast/screencast-meta.js", - "screencast/screencast.js", "security/security-legacy.js", "security/security-meta.js", "security/security.js", diff --git a/front_end/BUILD.gn b/front_end/BUILD.gn index a2c4b3dd3c..36d00089b0 100644 --- a/front_end/BUILD.gn +++ b/front_end/BUILD.gn @@ -47,9 +47,9 @@ group("front_end") { "models/timeline_model:bundle", "models/workspace:bundle", "panels/event_listeners:bundle", + "panels/screencast:bundle", "panels/search:bundle", "recorder:bundle", - "screencast:bundle", "snippets:bundle", "startup:bundle", "theme_support:bundle", diff --git a/front_end/core/i18n/locales/en-US.json b/front_end/core/i18n/locales/en-US.json index b5e886d121..968360346e 100644 --- a/front_end/core/i18n/locales/en-US.json +++ b/front_end/core/i18n/locales/en-US.json @@ -7733,6 +7733,30 @@ "panels/protocol_monitor/ProtocolMonitor.ts | timestamp": { "message": "Timestamp" }, + "panels/screencast/ScreencastApp.ts | toggleScreencast": { + "message": "Toggle screencast" + }, + "panels/screencast/ScreencastView.ts | addressBar": { + "message": "Address bar" + }, + "panels/screencast/ScreencastView.ts | back": { + "message": "back" + }, + "panels/screencast/ScreencastView.ts | forward": { + "message": "forward" + }, + "panels/screencast/ScreencastView.ts | profilingInProgress": { + "message": "Profiling in progress" + }, + "panels/screencast/ScreencastView.ts | reload": { + "message": "reload" + }, + "panels/screencast/ScreencastView.ts | screencastViewOfDebugTarget": { + "message": "Screencast view of debug target" + }, + "panels/screencast/ScreencastView.ts | theTabIsInactive": { + "message": "The tab is inactive" + }, "panels/search/SearchResultsPane.ts | lineS": { "message": "Line {PH1}" }, @@ -7826,30 +7850,6 @@ "recorder/RecordingFileSystem.ts | linkedToS": { "message": "Linked to {PH1}" }, - "screencast/ScreencastApp.ts | toggleScreencast": { - "message": "Toggle screencast" - }, - "screencast/ScreencastView.ts | addressBar": { - "message": "Address bar" - }, - "screencast/ScreencastView.ts | back": { - "message": "back" - }, - "screencast/ScreencastView.ts | forward": { - "message": "forward" - }, - "screencast/ScreencastView.ts | profilingInProgress": { - "message": "Profiling in progress" - }, - "screencast/ScreencastView.ts | reload": { - "message": "reload" - }, - "screencast/ScreencastView.ts | screencastViewOfDebugTarget": { - "message": "Screencast view of debug target" - }, - "screencast/ScreencastView.ts | theTabIsInactive": { - "message": "The tab is inactive" - }, "security/security-meta.ts | security": { "message": "Security" }, diff --git a/front_end/core/i18n/locales/en-XL.json b/front_end/core/i18n/locales/en-XL.json index 1c675bc01c..d3ee5d8912 100644 --- a/front_end/core/i18n/locales/en-XL.json +++ b/front_end/core/i18n/locales/en-XL.json @@ -7733,6 +7733,30 @@ "panels/protocol_monitor/ProtocolMonitor.ts | timestamp": { "message": "T̂ím̂éŝt́âḿp̂" }, + "panels/screencast/ScreencastApp.ts | toggleScreencast": { + "message": "T̂óĝǵl̂é ŝćr̂éêńĉáŝt́" + }, + "panels/screencast/ScreencastView.ts | addressBar": { + "message": "Âd́d̂ŕêśŝ b́âŕ" + }, + "panels/screencast/ScreencastView.ts | back": { + "message": "b̂áĉḱ" + }, + "panels/screencast/ScreencastView.ts | forward": { + "message": "f̂ór̂ẃâŕd̂" + }, + "panels/screencast/ScreencastView.ts | profilingInProgress": { + "message": "P̂ŕôf́îĺîńĝ ín̂ ṕr̂óĝŕêśŝ" + }, + "panels/screencast/ScreencastView.ts | reload": { + "message": "r̂él̂óâd́" + }, + "panels/screencast/ScreencastView.ts | screencastViewOfDebugTarget": { + "message": "Ŝćr̂éêńĉáŝt́ v̂íêẃ ôf́ d̂éb̂úĝ t́âŕĝét̂" + }, + "panels/screencast/ScreencastView.ts | theTabIsInactive": { + "message": "T̂h́ê t́âb́ îś îńâćt̂ív̂é" + }, "panels/search/SearchResultsPane.ts | lineS": { "message": "L̂ín̂é {PH1}" }, @@ -7826,30 +7850,6 @@ "recorder/RecordingFileSystem.ts | linkedToS": { "message": "L̂ín̂ḱêd́ t̂ó {PH1}" }, - "screencast/ScreencastApp.ts | toggleScreencast": { - "message": "T̂óĝǵl̂é ŝćr̂éêńĉáŝt́" - }, - "screencast/ScreencastView.ts | addressBar": { - "message": "Âd́d̂ŕêśŝ b́âŕ" - }, - "screencast/ScreencastView.ts | back": { - "message": "b̂áĉḱ" - }, - "screencast/ScreencastView.ts | forward": { - "message": "f̂ór̂ẃâŕd̂" - }, - "screencast/ScreencastView.ts | profilingInProgress": { - "message": "P̂ŕôf́îĺîńĝ ín̂ ṕr̂óĝŕêśŝ" - }, - "screencast/ScreencastView.ts | reload": { - "message": "r̂él̂óâd́" - }, - "screencast/ScreencastView.ts | screencastViewOfDebugTarget": { - "message": "Ŝćr̂éêńĉáŝt́ v̂íêẃ ôf́ d̂éb̂úĝ t́âŕĝét̂" - }, - "screencast/ScreencastView.ts | theTabIsInactive": { - "message": "T̂h́ê t́âb́ îś îńâćt̂ív̂é" - }, "security/security-meta.ts | security": { "message": "Ŝéĉúr̂ít̂ý" }, diff --git a/front_end/entrypoints/inspector/BUILD.gn b/front_end/entrypoints/inspector/BUILD.gn index 2598b1e349..9501fd0fce 100644 --- a/front_end/entrypoints/inspector/BUILD.gn +++ b/front_end/entrypoints/inspector/BUILD.gn @@ -8,7 +8,7 @@ ts_library("inspector") { sources = [ "inspector.js" ] deps = [ - "../../screencast:meta", + "../../panels/screencast:meta", "../../startup:bundle", "../devtools_app", ] diff --git a/front_end/entrypoints/inspector/inspector.js b/front_end/entrypoints/inspector/inspector.js index 7bdadc749c..33221f5c73 100644 --- a/front_end/entrypoints/inspector/inspector.js +++ b/front_end/entrypoints/inspector/inspector.js @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. import '../devtools_app/devtools_app.js'; -import '../../screencast/screencast-meta.js'; +import '../../panels/screencast/screencast-meta.js'; import * as Startup from '../../startup/startup.js'; // eslint-disable-line rulesdir/es_modules_import Startup.RuntimeInstantiator.startApplication('inspector'); diff --git a/front_end/entrypoints/inspector/inspector.json b/front_end/entrypoints/inspector/inspector.json index 917b94be88..cf688ddeac 100644 --- a/front_end/entrypoints/inspector/inspector.json +++ b/front_end/entrypoints/inspector/inspector.json @@ -1,6 +1,6 @@ { "modules" : [ - { "name": "screencast", "type": "autostart" } + { "name": "panels/screencast", "type": "autostart" } ], "extends": "devtools_app" } diff --git a/front_end/screencast/BUILD.gn b/front_end/panels/screencast/BUILD.gn similarity index 64% rename from front_end/screencast/BUILD.gn rename to front_end/panels/screencast/BUILD.gn index 3c8cc77f48..0163bb7a76 100644 --- a/front_end/screencast/BUILD.gn +++ b/front_end/panels/screencast/BUILD.gn @@ -2,8 +2,8 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -import("../../scripts/build/ninja/devtools_entrypoint.gni") -import("../../scripts/build/ninja/devtools_module.gni") +import("../../../scripts/build/ninja/devtools_entrypoint.gni") +import("../../../scripts/build/ninja/devtools_module.gni") devtools_module("screencast") { sources = [ @@ -13,11 +13,11 @@ devtools_module("screencast") { ] deps = [ - "../core/common:bundle", - "../core/host:bundle", - "../core/i18n:bundle", - "../core/sdk:bundle", - "../ui/legacy:bundle", + "../../core/common:bundle", + "../../core/host:bundle", + "../../core/i18n:bundle", + "../../core/sdk:bundle", + "../../ui/legacy:bundle", ] } diff --git a/front_end/screencast/InputModel.ts b/front_end/panels/screencast/InputModel.ts similarity index 98% rename from front_end/screencast/InputModel.ts rename to front_end/panels/screencast/InputModel.ts index f2843c8ae9..36518caeed 100644 --- a/front_end/screencast/InputModel.ts +++ b/front_end/panels/screencast/InputModel.ts @@ -4,7 +4,7 @@ /* eslint-disable rulesdir/no_underscored_properties */ -import * as SDK from '../core/sdk/sdk.js'; +import * as SDK from '../../core/sdk/sdk.js'; export class InputModel extends SDK.SDKModel.SDKModel { _inputAgent: ProtocolProxyApi.InputApi; diff --git a/front_end/screencast/OWNERS b/front_end/panels/screencast/OWNERS similarity index 100% rename from front_end/screencast/OWNERS rename to front_end/panels/screencast/OWNERS diff --git a/front_end/screencast/ScreencastApp.ts b/front_end/panels/screencast/ScreencastApp.ts similarity index 94% rename from front_end/screencast/ScreencastApp.ts rename to front_end/panels/screencast/ScreencastApp.ts index 6c520bf761..d21a409e33 100644 --- a/front_end/screencast/ScreencastApp.ts +++ b/front_end/panels/screencast/ScreencastApp.ts @@ -4,10 +4,10 @@ /* eslint-disable rulesdir/no_underscored_properties */ -import * as Common from '../core/common/common.js'; -import * as i18n from '../core/i18n/i18n.js'; -import * as SDK from '../core/sdk/sdk.js'; -import * as UI from '../ui/legacy/legacy.js'; +import * as Common from '../../core/common/common.js'; +import * as i18n from '../../core/i18n/i18n.js'; +import * as SDK from '../../core/sdk/sdk.js'; +import * as UI from '../../ui/legacy/legacy.js'; import {ScreencastView} from './ScreencastView.js'; @@ -17,7 +17,7 @@ const UIStrings = { */ toggleScreencast: 'Toggle screencast', }; -const str_ = i18n.i18n.registerUIStrings('screencast/ScreencastApp.ts', UIStrings); +const str_ = i18n.i18n.registerUIStrings('panels/screencast/ScreencastApp.ts', UIStrings); const i18nString = i18n.i18n.getLocalizedString.bind(undefined, str_); let appInstance: ScreencastApp; diff --git a/front_end/screencast/ScreencastView.ts b/front_end/panels/screencast/ScreencastView.ts similarity index 98% rename from front_end/screencast/ScreencastView.ts rename to front_end/panels/screencast/ScreencastView.ts index 00c85766da..25e6023a99 100644 --- a/front_end/screencast/ScreencastView.ts +++ b/front_end/panels/screencast/ScreencastView.ts @@ -30,11 +30,11 @@ /* eslint-disable rulesdir/no_underscored_properties */ -import * as Common from '../core/common/common.js'; -import * as Host from '../core/host/host.js'; -import * as i18n from '../core/i18n/i18n.js'; -import * as SDK from '../core/sdk/sdk.js'; -import * as UI from '../ui/legacy/legacy.js'; +import * as Common from '../../core/common/common.js'; +import * as Host from '../../core/host/host.js'; +import * as i18n from '../../core/i18n/i18n.js'; +import * as SDK from '../../core/sdk/sdk.js'; +import * as UI from '../../ui/legacy/legacy.js'; import {InputModel} from './InputModel.js'; @@ -68,7 +68,7 @@ const UIStrings = { */ addressBar: 'Address bar', }; -const str_ = i18n.i18n.registerUIStrings('screencast/ScreencastView.ts', UIStrings); +const str_ = i18n.i18n.registerUIStrings('panels/screencast/ScreencastView.ts', UIStrings); const i18nString = i18n.i18n.getLocalizedString.bind(undefined, str_); interface Point { @@ -129,7 +129,7 @@ export class ScreencastView extends UI.Widget.VBox implements SDK.OverlayModel.H this._inputModel = screenCaptureModel.target().model(InputModel); this.setMinimumSize(150, 150); - this.registerRequiredCSS('screencast/screencastView.css', {enableLegacyPatching: true}); + this.registerRequiredCSS('panels/screencast/screencastView.css', {enableLegacyPatching: true}); this._shortcuts = {} as { [x: number]: (arg0?: Event|undefined) => boolean, }; diff --git a/front_end/screencast/module.json b/front_end/panels/screencast/module.json similarity index 100% rename from front_end/screencast/module.json rename to front_end/panels/screencast/module.json diff --git a/front_end/screencast/screencast-meta.ts b/front_end/panels/screencast/screencast-meta.ts similarity index 84% rename from front_end/screencast/screencast-meta.ts rename to front_end/panels/screencast/screencast-meta.ts index e42f2ddbd3..38b9d1d21d 100644 --- a/front_end/screencast/screencast-meta.ts +++ b/front_end/panels/screencast/screencast-meta.ts @@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -import * as Common from '../core/common/common.js'; -import * as Root from '../core/root/root.js'; -import * as UI from '../ui/legacy/legacy.js'; +import * as Common from '../../core/common/common.js'; +import * as Root from '../../core/root/root.js'; +import * as UI from '../../ui/legacy/legacy.js'; // eslint-disable-next-line rulesdir/es_modules_import import type * as Screencast from './screencast.js'; @@ -14,7 +14,7 @@ let loadedScreencastModule: (typeof Screencast|undefined); async function loadScreencastModule(): Promise { if (!loadedScreencastModule) { // Side-effect import rescreencast in module.json - await Root.Runtime.Runtime.instance().loadModulePromise('screencast'); + await Root.Runtime.Runtime.instance().loadModulePromise('panels/screencast'); loadedScreencastModule = await import('./screencast.js'); } return loadedScreencastModule; diff --git a/front_end/screencast/screencast.ts b/front_end/panels/screencast/screencast.ts similarity index 100% rename from front_end/screencast/screencast.ts rename to front_end/panels/screencast/screencast.ts diff --git a/front_end/screencast/screencastView.css b/front_end/panels/screencast/screencastView.css similarity index 100% rename from front_end/screencast/screencastView.css rename to front_end/panels/screencast/screencastView.css diff --git a/test/unittests/front_end/missing_entrypoints/BUILD.gn b/test/unittests/front_end/missing_entrypoints/BUILD.gn index 48245a4948..67bb70cd1f 100644 --- a/test/unittests/front_end/missing_entrypoints/BUILD.gn +++ b/test/unittests/front_end/missing_entrypoints/BUILD.gn @@ -27,7 +27,7 @@ ts_library("missing_entrypoints") { "../../../../front_end/panels/performance_monitor:bundle", "../../../../front_end/panels/profiler:bundle", "../../../../front_end/panels/protocol_monitor:bundle", - "../../../../front_end/screencast:bundle", + "../../../../front_end/panels/screencast:bundle", "../../../../front_end/security:bundle", "../../../../front_end/settings:bundle", "../../../../front_end/startup:bundle", diff --git a/test/unittests/front_end/missing_entrypoints/missing_entrypoints_test.ts b/test/unittests/front_end/missing_entrypoints/missing_entrypoints_test.ts index 295f4fc42d..d14e94f4c1 100644 --- a/test/unittests/front_end/missing_entrypoints/missing_entrypoints_test.ts +++ b/test/unittests/front_end/missing_entrypoints/missing_entrypoints_test.ts @@ -32,7 +32,7 @@ describeWithEnvironment('Imports entrypoints that are yet to be tested', () => { await import('../../../../front_end/panels/profiler/profiler.js'); await import('../../../../front_end/panels/protocol_monitor/protocol_monitor.js'); await import('../../../../front_end/panels/application/application.js'); - await import('../../../../front_end/screencast/screencast.js'); + await import('../../../../front_end/panels/screencast/screencast.js'); await import('../../../../front_end/security/security.js'); await import('../../../../front_end/settings/settings.js'); await import('../../../../front_end/startup/startup.js');