From 1ed8a0a0fd97110edfc8e796b5dea959dd730f90 Mon Sep 17 00:00:00 2001 From: gaaclarke <30870216+gaaclarke@users.noreply.github.com> Date: Mon, 23 Sep 2024 17:21:06 -0700 Subject: [PATCH] Redo flutter engine flutter autoroll bd3d1990 485b 419c 8c55 b27e3eeb15ed 1727117767 (#155579) fixes https://github.com/flutter/flutter/issues/155578 A manual roll for https://github.com/flutter/flutter/pull/155560 --- bin/internal/engine.version | 2 +- dev/tracing_tests/test/timeline_test.dart | 4 ++-- examples/api/test/material/app/app.0_test.dart | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bin/internal/engine.version b/bin/internal/engine.version index d0be106ef2..b20ec91a2a 100644 --- a/bin/internal/engine.version +++ b/bin/internal/engine.version @@ -1 +1 @@ -9bb0ece79ae21784092049465a89efc7f488342e +95c5a0940ad9350d1854728b14d20e58d495f8b9 diff --git a/dev/tracing_tests/test/timeline_test.dart b/dev/tracing_tests/test/timeline_test.dart index e5a915d5a6..6cdf16449d 100644 --- a/dev/tracing_tests/test/timeline_test.dart +++ b/dev/tracing_tests/test/timeline_test.dart @@ -108,7 +108,7 @@ void main() { ['BUILD', 'Placeholder', 'CustomPaint', 'LAYOUT', 'UPDATING COMPOSITING BITS', 'PAINT', 'COMPOSITING', 'FINALIZE TREE'], ); args = (events.where((TimelineEvent event) => event.json!['name'] == '$Placeholder').single.json!['args'] as Map).cast(); - expect(args['color'], 'Color(0xffffffff)'); + expect(args['color'], '${const Color(0xffffffff)}'); debugProfileBuildsEnabled = false; debugEnhanceBuildTimelineArguments = false; @@ -121,7 +121,7 @@ void main() { ['BUILD', 'Placeholder', 'LAYOUT', 'UPDATING COMPOSITING BITS', 'PAINT', 'COMPOSITING', 'FINALIZE TREE'], ); args = (events.where((TimelineEvent event) => event.json!['name'] == '$Placeholder').single.json!['args'] as Map).cast(); - expect(args['color'], 'Color(0xffffffff)'); + expect(args['color'], '${const Color(0xffffffff)}'); debugProfileBuildsEnabledUserWidgets = false; debugEnhanceBuildTimelineArguments = false; diff --git a/examples/api/test/material/app/app.0_test.dart b/examples/api/test/material/app/app.0_test.dart index edca9572d8..62ae520260 100644 --- a/examples/api/test/material/app/app.0_test.dart +++ b/examples/api/test/material/app/app.0_test.dart @@ -55,7 +55,7 @@ void main() { await tester.pump(const Duration(milliseconds: 500)); // The Scaffold background color is updated. - expect(getScaffoldMaterial().color, const Color(0xff333731)); + expect(getScaffoldMaterial().color, isSameColorAs(const Color(0xff333731))); await tester.pumpAndSettle();