Merge branch 'ChromeDevTools:main' into main

Author: tysonthomas9

.gitignore

@@ -21,7 +21,6 @@
 /scripts/visualize_deps/out
 config.gypi
 /karma-coverage
-/interactions-coverage
 /perf-data
 npm-debug.log
 /scripts/protocol_typescript/*.js

.stylelintignore

@@ -1,6 +1,5 @@
 front_end/third_party
 karma-coverage
-interactions-coverage
 node_modules
 out
 test/**/fixtures

BUILD.gn

@@ -89,9 +89,9 @@ action("assert_third_party_readmes") {
 }
 
 _expected_grd_files = []
-_expected_grd_files += grd_files_release_sources
-if (is_debug) {
-  _expected_grd_files += grd_files_debug_sources
+_expected_grd_files += grd_files_bundled_sources
+if (!devtools_bundle) {
+  _expected_grd_files += grd_files_unbundled_sources
 }
 
 generated_file("expected_grd_files") {

DEPS

@@ -15,24 +15,24 @@ vars = {
   'build_revision': 'e13953ced04ed05f45aa3c961bd6d802aced74ec',
 
   'buildtools_url': 'https://chromium.googlesource.com/chromium/src/buildtools.git',
-  'buildtools_revision': '64b9f65d16a4de27d1d3e7d880ddc983f281151f',
+  'buildtools_revision': 'f7862e515c44313f6942517fef6d7718d92283d3',
 
   'depot_tools_url': 'https://chromium.googlesource.com/chromium/tools/depot_tools.git',
-  'depot_tools_revision': 'd255a8d41e7a2fdc6b50fee69e70014f875d47ef',
+  'depot_tools_revision': '5cc29c7a217801cfa7b7b0aa23144300b49b750d',
 
   'inspector_protocol_url': 'https://chromium.googlesource.com/deps/inspector_protocol',
   'inspector_protocol_revision': '6d1ae0f13aae6ad381ca31b17b88a0f5af29ca94',
 
   # Keeping track of the last time we rollerd the browser protocol files.
-  'chromium_browser_protocol_revision' : 'd2038f87e77355d9568c6446169e2e3f07197ee8',
+  'chromium_browser_protocol_revision' : '9a6cdde91b579b777f10c566efb8b25d7552f21e',
 
   'clang_format_url': 'https://chromium.googlesource.com/external/github.com/llvm/llvm-project/clang/tools/clang-format.git',
   'clang_format_revision': '37f6e68a107df43b7d7e044fd36a13cbae3413f2',
 
   'emscripten_tag': 'ade9d780ff17c88d81aa13860361743e3c1e1396',
 
   # GN CIPD package version.
-  'gn_version': 'git_revision:e5c4d1881b85b82789b7013233a944cf1a46370f',
+  'gn_version': 'git_revision:97b68a0bb62b7528bc3491c7949d6804223c2b82',
 
   'cmake_version': 'version:2@3.21.3',
 
@@ -49,7 +49,7 @@ vars = {
   # Chrome version used for tests. It should be regularly updated to
   # match the Canary version listed here:
   # https://googlechromelabs.github.io/chrome-for-testing/last-known-good-versions.json
-  'chrome': '139.0.7222.0',
+  'chrome': '139.0.7247.0',
 
   # 'magic' text to tell depot_tools that git submodules should be accepted but
   # but parity with DEPS file is expected.
@@ -59,7 +59,7 @@ vars = {
   'non_git_source': 'True',
 
   # siso CIPD package version
-  'siso_version': 'git_revision:963177240b1a36697c9762856f51ad36ab545ceb',
+  'siso_version': 'git_revision:4ac6aa83563aed91e78947b2b466eb6d49d51a21',
 }
 
 # Only these hosts are allowed for dependencies in this DEPS file.

PRESUBMIT.py

@@ -51,28 +51,25 @@
 def _ExecuteSubProcess(input_api,
                        output_api,
                        script_path,
-                       script_arguments=[],
-                       results=[],
+                       script_arguments=None,
                        message=None):
     if isinstance(script_path, six.string_types):
         script_path = [input_api.python3_executable, script_path]
 
     start_time = time.time()
-    process = input_api.subprocess.Popen(script_path + script_arguments,
+    process = input_api.subprocess.Popen(script_path +
+                                         (script_arguments or []),
                                          stdout=input_api.subprocess.PIPE,
                                          stderr=input_api.subprocess.STDOUT)
     out, _ = process.communicate()
     end_time = time.time()
     time_difference = end_time - start_time
-    if process.returncode != 0:
-        results.extend([
-            output_api.PresubmitError(
-                "%s (%.1fs): %s" %
-                (message if message is not None else script_path,
-                 time_difference, out.decode('utf-8').strip()))
-        ])
-
-    return results
+    return [
+        output_api.PresubmitError(
+            "%s (%.1fs): %s" %
+            (message if message is not None else script_path, time_difference,
+             out.decode('utf-8').strip()))
+    ] if process.returncode != 0 else []
 
 
 def _IsEnvCog(input_api):
@@ -113,7 +110,7 @@ def _GetAffectedFiles(input_api, parent_directories, excluded_actions,
 def _CheckWithNodeScript(input_api,
                          output_api,
                          script_path,
-                         script_arguments=[],
+                         script_arguments=None,
                          allow_typescript=False,
                          message=None):
     original_sys_path = sys.path
@@ -170,19 +167,9 @@ def _CheckFormat(input_api, output_api):
                 'Non-git environment detected, skipping _CheckFormat.')
         ]
 
-    results = []
-
-    _ExecuteSubProcess(input_api,
-                       output_api, ['git', 'cl', 'format', '--js'],
-                       results=results,
-                       message='Format JS')
-
-    _ExecuteSubProcess(input_api,
-                       output_api, ['git', 'cl', 'format'],
-                       results=results,
-                       message='Format')
-
-    return results
+    return _ExecuteSubProcess(input_api,
+                              output_api, ['git', 'cl', 'format', '--js'],
+                              message='Format')
 
 
 def CheckBugAssociationOnCommit(input_api, output_api):
@@ -449,15 +436,6 @@ def CheckForTooLargeFiles(input_api, output_api):
 
 
 def CheckObsoleteScreenshotGoldens(input_api, output_api):
-    interaction_test_root_path = input_api.os_path.join(
-        input_api.PresubmitLocalPath(), 'test', 'interactions')
-    interaction_test_files = [interaction_test_root_path]
-
-    interaction_test_files_changed = _GetAffectedFiles(input_api,
-                                                       interaction_test_files,
-                                                       [], [])
-    if len(interaction_test_files_changed) == 0:
-        return []
     script_path = input_api.os_path.join(input_api.PresubmitLocalPath(),
                                          'scripts', 'test',
                                          'check_obsolete_goldens.js')

buildtools

@@ -3,13 +3,13 @@
 # found in the LICENSE file.
 
 # This represents all the files expected to be be in the GRD. The file
-# has two lists, one for files expected for the Release build
-# (is_debug=false), and another for the Debug build (is_debug=true).
+# has two lists, one for files expected for the "bundled" build
+# (devtools_bundle=true), and another for the "unbundled" build (devtools_bundle=false).
 # The two lists are checked for overlap, and an error thrown if there is
 # any. In the root BUILD.gn these lists are used to ensure that no files
 # are missed from the GRD.
 
-grd_files_release_sources = [
+grd_files_bundled_sources = [
   "front_end/Images/3d-center.svg",
   "front_end/Images/3d-pan.svg",
   "front_end/Images/3d-rotate.svg",
@@ -869,7 +869,7 @@ grd_files_release_sources = [
   "front_end/worker_app.html",
 ]
 
-grd_files_debug_sources = [
+grd_files_unbundled_sources = [
   "front_end/core/common/App.js",
   "front_end/core/common/AppProvider.js",
   "front_end/core/common/Base64.js",
@@ -1187,11 +1187,8 @@ grd_files_debug_sources = [
   "front_end/models/trace/LanternComputationData.js",
   "front_end/models/trace/ModelImpl.js",
   "front_end/models/trace/Processor.js",
-  "front_end/models/trace/TracingManager.js",
-  "front_end/models/trace/extras/FetchNodes.js",
   "front_end/models/trace/extras/FilmStrip.js",
   "front_end/models/trace/extras/MainThreadActivity.js",
-  "front_end/models/trace/extras/Metadata.js",
   "front_end/models/trace/extras/ScriptDuplication.js",
   "front_end/models/trace/extras/StackTraceForEvent.js",
   "front_end/models/trace/extras/ThirdParties.js",
@@ -1246,10 +1243,10 @@ grd_files_debug_sources = [
   "front_end/models/trace/insights/DuplicatedJavaScript.js",
   "front_end/models/trace/insights/FontDisplay.js",
   "front_end/models/trace/insights/ForcedReflow.js",
+  "front_end/models/trace/insights/INPBreakdown.js",
   "front_end/models/trace/insights/ImageDelivery.js",
-  "front_end/models/trace/insights/InteractionToNextPaint.js",
+  "front_end/models/trace/insights/LCPBreakdown.js",
   "front_end/models/trace/insights/LCPDiscovery.js",
-  "front_end/models/trace/insights/LCPPhases.js",
   "front_end/models/trace/insights/LegacyJavaScript.js",
   "front_end/models/trace/insights/Models.js",
   "front_end/models/trace/insights/ModernHTTP.js",
@@ -1315,10 +1312,8 @@ grd_files_debug_sources = [
   "front_end/panels/ai_assistance/components/userActionRow.css.js",
   "front_end/panels/ai_assistance/selectWorkspaceDialog.css.js",
   "front_end/panels/animation/AnimationGroupPreviewUI.js",
-  "front_end/panels/animation/AnimationScreenshotPopover.js",
   "front_end/panels/animation/AnimationTimeline.js",
   "front_end/panels/animation/AnimationUI.js",
-  "front_end/panels/animation/animationScreenshotPopover.css.js",
   "front_end/panels/animation/animationTimeline.css.js",
   "front_end/panels/application/AppManifestView.js",
   "front_end/panels/application/ApplicationPanelSidebar.js",
@@ -1499,6 +1494,7 @@ grd_files_debug_sources = [
   "front_end/panels/elements/ImagePreviewPopover.js",
   "front_end/panels/elements/InspectElementModeController.js",
   "front_end/panels/elements/LayersWidget.js",
+  "front_end/panels/elements/LayoutPane.js",
   "front_end/panels/elements/MarkerDecorator.js",
   "front_end/panels/elements/MetricsSidebarPane.js",
   "front_end/panels/elements/NodeStackTraceWidget.js",
@@ -1529,8 +1525,6 @@ grd_files_debug_sources = [
   "front_end/panels/elements/components/ElementsBreadcrumbsUtils.js",
   "front_end/panels/elements/components/ElementsTreeExpandButton.js",
   "front_end/panels/elements/components/Helper.js",
-  "front_end/panels/elements/components/LayoutPane.js",
-  "front_end/panels/elements/components/LayoutPaneUtils.js",
   "front_end/panels/elements/components/QueryContainer.js",
   "front_end/panels/elements/components/StylePropertyEditor.js",
   "front_end/panels/elements/components/accessibilityTreeNode.css.js",
@@ -1542,7 +1536,6 @@ grd_files_debug_sources = [
   "front_end/panels/elements/components/cssVariableValueView.css.js",
   "front_end/panels/elements/components/elementsBreadcrumbs.css.js",
   "front_end/panels/elements/components/elementsTreeExpandButton.css.js",
-  "front_end/panels/elements/components/layoutPane.css.js",
   "front_end/panels/elements/components/queryContainer.css.js",
   "front_end/panels/elements/components/stylePropertyEditor.css.js",
   "front_end/panels/elements/computedStyleSidebarPane.css.js",
@@ -1552,6 +1545,7 @@ grd_files_debug_sources = [
   "front_end/panels/elements/elementsPanel.css.js",
   "front_end/panels/elements/elementsTreeOutline.css.js",
   "front_end/panels/elements/layersWidget.css.js",
+  "front_end/panels/elements/layoutPane.css.js",
   "front_end/panels/elements/metricsSidebarPane.css.js",
   "front_end/panels/elements/nodeStackTraceWidget.css.js",
   "front_end/panels/elements/platformFontsWidget.css.js",
@@ -1879,6 +1873,8 @@ grd_files_debug_sources = [
   "front_end/panels/sources/AddSourceMapURLDialog.js",
   "front_end/panels/sources/AiWarningInfobarPlugin.js",
   "front_end/panels/sources/BreakpointEditDialog.js",
+  "front_end/panels/sources/BreakpointsView.js",
+  "front_end/panels/sources/BreakpointsViewUtils.js",
   "front_end/panels/sources/CSSPlugin.js",
   "front_end/panels/sources/CallStackSidebarPane.js",
   "front_end/panels/sources/CategorizedBreakpointL10n.js",
@@ -1908,12 +1904,10 @@ grd_files_debug_sources = [
   "front_end/panels/sources/UISourceCodeFrame.js",
   "front_end/panels/sources/WatchExpressionsSidebarPane.js",
   "front_end/panels/sources/breakpointEditDialog.css.js",
+  "front_end/panels/sources/breakpointsView.css.js",
   "front_end/panels/sources/callStackSidebarPane.css.js",
-  "front_end/panels/sources/components/BreakpointsView.js",
-  "front_end/panels/sources/components/BreakpointsViewUtils.js",
   "front_end/panels/sources/components/HeadersView.css.js",
   "front_end/panels/sources/components/HeadersView.js",
-  "front_end/panels/sources/components/breakpointsView.css.js",
   "front_end/panels/sources/debuggerPausedMessage.css.js",
   "front_end/panels/sources/dialog.css.js",
   "front_end/panels/sources/navigatorTree.css.js",
@@ -1945,6 +1939,7 @@ grd_files_debug_sources = [
   "front_end/panels/timeline/LayoutShiftsTrackAppender.js",
   "front_end/panels/timeline/ModificationsManager.js",
   "front_end/panels/timeline/NetworkTrackAppender.js",
+  "front_end/panels/timeline/RecordingMetadata.js",
   "front_end/panels/timeline/SaveFileFormatter.js",
   "front_end/panels/timeline/StatusDialog.js",
   "front_end/panels/timeline/TargetForEvent.js",
@@ -1969,6 +1964,7 @@ grd_files_debug_sources = [
   "front_end/panels/timeline/TimelineUIUtils.js",
   "front_end/panels/timeline/TimingsTrackAppender.js",
   "front_end/panels/timeline/TracingLayerTree.js",
+  "front_end/panels/timeline/TrackConfiguration.js",
   "front_end/panels/timeline/UIDevtoolsController.js",
   "front_end/panels/timeline/UIDevtoolsUtils.js",
   "front_end/panels/timeline/components/Breadcrumbs.js",
@@ -2008,10 +2004,10 @@ grd_files_debug_sources = [
   "front_end/panels/timeline/components/insights/FontDisplay.js",
   "front_end/panels/timeline/components/insights/ForcedReflow.js",
   "front_end/panels/timeline/components/insights/Helpers.js",
+  "front_end/panels/timeline/components/insights/INPBreakdown.js",
   "front_end/panels/timeline/components/insights/ImageDelivery.js",
-  "front_end/panels/timeline/components/insights/InteractionToNextPaint.js",
+  "front_end/panels/timeline/components/insights/LCPBreakdown.js",
   "front_end/panels/timeline/components/insights/LCPDiscovery.js",
-  "front_end/panels/timeline/components/insights/LCPPhases.js",
   "front_end/panels/timeline/components/insights/LegacyJavaScript.js",
   "front_end/panels/timeline/components/insights/ModernHTTP.js",
   "front_end/panels/timeline/components/insights/NetworkDependencyTree.js",
@@ -2052,6 +2048,7 @@ grd_files_debug_sources = [
   "front_end/panels/timeline/overlays/components/entryLabelOverlay.css.js",
   "front_end/panels/timeline/overlays/components/timeRangeOverlay.css.js",
   "front_end/panels/timeline/overlays/components/timespanBreakdownOverlay.css.js",
+  "front_end/panels/timeline/thirdPartyTreeView.css.js",
   "front_end/panels/timeline/timelineFlameChartView.css.js",
   "front_end/panels/timeline/timelineFlamechartPopover.css.js",
   "front_end/panels/timeline/timelineHistoryManager.css.js",
@@ -2064,6 +2061,7 @@ grd_files_debug_sources = [
   "front_end/panels/timeline/utils/AICallTree.js",
   "front_end/panels/timeline/utils/EntityMapper.js",
   "front_end/panels/timeline/utils/EntryName.js",
+  "front_end/panels/timeline/utils/EntryNodes.js",
   "front_end/panels/timeline/utils/EntryStyles.js",
   "front_end/panels/timeline/utils/Helpers.js",
   "front_end/panels/timeline/utils/IgnoreList.js",
@@ -2092,6 +2090,7 @@ grd_files_debug_sources = [
   "front_end/services/puppeteer/PuppeteerConnection.js",
   "front_end/services/trace_bounds/TraceBounds.js",
   "front_end/services/tracing/PerformanceTracing.js",
+  "front_end/services/tracing/TracingManager.js",
   "front_end/services/window_bounds/WindowBoundsService.js",
   "front_end/third_party/acorn/package/dist/acorn.mjs",
   "front_end/third_party/chromium/client-variations/ClientVariations.js",
@@ -2660,12 +2659,12 @@ grd_files_debug_sources = [
 ]
 
 # Confirm that there is no overlap between the two lists.
-_grd_files_release_sources =
-    filter_exclude(grd_files_release_sources, grd_files_debug_sources)
-assert(_grd_files_release_sources == grd_files_release_sources,
-       "Debug and Release file lists overlap")
+_grd_files_bundled_sources =
+    filter_exclude(grd_files_bundled_sources, grd_files_unbundled_sources)
+assert(_grd_files_bundled_sources == grd_files_bundled_sources,
+       "Bundled and Bundled file lists overlap")
 
-_grd_files_debug_sources =
-    filter_exclude(grd_files_debug_sources, grd_files_release_sources)
-assert(_grd_files_debug_sources == grd_files_debug_sources,
-       "Debug and Release file lists overlap")
+_grd_files_unbundled_sources =
+    filter_exclude(grd_files_unbundled_sources, grd_files_bundled_sources)
+assert(_grd_files_unbundled_sources == grd_files_unbundled_sources,
+       "Bundled and Bundled file lists overlap")

config/gni/devtools_grd_files.gni

@@ -3,6 +3,7 @@
 # found in the LICENSE file.
 
 import("//build/config/devtools.gni")
+import("../../scripts/build/ninja/vars.gni")
 
 remote_devtools_locales = [
   "af",
@@ -92,7 +93,7 @@ bundled_devtools_locales = [
   "zh",
 ]
 
-include_en_xl = is_debug
+include_en_xl = !devtools_bundle
 if (include_en_xl) {
   bundled_devtools_locales += [ "en-XL" ]
 }