Merge branch 'master' into app_shared_pkg_web

Author: kevmoo

.github/workflows/build.yaml

@@ -52,6 +52,7 @@ jobs:
           - build_dart2js
           - test_ddc
           - test_dart2js
+          - benchmarks_dart2js
     steps:
       - name: git clone
         uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac

.github/workflows/flutter-candidate-update.yaml

@@ -3,7 +3,7 @@ on:
   workflow_dispatch: # Allows for manual triggering if needed
   schedule:
     # * is a special character in YAML so you have to quote this string
-    - cron: "0 8 * * *" # Run every day at midnight Pacific Time
+    - cron: "0 8/12 * * *" # Run every day at midnight and noon Pacific Time
 
 permissions:
   contents: write

CONTRIBUTING.md

@@ -84,7 +84,7 @@ of launch configurations for running and debugging DevTools:
 
 ### Workflow for making changes
 
-1. Change your local Flutter SDK to the latest flutter candidate branch: `./tool/update_flutter_sdk.sh --local`
+1. Change your local Flutter SDK to the latest flutter candidate branch: `devtools_tool update-flutter-sdk --local`
 2. Create a branch from your cloned DevTools repo: `git checkout -b myBranch`
 3. Ensure your branch, dependencies, and generated code are up-to-date: `devtools_tool sync`
 4. Implement your changes, and commit to your branch: `git commit -m “description”`

case_study/memory_leaks/memory_leak_app/pubspec.yaml

@@ -11,7 +11,7 @@ dependencies:
 dev_dependencies:
   flutter_test:
     sdk: flutter
-  intl: '>=0.16.1 <0.19.0'
+  intl: ^0.18.0
   http: ^0.13.5
 
 # For information on the generic Dart part of this file, see the

flutter-candidate.txt

@@ -1 +1 @@
-3.16.0-16.0.pre
+3.16.0-17.0.pre

packages/devtools_app/lib/devtools_app.dart

@@ -57,6 +57,7 @@ export 'src/service/json_to_service_cache.dart';
 export 'src/service/resolved_uri_manager.dart';
 export 'src/service/service_extensions.dart';
 export 'src/service/service_manager.dart';
+export 'src/service/service_registrations.dart';
 export 'src/service/timeline_streams.dart';
 export 'src/service/vm_flags.dart';
 export 'src/service/vm_service_wrapper.dart';

packages/devtools_app/lib/src/screens/performance/panes/frame_analysis/frame_hints.dart

@@ -370,10 +370,10 @@ class ShaderCompilationHint extends StatelessWidget {
                 LinkTextSpan(
                   link: Link(
                     display: 'Impeller',
-                    url: impellerWikiUrl,
+                    url: impellerDocsUrl,
                     gaScreenName: gac.performance,
                     gaSelectedItemDescription:
-                        gac.PerformanceDocs.impellerWikiLink.name,
+                        gac.PerformanceDocs.impellerDocsLink.name,
                   ),
                   context: context,
                 ),

packages/devtools_app/lib/src/screens/performance/panes/raster_stats/raster_stats.dart

@@ -14,19 +14,48 @@ import '../../../../shared/globals.dart';
 import '../../../../shared/primitives/utils.dart';
 import '../../../../shared/table/table.dart';
 import '../../../../shared/table/table_data.dart';
+import '../../performance_utils.dart';
 import 'raster_stats_controller.dart';
 import 'raster_stats_model.dart';
 
 class RasterStatsView extends StatelessWidget {
   const RasterStatsView({
     super.key,
     required this.rasterStatsController,
+    required this.impellerEnabled,
   });
 
   final RasterStatsController rasterStatsController;
 
+  final bool impellerEnabled;
+
   @override
   Widget build(BuildContext context) {
+    if (impellerEnabled) {
+      return Center(
+        child: RichText(
+          textAlign: TextAlign.center,
+          text: TextSpan(
+            text: 'The Raster Stats tool is not currently available for the '
+                'Impeller backend.\nLearn more about the status of ',
+            style: Theme.of(context).regularTextStyle,
+            children: [
+              LinkTextSpan(
+                link: Link(
+                  display: 'Impeller',
+                  url: impellerDocsUrl,
+                  gaScreenName: gac.performance,
+                  gaSelectedItemDescription:
+                      gac.PerformanceDocs.impellerDocsLinkFromRasterStats.name,
+                ),
+                context: context,
+              ),
+              const TextSpan(text: '.'),
+            ],
+          ),
+        ),
+      );
+    }
     return Column(
       children: [
         if (!offlineController.offlineMode.value)

packages/devtools_app/lib/src/screens/performance/panes/raster_stats/raster_stats_controller.dart

@@ -41,6 +41,10 @@ class RasterStatsController extends PerformanceFeatureController {
       setData(rasterStats);
     } catch (e, st) {
       _log.shout('Error collecting raster stats: $e', e, st);
+      notificationService.pushError(
+        'Error collecting raster stats: $e',
+        stackTrace: st.toString(),
+      );
       clearData();
     } finally {
       _loadingSnapshot.value = false;

packages/devtools_app/lib/src/screens/performance/performance_controller.dart

@@ -7,6 +7,7 @@ import 'dart:async';
 import 'package:devtools_app_shared/utils.dart';
 import 'package:vm_service/vm_service.dart';
 
+import '../../service/service_registrations.dart' as registrations;
 import '../../shared/diagnostics/inspector_service.dart';
 import '../../shared/feature_flags.dart';
 import '../../shared/globals.dart';
@@ -98,6 +99,9 @@ class PerformanceController extends DisposableController
   /// in selected timeline event, selected frame, etc.).
   PerformanceData? offlinePerformanceData;
 
+  bool get impellerEnabled => _impellerEnabled;
+  late final bool _impellerEnabled;
+
   final _initialized = Completer<void>();
 
   Future<void> get initialized => _initialized.future;
@@ -115,6 +119,17 @@ class PerformanceController extends DisposableController
     if (!offlineController.offlineMode.value) {
       await serviceConnection.serviceManager.onServiceAvailable;
 
+      if (serviceConnection.serviceManager.connectedApp?.isFlutterAppNow ??
+          false) {
+        final impellerEnabledResponse = await serviceConnection.serviceManager
+            .callServiceExtensionOnMainIsolate(
+          registrations.isImpellerEnabled,
+        );
+        _impellerEnabled = impellerEnabledResponse.json?['enabled'] == true;
+      } else {
+        _impellerEnabled = false;
+      }
+
       enhanceTracingController.init();
 
       // Listen for Flutter.Frame events with frame timing data.

packages/devtools_app/lib/src/screens/performance/performance_utils.dart

@@ -87,7 +87,7 @@ void debugTraceEventCallback(VoidCallback callback) {
 
 const preCompileShadersDocsUrl = 'https://docs.flutter.dev/perf/shader';
 
-const impellerWikiUrl = 'https://github.com/flutter/flutter/wiki/Impeller';
+const impellerDocsUrl = 'https://docs.flutter.dev/perf/impeller';
 
 extension TraceEventExtension on TraceEvent {
   bool get isThreadNameEvent =>

packages/devtools_app/lib/src/screens/performance/tabbed_performance_view.dart

@@ -152,6 +152,7 @@ class _TabbedPerformanceViewState extends State<TabbedPerformanceView>
             child: Center(
               child: RasterStatsView(
                 rasterStatsController: controller.rasterStatsController,
+                impellerEnabled: controller.impellerEnabled,
               ),
             ),
           ),

packages/devtools_app/lib/src/service/service_registrations.dart

@@ -58,3 +58,7 @@ const renderFrameWithRasterStats = '_flutter.renderFrameWithRasterStats';
 
 /// Dwds listens to events for recording end-to-end analytics.
 const dwdsSendEvent = 'ext.dwds.sendEvent';
+
+/// Service extension that returns whether or not the Impeller rendering engine
+/// is being used (if false, the app is using SKIA).
+const isImpellerEnabled = 'ext.ui.window.impellerEnabled';

packages/devtools_app/lib/src/shared/analytics/_analytics_web.dart

@@ -8,12 +8,11 @@ library gtags;
 // ignore_for_file: non_constant_identifier_names
 
 import 'dart:async';
-// ignore: avoid_web_libraries_in_flutter, by design
-import 'dart:html';
 
 import 'package:devtools_app_shared/ui.dart';
 import 'package:js/js.dart';
 import 'package:logging/logging.dart';
+import 'package:web/helpers.dart';
 
 import '../../../devtools.dart' as devtools show version;
 import '../config_specific/server/server.dart' as server;
@@ -802,7 +801,7 @@ Future<bool> disableAnalytics() async {
 /// devtoolsChrome.
 void computeDevToolsCustomGTagsData() {
   // Platform
-  final String platform = window.navigator.platform!;
+  final String platform = window.navigator.platform;
   platform.replaceAll(' ', '_');
   devtoolsPlatformType = platform;
 

packages/devtools_app/lib/src/shared/analytics/constants/_performance_constants.dart

@@ -50,6 +50,7 @@ enum PerformanceDocs {
   intrinsicOperationsDocs,
   shaderCompilationDocs,
   shaderCompilationDocsTooltipLink,
-  impellerWikiLink,
+  impellerDocsLink,
+  impellerDocsLinkFromRasterStats,
   platformChannelsDocs,
 }

packages/devtools_app/lib/src/shared/banner_messages.dart

@@ -355,10 +355,10 @@ class ShaderJankMessage {
           LinkTextSpan(
             link: Link(
               display: 'Impeller',
-              url: impellerWikiUrl,
+              url: impellerDocsUrl,
               gaScreenName: screenId,
               gaSelectedItemDescription:
-                  gac.PerformanceDocs.impellerWikiLink.name,
+                  gac.PerformanceDocs.impellerDocsLink.name,
             ),
             context: context,
             style: theme.errorMessageLinkStyle,

packages/devtools_app/lib/src/shared/common_widgets.dart

@@ -976,10 +976,7 @@ class CenteredMessage extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return Center(
-      child: Text(
-        message,
-        style: Theme.of(context).textTheme.titleLarge,
-      ),
+      child: Text(message),
     );
   }
 }

packages/devtools_app/lib/src/shared/memory/adapted_heap_data.dart

@@ -2,8 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'dart:io';
-
 import 'package:flutter/foundation.dart';
 import 'package:vm_service/vm_service.dart';
 
@@ -74,17 +72,6 @@ class AdaptedHeapData {
     return AdaptedHeapData(objects);
   }
 
-  @visibleForTesting
-  static Future<AdaptedHeapData> fromFile(
-    String fileName,
-  ) async {
-    final file = File(fileName);
-    final bytes = await file.readAsBytes();
-    final data = bytes.buffer.asByteData();
-    final graph = HeapSnapshotGraph.fromChunks([data]);
-    return AdaptedHeapData.fromHeapSnapshot(graph);
-  }
-
   /// Default value for rootIndex is taken from the doc:
   /// https://github.com/dart-lang/sdk/blob/main/runtime/vm/service/heap_snapshot.md#object-ids
   static const int _defaultRootIndex = 1;

packages/devtools_app/pubspec.yaml

@@ -43,7 +43,7 @@ dependencies:
     sdk: flutter
   http: ^0.13.4
   image: ^3.0.2
-  intl: ">=0.16.1 <=0.18.1"
+  intl: ^0.18.0
   js: ^0.6.1+1
   json_rpc_2: ^3.0.2
   logging: ^1.1.1
@@ -65,6 +65,7 @@ dependencies:
   vm_service: ^12.0.0
   # TODO https://github.com/dart-lang/sdk/issues/52853 - unpin this version
   vm_snapshot_analysis: 0.7.2
+  web: ^0.3.0
   web_socket_channel: ^2.1.0
   # widget_icons: ^0.0.1
 
@@ -81,8 +82,9 @@ dev_dependencies:
   integration_test:
     sdk: flutter
   mockito: ^5.4.1
-  webkit_inspection_protocol: ">=0.5.0 <2.0.0"
   stager: ^1.0.1
+  test: ^1.21.1
+  webkit_inspection_protocol: ">=0.5.0 <2.0.0"
 
 flutter:
   uses-material-design: true

packages/devtools_app/release_notes/NEXT_RELEASE_NOTES.md

@@ -19,7 +19,7 @@ video provides a brief tutorial for each DevTools screen.
 
 * Fix a bug with service extension states not being cleared on app disconnect.
 [#6547](https://github.com/flutter/devtools/pull/6547)
-- Improved styling of bottom status bar when connected to an app. [#6525](https://github.com/flutter/devtools/pull/6525)
+* Improved styling of bottom status bar when connected to an app. [#6525](https://github.com/flutter/devtools/pull/6525)
 
 ## Inspector updates
 
@@ -28,7 +28,7 @@ TODO: Remove this section if there are not any general updates.
 ## Performance updates
 
 * Added an option in the "Enhance Tracing" menu for tracking platform channel
-activity. This is useful for apps with plugins.
+activity. This is useful for apps with plugins. [#6515](https://github.com/flutter/devtools/pull/6515)
 
     ![Track platform channels setting](images/track_platform_channels.png "Track platform channels setting")
 
@@ -37,6 +37,10 @@ previously saved from DevTools can be reloaded for viewing from this screen. [#6
 * Added an "Open" button to the Performance controls for loading data that was previously saved
 from DevTools. [#6567](https://github.com/flutter/devtools/pull/6567)
 
+    ![Open file button on the performance screen](images/open_file_performance_screen.png "Open file button on the performance screen")
+
+* Disable the Raster Stats tool for the Impeller backend since it is not supported. [#6616](https://github.com/flutter/devtools/pull/6616)
+
 ## CPU profiler updates
 
 * Tree guidelines are now always enabled for the "Bottom Up" and "Call Tree" tabs. [#6534](https://github.com/flutter/devtools/pull/6534)
@@ -55,7 +59,7 @@ TODO: Remove this section if there are not any general updates.
 
 ## Network profiler updates
 
-* Network statuses now show with an error color when the request failed [#6527](https://github.com/flutter/devtools/pull/6527)
+* Network statuses now show with an error color when the request failed. [#6527](https://github.com/flutter/devtools/pull/6527)
 
 ## Logging updates
 
@@ -68,7 +72,7 @@ TODO: Remove this section if there are not any general updates.
 ## VS Code Sidebar updates
 
 * When using VS Code with a light theme, the embedded sidebar provided by DevTools will now also show in the light
-theme [#6581](https://github.com/flutter/devtools/pull/6581)
+theme. [#6581](https://github.com/flutter/devtools/pull/6581)
 
 ## Full commit history
 

packages/devtools_app/release_notes/images/open_file_performance_screen.png

@@ -248,7 +248,7 @@ void main() {
         expect(find.byType(AnalysisView), findsOneWidget);
         expect(
           find.text(
-            'Dart AOT snapshot: lib/src/app_size/stub_data/new_v8.dart - 7/28/2020 1:29 PM',
+            'Dart AOT snapshot: lib/src/app_size/stub_data/new_v8.dart - 7/28/2020 1:29 PM',
           ),
           findsOneWidget,
         );
@@ -359,9 +359,10 @@ void main() {
         expect(find.text('No File Selected'), findsNothing);
 
         expect(find.byType(DiffView), findsOneWidget);
+
         expect(
           find.text(
-            'Diffing Dart AOT snapshots: lib/src/app_size/stub_data/old_v8.dart - 7/28/2020 1:29 PM (OLD)    vs    (NEW) lib/src/app_size/stub_data/new_v8.dart - 7/28/2020 1:29 PM',
+            'Diffing Dart AOT snapshots: lib/src/app_size/stub_data/old_v8.dart - 7/28/2020 1:29 PM (OLD)    vs    (NEW) lib/src/app_size/stub_data/new_v8.dart - 7/28/2020 1:29 PM',
           ),
           findsOneWidget,
         );

packages/devtools_app/test/app_size/app_size_screen_test.dart

@@ -29,6 +29,7 @@ void main() {
       );
       setGlobal(ServiceConnectionManager, mockServiceConnection);
       setGlobal(IdeTheme, IdeTheme());
+      setGlobal(NotificationService, NotificationService());
 
       controller =
           RasterStatsController(createMockPerformanceControllerWithDefaults());