firka/flutter
firka/flutter
4
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "_DefaultTabControllerState should dispose all created TabContoller instances. (#136608)" (#144579)

Browse Source 
This reverts commit 9fa9fd365c9f1d8053cc75da996407abe1537410.

Fixes https://github.com/flutter/flutter/issues/144087.
Fixes https://github.com/flutter/flutter/issues/138588.

This crash has been reported previously from a customer in google3 in https://github.com/flutter/flutter/issues/138588, but we weren't able to track it down. Thankfully, a repro was now provided in https://github.com/flutter/flutter/issues/144087#issuecomment-1968257383 which traced the crash down to a change made in #136608. This PR reverts that change to fix that crash for now. I will post a new PR shortly that will add a test to cover the use case that caused the crash with #136608 to make sure we don't re-introduce the crash in the future.
This commit is contained in:
Michael Goderbauer 2024-03-05 10:41:56 -08:00 committed by GitHub
parent 3b5a2ecf99
commit d93f24ab93
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 6 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
packages/flutter/lib/src/material/tab_controller.dart
View File

@ -132,11 +132,8 @@ class TabController extends ChangeNotifier {
}) : _index = index, }) : _index = index,
_previousIndex = previousIndex, _previousIndex = previousIndex,
_animationController = animationController, _animationController = animationController,
_animationDuration = animationDuration { _animationDuration = animationDuration;
if (kFlutterMemoryAllocationsEnabled) {
ChangeNotifier.maybeDispatchObjectCreation(this);
}
}
/// Creates a new [TabController] with `index`, `previousIndex`, `length`, and /// Creates a new [TabController] with `index`, `previousIndex`, `length`, and
/// `animationDuration` if they are non-null. /// `animationDuration` if they are non-null.
@ -145,10 +142,7 @@ class TabController extends ChangeNotifier {
/// ///
/// When [DefaultTabController.length] is updated, this method is called to /// When [DefaultTabController.length] is updated, this method is called to
/// create a new [TabController] without creating a new [AnimationController]. /// create a new [TabController] without creating a new [AnimationController].
/// TabController _copyWith({
/// This instance of [TabController] will be disposed and must not be used
/// anymore.
TabController _copyWithAndDispose({
required int? index, required int? index,
required int? length, required int? length,
required int? previousIndex, required int? previousIndex,
@ -157,20 +151,13 @@ class TabController extends ChangeNotifier {
if (index != null) { if (index != null) {
_animationController!.value = index.toDouble(); _animationController!.value = index.toDouble();
} }
final TabController newController = TabController._( return TabController._(
index: index ?? _index, index: index ?? _index,
length: length ?? this.length, length: length ?? this.length,
animationController: _animationController, animationController: _animationController,
previousIndex: previousIndex ?? _previousIndex, previousIndex: previousIndex ?? _previousIndex,
animationDuration: animationDuration ?? _animationDuration, animationDuration: animationDuration ?? _animationDuration,
); );
// Nulling _animationController to not dispose it. It will be disposed by
// the newly created instance of the TabController.
_animationController = null;
dispose();
return newController;
} }
/// An animation whose value represents the current position of the [TabBar]'s /// An animation whose value represents the current position of the [TabBar]'s
@ -498,7 +485,7 @@ class _DefaultTabControllerState extends State<DefaultTabController> with Single
newIndex = math.max(0, widget.length - 1); newIndex = math.max(0, widget.length - 1);
previousIndex = _controller.index; previousIndex = _controller.index;
} }
_controller = _controller._copyWithAndDispose( _controller = _controller._copyWith(
length: widget.length, length: widget.length,
animationDuration: widget.animationDuration, animationDuration: widget.animationDuration,
index: newIndex, index: newIndex,
@ -507,7 +494,7 @@ class _DefaultTabControllerState extends State<DefaultTabController> with Single
} }
if (oldWidget.animationDuration != widget.animationDuration) { if (oldWidget.animationDuration != widget.animationDuration) {
_controller = _controller._copyWithAndDispose( _controller = _controller._copyWith(
length: widget.length, length: widget.length,
animationDuration: widget.animationDuration, animationDuration: widget.animationDuration,
index: _controller.index, index: _controller.index,