commit e2c812155c40a75d7aceb3e2d610887d9c7066c9
author Valentin Vignal <32538273+ValentinVignal@users.noreply.github.com> Sat Apr 13 00:24:13 2024 +0800
committer GitHub <noreply@github.com> Fri Apr 12 09:24:13 2024 -0700
tree 027f1fa02caeb69836f94ca8bb472bad301e5a2b
parent 699749e43fe8c8084d259c63dfae3c1b5df5fe6d

Fix curved animation memory leak for scrollbar (#146670)

packages/flutter/lib/src/widgets/scrollbar.dart

diff --git a/packages/flutter/lib/src/widgets/scrollbar.dart b/packages/flutter/lib/src/widgets/scrollbar.dart
index bb63d55..c0cf600 100644
--- a/packages/flutter/lib/src/widgets/scrollbar.dart
+++ b/packages/flutter/lib/src/widgets/scrollbar.dart
@@ -1320,7 +1320,7 @@
   ScrollController? _cachedController;
   Timer? _fadeoutTimer;
   late AnimationController _fadeoutAnimationController;
-  late Animation<double> _fadeoutOpacityAnimation;
+  late CurvedAnimation _fadeoutOpacityAnimation;
   final GlobalKey  _scrollbarPainterKey = GlobalKey();
   bool _hoverIsActive = false;
   bool _thumbDragging = false;
@@ -2006,6 +2006,7 @@
     _fadeoutAnimationController.dispose();
     _fadeoutTimer?.cancel();
     scrollbarPainter.dispose();
+    _fadeoutOpacityAnimation.dispose();
     super.dispose();
   }
 

packages/flutter/test/rendering/viewport_test.dart

diff --git a/packages/flutter/test/rendering/viewport_test.dart b/packages/flutter/test/rendering/viewport_test.dart
index 18c830b..83a3862 100644
--- a/packages/flutter/test/rendering/viewport_test.dart
+++ b/packages/flutter/test/rendering/viewport_test.dart
@@ -14,6 +14,7 @@
 import 'package:flutter/rendering.dart';
 import 'package:flutter/widgets.dart';
 import 'package:flutter_test/flutter_test.dart';
+import 'package:leak_tracker_flutter_testing/leak_tracker_flutter_testing.dart';
 
 class _TestSliverPersistentHeaderDelegate extends SliverPersistentHeaderDelegate {
   _TestSliverPersistentHeaderDelegate({
@@ -2054,7 +2055,10 @@
       expect(tester.getTopLeft(find.text('Item 9')).dy, 226.0);
     });
 
-    testWidgets('allows overscrolling on default platforms - vertical', (WidgetTester tester) async {
+    testWidgets('allows overscrolling on default platforms - vertical',
+    // TODO(polina-c): remove when fixed https://github.com/flutter/flutter/issues/145600 [leak-tracking-opt-in]
+    experimentalLeakTesting: LeakTesting.settings.withTracked(classes: const <String>['CurvedAnimation']),
+    (WidgetTester tester) async {
       // Regression test for https://github.com/flutter/flutter/issues/10949
       // Scrollables should overscroll by default on iOS and macOS
       final  ScrollController controller = ScrollController();