Merge branch 'fix/gridview_delegate' of https://github.com/hello-coder-xu/flutter into fix/gridview_delegate

* 'fix/gridview_delegate' of https://github.com/hello-coder-xu/flutter: (162 commits)
  add gridview children view
  fix gridview  delegate mainAxisExtent
  Enable TapRegion to detect all mouse button click (flutter#136799)
  [flutter_tools] build ios-frameworks: option to exclude plugin frameworks from the build (flutter#129739)
  Roll Flutter Engine from b87c1b32d55f to eee8aeb953df (1 revision) (flutter#139495)
  Add Impeller complex layout impeller benchmarks. (flutter#139490)
  Roll Flutter Engine from cf122461e94a to b87c1b32d55f (3 revisions) (flutter#139491)
  Remove InkSparkle.constantTurbulenceSeedSplashFactory usage (flutter#139481)
  Roll Packages from bc72d15 to 5d9874f (9 revisions) (flutter#139480)
  Roll Flutter Engine from cc9a72b692fc to cf122461e94a (1 revision) (flutter#139468)
  Roll Flutter Engine from 69cbf87f33c9 to cc9a72b692fc (1 revision) (flutter#139466)
  Roll Flutter Engine from 05e7f462048b to 69cbf87f33c9 (1 revision) (flutter#139453)
  Roll Flutter Engine from e782ab139ef2 to 05e7f462048b (1 revision) (flutter#139439)
  Roll Flutter Engine from 80a2fd76fd64 to e782ab139ef2 (1 revision) (flutter#139437)
  Roll Flutter Engine from 7ff24be43a36 to 80a2fd76fd64 (1 revision) (flutter#139436)
  Roll Flutter Engine from cfabe42bc0c6 to 7ff24be43a36 (1 revision) (flutter#139433)
  Roll Flutter Engine from f0122c32c5cc to cfabe42bc0c6 (1 revision) (flutter#139423)
  Roll Flutter Engine from f23c33f3831c to f0122c32c5cc (1 revision) (flutter#139422)
  Roll Flutter Engine from d441f087052c to f23c33f3831c (2 revisions) (flutter#139421)
  Roll Flutter Engine from 27d37db84b8e to d441f087052c (1 revision) (flutter#139419)
  ...

Author: hello-coder-xu

.ci.yaml

@@ -14,7 +14,7 @@ updates:
       - "yusuf-goog"
     labels:
       - "team"
-      - "team: infra"
+      - "team-infra"
       - "autosubmit"
   - package-ecosystem: "docker"
     directory: "/dev/ci/docker_linux"
@@ -26,7 +26,7 @@ updates:
       - "christopherfujino"
     labels:
       - "team"
-      - "team: infra"
+      - "team-infra"
       - "autosubmit"
   - package-ecosystem: "github-actions"
     directory: "/"
@@ -36,5 +36,5 @@ updates:
       - "godofredoc"
     labels:
       - "team"
-      - "team: infra"
+      - "team-infra"
       - "autosubmit"

.github/dependabot.yml

@@ -18,7 +18,7 @@ jobs:
     runs-on: ubuntu-latest
     if: ${{ github.repository == 'flutter/flutter' }}
     steps:
-      - uses: dessant/lock-threads@d42e5f49803f3c4e14ffee0378e31481265dda22
+      - uses: dessant/lock-threads@1bf7ec25051fe7c00bdd17e6a7cf3d7bfb7dc771
         with:
           process-only: 'issues'
           github-token: ${{ github.token }}

.github/workflows/lock.yaml

@@ -104,6 +104,8 @@
 /dev/devicelab/bin/tasks/draw_atlas_perf__timeline_summary.dart @jonahwilliams @flutter/engine
 /dev/devicelab/bin/tasks/static_path_tessellation_perf__timeline_summary.dart @jonahwilliams @flutter/engine
 /dev/devicelab/bin/tasks/dynamic_path_tessellation_perf__timeline_summary.dart @jonahwilliams @flutter/engine
+/dev/devicelab/bin/tasks/complex_layout_scroll_perf_impeller__timeline_summary.dart @jonahwilliams @flutter/engine
+/dev/devicelab/bin/tasks/complex_layout_scroll_perf_impeller_gles__timeline_summary.dart @jonahwilliams @flutter/engine
 
 ## Windows Android DeviceLab tests
 /dev/devicelab/bin/tasks/basic_material_app_win__compile.dart @zanderso @flutter/tool
@@ -295,12 +297,8 @@
 /dev/devicelab/bin/tasks/windows_startup_test.dart @loic-sharma @flutter/desktop
 
 ## Host only framework tests
-# Linux analyze
-/dev/bots/analyze.dart @HansMuller @flutter/framework
-# Linux/Mac/Windows customer_testing
-/dev/customer_testing/run_tests.dart @HansMuller @flutter/framework
-# Linux docs
-# Linux docs_test
+# Linux docs_deploy_beta
+# Linux docs_deploy_stable
 # Linux docs_publish
 /dev/bots/docs.sh @HansMuller @flutter/framework
 # Linux packages_autoroller
@@ -323,13 +321,17 @@
 # TODO(keyonghan): add files/paths for below framework host only testss.
 # https://github.com/flutter/flutter/issues/82068
 #
+# analyze @HansMuller @flutter/framework
 # build_tests @eliasyishak @flutter/tool
 # ci_yaml flutter roller @caseyhillers @flutter/infra
 # coverage @godofredoc @flutter/infra
+# customer_testing @HansMuller @flutter/framework
+# docs @HansMuller @flutter/framework
 # flutter_packaging @godofredoc @flutter/infra
 # flutter_plugins @stuartmorgan @flutter/plugin
 # framework_tests @HansMuller @flutter/framework
 # fuchsia_precache @christopherfujino @flutter/tool
+# realm_checker @jacksongardner @flutter/tool
 # skp_generator @Hixie
 # test_ownership @keyonghan
 # tool_host_cross_arch_tests @andrewkolos @flutter/tool
@@ -341,4 +343,3 @@
 # web_long_running_tests @yjbanov @flutter/web
 # web_tests @yjbanov @flutter/web
 # web_tool_tests @eliasyishak @flutter/tool
-# realm_checker @jacksongardner @flutter/tool

TESTOWNERS

@@ -1 +1 @@
-dda2499df48a097aa44719b7cd0f7410eee6292a
+eee8aeb953dfc4c7f47730582c90e84556e7974f

bin/internal/engine.version

@@ -1 +1 @@
-c9933fc09a0bb3790def393105f984ad24a2029a
+5d9874f69bcefa4b9970bde72a563d77bdb65d5e

bin/internal/flutter_packages.version

@@ -1 +1 @@
-IK4xyRtZkDwqT6pXAFvX-JUnOhqlqASQWGy3ecKGdesC
+CGyrUgA1M1yFx5N5C1aFQ_Q4Y5uP_FhxctN_UCZ9BugC

bin/internal/fuchsia-linux.version

@@ -68,40 +68,28 @@ class ResampleFlagVariant extends TestVariant<TestScenario> {
 
   late TestScenario currentValue;
   bool get resample {
-    switch (currentValue) {
-      case TestScenario.resampleOn90Hz:
-      case TestScenario.resampleOn59Hz:
-        return true;
-      case TestScenario.resampleOff90Hz:
-      case TestScenario.resampleOff59Hz:
-        return false;
-    }
+    return switch (currentValue) {
+      TestScenario.resampleOn90Hz  || TestScenario.resampleOn59Hz  => true,
+      TestScenario.resampleOff90Hz || TestScenario.resampleOff59Hz => false,
+    };
   }
   double get frequency {
-    switch (currentValue) {
-      case TestScenario.resampleOn90Hz:
-      case TestScenario.resampleOff90Hz:
-        return 90.0;
-      case TestScenario.resampleOn59Hz:
-      case TestScenario.resampleOff59Hz:
-        return 59.0;
-    }
+    return switch (currentValue) {
+      TestScenario.resampleOn90Hz || TestScenario.resampleOff90Hz => 90.0,
+      TestScenario.resampleOn59Hz || TestScenario.resampleOff59Hz => 59.0,
+    };
   }
 
   Map<String, dynamic>? result;
 
   @override
   String describeValue(TestScenario value) {
-    switch (value) {
-      case TestScenario.resampleOn90Hz:
-        return 'resample on with 90Hz input';
-      case TestScenario.resampleOn59Hz:
-        return 'resample on with 59Hz input';
-      case TestScenario.resampleOff90Hz:
-        return 'resample off with 90Hz input';
-      case TestScenario.resampleOff59Hz:
-        return 'resample off with 59Hz input';
-    }
+    return switch (value) {
+      TestScenario.resampleOn90Hz  => 'resample on with 90Hz input',
+      TestScenario.resampleOn59Hz  => 'resample on with 59Hz input',
+      TestScenario.resampleOff90Hz => 'resample off with 90Hz input',
+      TestScenario.resampleOff59Hz => 'resample off with 59Hz input',
+    };
   }
 
   @override

dev/benchmarks/complex_layout/test/measure_scroll_smoothness.dart

@@ -60,12 +60,12 @@ class _FilteredChildAnimationPageState extends State<FilteredChildAnimationPage>
   }
 
   String get _title {
-    switch (_filterType) {
-      case FilterType.opacity: return 'Fading Child Animation';
-      case FilterType.rotateTransform: return 'Transformed Child Animation';
-      case FilterType.rotateFilter: return 'Matrix Filtered Child Animation';
-      case null: return 'Static Child';
-    }
+    return switch (_filterType) {
+      FilterType.opacity => 'Fading Child Animation',
+      FilterType.rotateTransform => 'Transformed Child Animation',
+      FilterType.rotateFilter => 'Matrix Filtered Child Animation',
+      null => 'Static Child',
+    };
   }
 
   static Widget _makeChild(int rows, int cols, double fontSize, bool complex) {

dev/benchmarks/macrobenchmarks/lib/src/filtered_child_animation.dart

@@ -3,6 +3,7 @@
 // found in the LICENSE file.
 
 import 'package:flutter/gestures.dart';
+import 'package:flutter_test/flutter_test.dart';
 
 import '../common.dart';
 import 'data/velocity_tracker_data.dart';
@@ -16,38 +17,43 @@ class TrackerBenchmark {
   final String name;
 }
 
-void main() {
+Future<void> main() async {
   assert(false, "Don't run benchmarks in debug mode! Use 'flutter run --release'.");
   final BenchmarkResultPrinter printer = BenchmarkResultPrinter();
   final List<TrackerBenchmark> benchmarks = <TrackerBenchmark>[
-    TrackerBenchmark(name: 'velocity_tracker_iteration', tracker: VelocityTracker.withKind(PointerDeviceKind.touch)),
-    TrackerBenchmark(name: 'velocity_tracker_iteration_ios_fling', tracker: IOSScrollViewFlingVelocityTracker(PointerDeviceKind.touch)),
+    TrackerBenchmark(name: 'velocity_tracker_iteration',
+        tracker: VelocityTracker.withKind(PointerDeviceKind.touch)),
+    TrackerBenchmark(name: 'velocity_tracker_iteration_ios_fling',
+        tracker: IOSScrollViewFlingVelocityTracker(PointerDeviceKind.touch)),
   ];
   final Stopwatch watch = Stopwatch();
 
-  for (final TrackerBenchmark benchmark in benchmarks) {
-    print('${benchmark.name} benchmark...');
-    final VelocityTracker tracker = benchmark.tracker;
-    watch.reset();
-    watch.start();
-    for (int i = 0; i < _kNumIters; i += 1) {
-      for (final PointerEvent event in velocityEventData) {
-        if (event is PointerDownEvent || event is PointerMoveEvent) {
-          tracker.addPosition(event.timeStamp, event.position);
-        }
-        if (event is PointerUpEvent) {
-          tracker.getVelocity();
+  await benchmarkWidgets((WidgetTester tester) async {
+    for (final TrackerBenchmark benchmark in benchmarks) {
+      print('${benchmark.name} benchmark...');
+      final VelocityTracker tracker = benchmark.tracker;
+      watch.reset();
+      watch.start();
+      for (int i = 0; i < _kNumIters; i += 1) {
+        for (final PointerEvent event in velocityEventData) {
+          if (event is PointerDownEvent || event is PointerMoveEvent) {
+            tracker.addPosition(event.timeStamp, event.position);
+          }
+          if (event is PointerUpEvent) {
+            tracker.getVelocity();
+          }
         }
       }
+      watch.stop();
+
+      printer.addResult(
+        description: 'Velocity tracker: ${tracker.runtimeType}',
+        value: watch.elapsedMicroseconds / _kNumIters,
+        unit: 'µs per iteration',
+        name: benchmark.name,
+      );
     }
-    watch.stop();
-    printer.addResult(
-      description: 'Velocity tracker: ${tracker.runtimeType}',
-      value: watch.elapsedMicroseconds / _kNumIters,
-      unit: 'µs per iteration',
-      name: benchmark.name,
-    );
-  }
+  });
 
   printer.printToStdout();
 }

dev/benchmarks/microbenchmarks/lib/gestures/velocity_tracker_bench.dart

@@ -30,14 +30,14 @@ dependencies:
   path_provider_platform_interface: 2.1.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   path_provider_windows: 2.2.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   platform: 3.1.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
-  plugin_platform_interface: 2.1.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
+  plugin_platform_interface: 2.1.7 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   source_span: 1.10.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   string_scanner: 1.2.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   term_glyph: 1.2.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   typed_data: 1.3.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   vector_math: 2.1.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   web: 0.4.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
-  win32: 5.0.9 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
+  win32: 5.1.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   xdg_directories: 1.0.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
 
 flutter:
@@ -48,4 +48,4 @@ flutter:
     androidPackage: com.example.multiple_flutters_module
     iosBundleIdentifier: com.example.multipleFluttersModule
 
-# PUBSPEC CHECKSUM: 6639
+# PUBSPEC CHECKSUM: 1332

dev/benchmarks/multiple_flutters/module/pubspec.yaml

@@ -124,6 +124,9 @@ Future<void> run(List<String> arguments) async {
   printProgress('Goldens...');
   await verifyGoldenTags(flutterPackages);
 
+  printProgress('Prevent flakes from Stopwatches...');
+  await verifyNoStopwatches(flutterPackages);
+
   printProgress('Skip test comments...');
   await verifySkipTestComments(flutterRoot);
 
@@ -584,6 +587,48 @@ Future<void> verifyGoldenTags(String workingDirectory, { int minimumMatches = 20
   }
 }
 
+/// Use of Stopwatches can introduce test flakes as the logical time of a
+/// stopwatch can fall out of sync with the mocked time of FakeAsync in testing.
+/// The Clock object provides a safe stopwatch instead, which is paired with
+/// FakeAsync as part of the test binding.
+final RegExp _findStopwatchPattern = RegExp(r'Stopwatch\(\)');
+const String _ignoreStopwatch = '// flutter_ignore: stopwatch (see analyze.dart)';
+const String _ignoreStopwatchForFile = '// flutter_ignore_for_file: stopwatch (see analyze.dart)';
+
+Future<void> verifyNoStopwatches(String workingDirectory, { int minimumMatches = 2000 }) async {
+  final List<String> errors = <String>[];
+  await for (final File file in _allFiles(workingDirectory, 'dart', minimumMatches: minimumMatches)) {
+    if (file.path.contains('flutter_tool')) {
+      // Skip flutter_tool package.
+      continue;
+    }
+    int lineNumber = 1;
+    final List<String> lines = file.readAsLinesSync();
+    for (final String line in lines) {
+      // If the file is being ignored, skip parsing the rest of the lines.
+      if (line.contains(_ignoreStopwatchForFile)) {
+        break;
+      }
+
+      if (line.contains(_findStopwatchPattern)
+          && !line.contains(_leadingComment)
+          && !line.contains(_ignoreStopwatch)) {
+        // Stopwatch found
+        errors.add('\t${file.path}:$lineNumber');
+      }
+      lineNumber++;
+    }
+  }
+  if (errors.isNotEmpty) {
+    foundError(<String>[
+      'Stopwatch use was found in the following files:',
+      ...errors,
+      '${bold}Stopwatches introduce flakes by falling out of sync with the FakeAsync used in testing.$reset',
+      'A Stopwatch that stays in sync with FakeAsync is available through the Gesture or Test bindings, through samplingClock.'
+    ]);
+  }
+}
+
 final RegExp _findDeprecationPattern = RegExp(r'@[Dd]eprecated');
 final RegExp _deprecationStartPattern = RegExp(r'^(?<indent> *)@Deprecated\($'); // flutter_ignore: deprecation_syntax (see analyze.dart)
 final RegExp _deprecationMessagePattern = RegExp(r"^ *'(?<message>.+) '$");

dev/bots/analyze.dart

@@ -309,11 +309,9 @@ class SampleChecker {
 // TODO(gspencergoog): implement the missing tests.
 // See https://github.com/flutter/flutter/issues/130459
 final Set<String> _knownMissingTests = <String>{
-  'examples/api/test/cupertino/text_field/cupertino_text_field.0_test.dart',
   'examples/api/test/material/bottom_app_bar/bottom_app_bar.2_test.dart',
   'examples/api/test/material/bottom_app_bar/bottom_app_bar.1_test.dart',
   'examples/api/test/material/theme/theme_extension.1_test.dart',
-  'examples/api/test/material/elevated_button/elevated_button.0_test.dart',
   'examples/api/test/material/material_state/material_state_border_side.0_test.dart',
   'examples/api/test/material/material_state/material_state_mouse_cursor.0_test.dart',
   'examples/api/test/material/material_state/material_state_outlined_border.0_test.dart',
@@ -323,28 +321,18 @@ final Set<String> _knownMissingTests = <String>{
   'examples/api/test/material/text_field/text_field.1_test.dart',
   'examples/api/test/material/button_style/button_style.0_test.dart',
   'examples/api/test/material/range_slider/range_slider.0_test.dart',
-  'examples/api/test/material/card/card.0_test.dart',
   'examples/api/test/material/selection_container/selection_container_disabled.0_test.dart',
   'examples/api/test/material/selection_container/selection_container.0_test.dart',
   'examples/api/test/material/color_scheme/dynamic_content_color.0_test.dart',
   'examples/api/test/material/platform_menu_bar/platform_menu_bar.0_test.dart',
   'examples/api/test/material/menu_anchor/menu_anchor.2_test.dart',
   'examples/api/test/material/stepper/stepper.controls_builder.0_test.dart',
-  'examples/api/test/material/stepper/stepper.0_test.dart',
   'examples/api/test/material/flexible_space_bar/flexible_space_bar.0_test.dart',
-  'examples/api/test/material/data_table/data_table.0_test.dart',
   'examples/api/test/material/floating_action_button_location/standard_fab_location.0_test.dart',
   'examples/api/test/material/chip/deletable_chip_attributes.on_deleted.0_test.dart',
-  'examples/api/test/material/snack_bar/snack_bar.0_test.dart',
   'examples/api/test/material/snack_bar/snack_bar.2_test.dart',
   'examples/api/test/material/snack_bar/snack_bar.1_test.dart',
-  'examples/api/test/material/bottom_navigation_bar/bottom_navigation_bar.0_test.dart',
-  'examples/api/test/material/bottom_navigation_bar/bottom_navigation_bar.1_test.dart',
-  'examples/api/test/material/outlined_button/outlined_button.0_test.dart',
-  'examples/api/test/material/icon_button/icon_button.2_test.dart',
   'examples/api/test/material/icon_button/icon_button.3_test.dart',
-  'examples/api/test/material/icon_button/icon_button.0_test.dart',
-  'examples/api/test/material/icon_button/icon_button.1_test.dart',
   'examples/api/test/material/expansion_panel/expansion_panel_list.expansion_panel_list_radio.0_test.dart',
   'examples/api/test/material/input_decorator/input_decoration.1_test.dart',
   'examples/api/test/material/input_decorator/input_decoration.prefix_icon_constraints.0_test.dart',
@@ -355,12 +343,10 @@ final Set<String> _knownMissingTests = <String>{
   'examples/api/test/material/input_decorator/input_decoration.suffix_icon_constraints.0_test.dart',
   'examples/api/test/material/input_decorator/input_decoration.3_test.dart',
   'examples/api/test/material/input_decorator/input_decoration.material_state.1_test.dart',
-  'examples/api/test/material/filled_button/filled_button.0_test.dart',
   'examples/api/test/material/text_form_field/text_form_field.1_test.dart',
   'examples/api/test/material/scrollbar/scrollbar.1_test.dart',
   'examples/api/test/material/dropdown_menu/dropdown_menu.1_test.dart',
   'examples/api/test/material/radio/radio.toggleable.0_test.dart',
-  'examples/api/test/material/radio/radio.0_test.dart',
   'examples/api/test/material/search_anchor/search_anchor.0_test.dart',
   'examples/api/test/material/search_anchor/search_anchor.1_test.dart',
   'examples/api/test/material/search_anchor/search_anchor.2_test.dart',
@@ -389,7 +375,6 @@ final Set<String> _knownMissingTests = <String>{
   'examples/api/test/material/app_bar/sliver_app_bar.4_test.dart',
   'examples/api/test/material/app_bar/app_bar.3_test.dart',
   'examples/api/test/material/app_bar/app_bar.0_test.dart',
-  'examples/api/test/material/ink_well/ink_well.0_test.dart',
   'examples/api/test/material/banner/material_banner.1_test.dart',
   'examples/api/test/material/banner/material_banner.0_test.dart',
   'examples/api/test/material/checkbox/checkbox.1_test.dart',

dev/bots/check_code_samples.dart

@@ -111,7 +111,7 @@ function generate_docs() {
     # Install and activate dartdoc.
     # When updating to a new dartdoc version, please also update
     # `dartdoc_options.yaml` to include newly introduced error and warning types.
-    "$DART" pub global activate dartdoc 7.0.2
+    "$DART" pub global activate dartdoc 8.0.0
 
     # Install and activate the snippets tool, which resides in the
     # assets-for-api-docs repo: