Skip to content

Commit

Permalink
Merge branch 'master' into fix/slider_text_null_error
Browse files Browse the repository at this point in the history
* master: (115 commits)
  Roll Flutter Engine from 4adf453b6d68 to 19707e811b60 (1 revision) (flutter#149291)
  disable Impeller on external texture test. (flutter#149292)
  Roll Flutter Engine from 8d5d14a1db95 to 4adf453b6d68 (12 revisions) (flutter#149290)
  Update 3.22.1 release notes to include missing fix. (flutter#148999)
  Manual roll Flutter Engine from 60968ee3bde7 to 8d5d14a1db95 (1 revision) (flutter#149263)
  Reverts "Prevent LayoutBuilder from rebuilding more than once (flutter#147856)" (flutter#149279)
  Unskip expression evaluation test (flutter#149253)
  temporarily disable SemanticsAction tests to unblock engine change (flutter#149274)
  Adds benchmark for rrect_blur. (flutter#149261)
  Prevent LayoutBuilder from rebuilding more than once (flutter#147856)
  Add test for inherited_theme.0.dart (flutter#149120)
  Update progress_indicator.dart to indicate the adaptive option is for both macOS and iOS (flutter#145246)
  _ModalScopeStatus as InheritedModel (flutter#149022)
  Add test for radio.toggleable.0.dart (flutter#149153)
  Add a sentinel value for `TextStyle.height` (flutter#149049)
  Remove dynamic_layouts from issue template (flutter#149252)
  Roll Flutter Engine from 30aa720d4999 to 60968ee3bde7 (1 revision) (flutter#149255)
  Roll Flutter Engine from b26e1b023cdb to 30aa720d4999 (7 revisions) (flutter#149249)
  Roll Packages from a933c30 to 31d3329 (6 revisions) (flutter#149246)
  Clean leak in editable_text_test.dart. (flutter#149223)
  ...
  • Loading branch information
hello-coder-xu committed May 30, 2024
2 parents 44b6937 + b295c86 commit 47d4adf
Show file tree
Hide file tree
Showing 440 changed files with 6,211 additions and 3,187 deletions.
24 changes: 24 additions & 0 deletions .ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1294,6 +1294,7 @@ targets:

- name: Linux web_long_running_tests_2_5
recipe: flutter/flutter_drone
bringup: true
timeout: 60
properties:
dependencies: >-
Expand Down Expand Up @@ -3233,6 +3234,28 @@ targets:
["devicelab", "ios", "mac"]
task_name: animated_advanced_blend_perf_ios__timeline_summary

# Uses Impeller.
- name: Linux_pixel_7pro rrect_blur_perf__timeline_summary
recipe: devicelab/devicelab_drone
presubmit: false
bringup: true
timeout: 60
properties:
ignore_flakiness: "true"
tags: >
["devicelab", "android", "linux", "pixel", "7pro"]
task_name: rrect_blur_perf__timeline_summary

- name: Mac_ios rrect_blur_perf_ios__timeline_summary
recipe: devicelab/devicelab_drone
presubmit: false
bringup: true
timeout: 60
properties:
tags: >
["devicelab", "ios", "mac"]
task_name: rrect_blur_perf_ios__timeline_summary

# Uses Impeller.
- name: Linux_pixel_7pro animated_blur_backdrop_filter_perf_opengles__timeline_summary
recipe: devicelab/devicelab_drone
Expand Down Expand Up @@ -5455,6 +5478,7 @@ targets:
- .ci.yaml

- name: Windows plugin_test
bringup: true # Flaky https://github.com/flutter/flutter/issues/148834
recipe: devicelab/devicelab_drone
timeout: 60
properties:
Expand Down
1 change: 0 additions & 1 deletion .github/ISSUE_TEMPLATE/9_first_party_packages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ body:
- camera
- cross_file
- css_colors
- dynamic_layouts
- espresso
- extension_google_sign_in_as_googleapis_auth
- file_selector
Expand Down
14 changes: 14 additions & 0 deletions .github/labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,7 @@ framework:
- packages/flutter_test/**/*
- packages/integration_test/**/*
- examples/api/**/*
- docs/about/**/*
- docs/contributing/**/*
- docs/libraries/**/*

Expand Down Expand Up @@ -161,6 +162,8 @@ platform-web:
team:
- changed-files:
- any-glob-to-any-file:
- docs/about/**/*
- docs/contributing/**/*
- docs/postmortems/**/*

team-android:
Expand Down Expand Up @@ -188,8 +191,19 @@ team-release:
- any-glob-to-any-file:
- docs/releases/**/*

team-tool:
- changed-files:
- any-glob-to-any-file:
- docs/tool/**/*

team-web:
- changed-files:
- any-glob-to-any-file:
- docs/platforms/web/**/*

tool:
- changed-files:
- any-glob-to-any-file:
- packages/flutter_tools/**/*
- packages/fuchsia_remote_debug_protocol/**/*
- docs/tool/**/*
2 changes: 2 additions & 0 deletions TESTOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,7 @@
/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
/dev/devicelab/bin/tasks/rrect_blur_perf__timeline_summary.dart @gaaclarke @flutter/engine

## Windows Android DeviceLab tests
/dev/devicelab/bin/tasks/basic_material_app_win__compile.dart @zanderso @flutter/tool
Expand Down Expand Up @@ -223,6 +224,7 @@
/dev/devicelab/bin/tasks/draw_atlas_perf_ios__timeline_summary.dart @jonahwilliams @flutter/engine
/dev/devicelab/bin/tasks/static_path_tessellation_perf_ios__timeline_summary.dart @jonahwilliams @flutter/engine
/dev/devicelab/bin/tasks/dynamic_path_tessellation_perf_ios__timeline_summary.dart @jonahwilliams @flutter/engine
/dev/devicelab/bin/tasks/rrect_blur_perf_ios__timeline_summary.dart @gaaclarke @flutter/engine

## Host only DeviceLab tests
/dev/devicelab/bin/tasks/animated_complex_opacity_perf_macos__e2e_summary.dart @cbracken @flutter/desktop
Expand Down
2 changes: 1 addition & 1 deletion bin/internal/engine.version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
c89defa558013d7790ab0fec0819c30fccae3aba
19707e811b608b2ecf8633f26d534f7896b87c52
2 changes: 1 addition & 1 deletion bin/internal/flutter_packages.version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ba19b247d0bad15feed2ae31248b52ec0cf19785
31d332900d98b05ac15096ace0bb7a76a8fb759d
2 changes: 1 addition & 1 deletion bin/internal/fuchsia-linux.version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
HHwlAJN5imwf3yX4i6DhvMFhgYzp7YIXIsEYuvsx9JEC
c-Sm5-fy8c2YM7MykeRPbSf7GYgDkXFnDcNG89XheMkC
6 changes: 2 additions & 4 deletions dev/a11y_assessments/lib/main.dart
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,8 @@ class App extends StatelessWidget {
);
return MaterialApp(
title: 'Accessibility Assessments',
theme: ThemeData(
colorScheme: ColorScheme.fromSeed(seedColor: Colors.deepPurple),
useMaterial3: true,
),
theme: ThemeData.light(),
darkTheme: ThemeData.dark(),
routes: <String, WidgetBuilder>{
'/': (_) => const HomePage(),
...routes
Expand Down
4 changes: 2 additions & 2 deletions dev/a11y_assessments/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ dependencies:
characters: 1.3.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
collection: 1.18.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
material_color_utilities: 0.11.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
meta: 1.14.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
meta: 1.15.0 # 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"

dev_dependencies:
Expand All @@ -38,4 +38,4 @@ dev_dependencies:
flutter:
uses-material-design: true

# PUBSPEC CHECKSUM: 8b62
# PUBSPEC CHECKSUM: cf63
17 changes: 17 additions & 0 deletions dev/a11y_assessments/test/home_page_test.dart
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
// Copyright 2014 The Flutter 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 'package:a11y_assessments/main.dart';
import 'package:flutter/material.dart';
import 'package:flutter_test/flutter_test.dart';


void main() {
testWidgets('Has light and dark theme', (WidgetTester tester) async {
await tester.pumpWidget(const App());
final MaterialApp app = find.byType(MaterialApp).evaluate().first.widget as MaterialApp;
expect(app.theme!.brightness, equals(Brightness.light));
expect(app.darkTheme!.brightness, equals(Brightness.dark));
});
}
8 changes: 4 additions & 4 deletions dev/automated_tests/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ dependencies:
platform: 3.1.4
test: 1.25.5

_fe_analyzer_shared: 68.0.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
analyzer: 6.5.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
_fe_analyzer_shared: 69.0.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
analyzer: 6.5.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
args: 2.5.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
async: 2.11.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
boolean_selector: 2.1.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
Expand All @@ -40,7 +40,7 @@ dependencies:
logging: 1.2.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
matcher: 0.12.16+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
material_color_utilities: 0.11.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
meta: 1.14.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
meta: 1.15.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
mime: 1.0.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
node_preamble: 2.0.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
package_config: 2.1.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
Expand Down Expand Up @@ -75,4 +75,4 @@ flutter:
assets:
- icon/test.png

# PUBSPEC CHECKSUM: 461c
# PUBSPEC CHECKSUM: ba1f
8 changes: 4 additions & 4 deletions dev/benchmarks/complex_layout/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ dependencies:
file: 7.0.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
matcher: 0.12.16+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
material_color_utilities: 0.11.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
meta: 1.14.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
meta: 1.15.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
path: 1.9.0 # 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"
stack_trace: 1.11.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
Expand All @@ -43,8 +43,8 @@ dev_dependencies:
integration_test:
sdk: flutter

_fe_analyzer_shared: 68.0.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
analyzer: 6.5.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
_fe_analyzer_shared: 69.0.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
analyzer: 6.5.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
args: 2.5.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
clock: 1.1.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
convert: 3.1.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
Expand Down Expand Up @@ -86,4 +86,4 @@ flutter:
- packages/flutter_gallery_assets/people/square/ali.png
- packages/flutter_gallery_assets/places/india_chettinad_silk_maker.png

# PUBSPEC CHECKSUM: 99f4
# PUBSPEC CHECKSUM: 94f7
1 change: 1 addition & 0 deletions dev/benchmarks/macrobenchmarks/lib/common.dart
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ const String kDrawPointsPageRougeName = '/draw_points';
const String kDrawVerticesPageRouteName = '/draw_vertices';
const String kDrawAtlasPageRouteName = '/draw_atlas';
const String kAnimatedAdvancedBlend = '/animated_advanced_blend';
const String kRRectBlurRouteName = '/rrect_blur';

const String kOpacityPeepholeOneRectRouteName = '$kOpacityPeepholeRouteName/one_big_rect';
const String kOpacityPeepholeColumnOfOpacityRouteName = '$kOpacityPeepholeRouteName/column_of_opacity';
Expand Down
9 changes: 9 additions & 0 deletions dev/benchmarks/macrobenchmarks/lib/main.dart
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ import 'src/picture_cache.dart';
import 'src/picture_cache_complexity_scoring.dart';
import 'src/post_backdrop_filter.dart';
import 'src/raster_cache_use_memory.dart';
import 'src/rrect_blur.dart' show RRectBlur;
import 'src/shader_mask_cache.dart';
import 'src/simple_animation.dart';
import 'src/simple_scroll.dart';
Expand Down Expand Up @@ -98,6 +99,7 @@ class MacrobenchmarksApp extends StatelessWidget {
kDrawVerticesPageRouteName: (BuildContext context) => const DrawVerticesPage(),
kDrawAtlasPageRouteName: (BuildContext context) => const DrawAtlasPage(),
kAnimatedAdvancedBlend: (BuildContext context) => const AnimatedAdvancedBlend(),
kRRectBlurRouteName: (BuildContext context) => const RRectBlur(),
kVeryLongPictureScrollingRouteName: (BuildContext context) => const VeryLongPictureScrollingPerf(),
},
);
Expand Down Expand Up @@ -375,6 +377,13 @@ class HomePage extends StatelessWidget {
Navigator.pushNamed(context, kAnimatedAdvancedBlend);
},
),
ElevatedButton(
key: const Key(kRRectBlurRouteName),
child: const Text('Rounded Rect Blur'),
onPressed: () {
Navigator.pushNamed(context, kRRectBlurRouteName);
},
),
ElevatedButton(
key: const Key(kVeryLongPictureScrollingRouteName),
child: const Text('Very Long Picture Scrolling'),
Expand Down
99 changes: 99 additions & 0 deletions dev/benchmarks/macrobenchmarks/lib/src/rrect_blur.dart
Original file line number Diff line number Diff line change
@@ -0,0 +1,99 @@
// Copyright 2014 The Flutter 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 'dart:math' show cos, sin;
import 'dart:typed_data';

import 'package:flutter/material.dart';

class RRectBlur extends StatefulWidget {
const RRectBlur({super.key});

@override
State<RRectBlur> createState() => _DrawPointsPageState();
}

class _DrawPointsPageState extends State<RRectBlur>
with SingleTickerProviderStateMixin {
late final AnimationController controller;
double tick = 0.0;

@override
void initState() {
super.initState();
controller =
AnimationController(vsync: this, duration: const Duration(hours: 1));
controller.addListener(() {
setState(() {
tick += 1;
});
});
controller.forward(from: 0);
}

@override
void dispose() {
controller.dispose();
super.dispose();
}

@override
Widget build(BuildContext context) {
return CustomPaint(
size: const Size(500, 500),
painter: PointsPainter(tick),
child: Container(),
);
}
}

class PointsPainter extends CustomPainter {
PointsPainter(this.tick);

final double tick;

final Float32List data = Float32List(8000);

static const List<Color> kColors = <Color>[
Colors.red,
Colors.blue,
Colors.green,
Colors.yellow,
Colors.orange,
Colors.purple,
Colors.pink,
Colors.deepPurple,
];

@override
void paint(Canvas canvas, Size size) {
if (size.width == 0) {
return;
}
final double halfHeight = size.height / 2.0;
const double freq = 0.25;
for (int i = 0; i < size.width / 10; ++i) {
final double radius =
25 * cos(i + (1.0 * 2.0 * 3.1415 * tick) / 60.0) +
25;
final Paint paint = Paint()
..style = PaintingStyle.fill
..filterQuality = FilterQuality.low
..maskFilter = MaskFilter.blur(BlurStyle.normal, radius);
final double yval =
halfHeight * sin(i + (freq * 2.0 * 3.1415 * tick) / 60.0) +
halfHeight;
canvas.drawCircle(
Offset(10.0 * i, yval),
50,
paint..color = kColors[i % kColors.length],
);
}
}

@override
bool shouldRepaint(covariant CustomPainter oldDelegate) {
return true;
}
}
8 changes: 4 additions & 4 deletions dev/benchmarks/macrobenchmarks/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ dependencies:
leak_tracker_testing: 3.0.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
matcher: 0.12.16+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
material_color_utilities: 0.11.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
meta: 1.14.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
meta: 1.15.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
path: 1.9.0 # 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"
stack_trace: 1.11.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
Expand All @@ -50,8 +50,8 @@ dev_dependencies:
integration_test:
sdk: flutter

_fe_analyzer_shared: 68.0.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
analyzer: 6.5.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
_fe_analyzer_shared: 69.0.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
analyzer: 6.5.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
args: 2.5.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
convert: 3.1.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
coverage: 1.8.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
Expand Down Expand Up @@ -213,4 +213,4 @@ flutter:
fonts:
- asset: packages/flutter_gallery_assets/fonts/GalleryIcons.ttf

# PUBSPEC CHECKSUM: 99f4
# PUBSPEC CHECKSUM: 94f7
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
// Copyright 2014 The Flutter 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 'package:macrobenchmarks/common.dart';

import 'util.dart';

void main() {
macroPerfTest(
'rrect_blur_perf',
kRRectBlurRouteName,
pageDelay: const Duration(seconds: 1),
duration: const Duration(seconds: 10),
);
}
Loading

0 comments on commit 47d4adf

Please sign in to comment.