Skip to content

Commit

Permalink
Use const route for notAnnounced. (flutter#144050)
Browse files Browse the repository at this point in the history
  • Loading branch information
polina-c committed Feb 28, 2024
1 parent 5517316 commit 42b02d0
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 13 deletions.
17 changes: 8 additions & 9 deletions packages/flutter/lib/src/widgets/navigator.dart
Expand Up @@ -138,7 +138,7 @@ enum RoutePopDisposition {
/// The type argument `T` is the route's return type, as used by
/// [currentResult], [popped], and [didPop]. The type `void` may be used if the
/// route does not return a value.
abstract class Route<T> {
abstract class Route<T> extends _RoutePlaceholder {
/// Initialize the [Route].
///
/// If the [settings] are not provided, an empty [RouteSettings] object is
Expand Down Expand Up @@ -2896,10 +2896,9 @@ enum _RouteLifecycle {

typedef _RouteEntryPredicate = bool Function(_RouteEntry entry);

class _NotAnnounced extends Route<void> {
// A placeholder for the lastAnnouncedPreviousRoute, the
// lastAnnouncedPoppedNextRoute, and the lastAnnouncedNextRoute before any
// change has been announced.
/// Placeholder for a route.
class _RoutePlaceholder {
const _RoutePlaceholder();
}

class _RouteEntry extends RouteTransitionRecord {
Expand Down Expand Up @@ -2937,12 +2936,12 @@ class _RouteEntry extends RouteTransitionRecord {
/// remove as a result of a page update.
static const int kDebugPopAttemptLimit = 100;

static final Route<dynamic> notAnnounced = _NotAnnounced();
static const _RoutePlaceholder notAnnounced = _RoutePlaceholder();

_RouteLifecycle currentState;
Route<dynamic>? lastAnnouncedPreviousRoute = notAnnounced; // last argument to Route.didChangePrevious
WeakReference<Route<dynamic>> lastAnnouncedPoppedNextRoute = WeakReference<Route<dynamic>>(notAnnounced); // last argument to Route.didPopNext
Route<dynamic>? lastAnnouncedNextRoute = notAnnounced; // last argument to Route.didChangeNext
_RoutePlaceholder? lastAnnouncedPreviousRoute = notAnnounced; // last argument to Route.didChangePrevious
WeakReference<_RoutePlaceholder> lastAnnouncedPoppedNextRoute = WeakReference<_RoutePlaceholder>(notAnnounced); // last argument to Route.didPopNext
_RoutePlaceholder? lastAnnouncedNextRoute = notAnnounced; // last argument to Route.didChangeNext
int? lastFocusNode; // The last focused semantic node for the route entry.

/// Restoration ID to be used for the encapsulating route when restoration is
Expand Down
5 changes: 1 addition & 4 deletions packages/flutter/test/painting/system_fonts_test.dart
Expand Up @@ -40,10 +40,7 @@ void main() {
// TODO(polina-c): clean up leaks, https://github.com/flutter/flutter/issues/134787 [leaks-to-clean]
LeakTesting.settings = LeakTesting.settings.withIgnored(classes: <String>['CurvedAnimation']);

testWidgets('RenderParagraph relayout upon system fonts changes',
// TODO(polina-c): dispose _NotAnnounced, https://github.com/dart-lang/leak_tracker/issues/218 [leaks-to-clean]
experimentalLeakTesting: LeakTesting.settings.withIgnored(classes: <String>['ValueNotifier<String?>', '_NotAnnounced']),
(WidgetTester tester) async {
testWidgets('RenderParagraph relayout upon system fonts changes', (WidgetTester tester) async {
await tester.pumpWidget(
const MaterialApp(
home: Text('text widget'),
Expand Down

0 comments on commit 42b02d0

Please sign in to comment.