Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in
Toggle navigation
F
Front-End
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
abdullh.alsoleman
Front-End
Commits
9f2b93ae
Unverified
Commit
9f2b93ae
authored
Apr 26, 2021
by
Michael Goderbauer
Committed by
GitHub
Apr 26, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Dispose thumbPainter in Switch to avoid crash (#81089)
parent
f534aa00
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
112 additions
and
0 deletions
+112
-0
switch.dart
packages/flutter/lib/src/material/switch.dart
+11
-0
switch_test.dart
packages/flutter/test/material/switch_test.dart
+101
-0
No files found.
packages/flutter/lib/src/material/switch.dart
View file @
9f2b93ae
...
@@ -938,6 +938,7 @@ class _SwitchPainter extends ToggleablePainter {
...
@@ -938,6 +938,7 @@ class _SwitchPainter extends ToggleablePainter {
_cachedThumbColor
=
thumbColor
;
_cachedThumbColor
=
thumbColor
;
_cachedThumbImage
=
thumbImage
;
_cachedThumbImage
=
thumbImage
;
_cachedThumbErrorListener
=
thumbErrorListener
;
_cachedThumbErrorListener
=
thumbErrorListener
;
_cachedThumbPainter
?.
dispose
();
_cachedThumbPainter
=
_createDefaultThumbDecoration
(
thumbColor
,
thumbImage
,
thumbErrorListener
).
createBoxPainter
(
_handleDecorationChanged
);
_cachedThumbPainter
=
_createDefaultThumbDecoration
(
thumbColor
,
thumbImage
,
thumbErrorListener
).
createBoxPainter
(
_handleDecorationChanged
);
}
}
final
BoxPainter
thumbPainter
=
_cachedThumbPainter
!;
final
BoxPainter
thumbPainter
=
_cachedThumbPainter
!;
...
@@ -954,4 +955,14 @@ class _SwitchPainter extends ToggleablePainter {
...
@@ -954,4 +955,14 @@ class _SwitchPainter extends ToggleablePainter {
_isPainting
=
false
;
_isPainting
=
false
;
}
}
}
}
@override
void
dispose
()
{
_cachedThumbPainter
?.
dispose
();
_cachedThumbPainter
=
null
;
_cachedThumbColor
=
null
;
_cachedThumbImage
=
null
;
_cachedThumbErrorListener
=
null
;
super
.
dispose
();
}
}
}
packages/flutter/test/material/switch_test.dart
View file @
9f2b93ae
...
@@ -2,6 +2,9 @@
...
@@ -2,6 +2,9 @@
// Use of this source code is governed by a BSD-style license that can be
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
// found in the LICENSE file.
import
'dart:async'
;
import
'dart:ui'
as
ui
;
import
'package:flutter/cupertino.dart'
;
import
'package:flutter/cupertino.dart'
;
import
'package:flutter/foundation.dart'
;
import
'package:flutter/foundation.dart'
;
import
'package:flutter/gestures.dart'
;
import
'package:flutter/gestures.dart'
;
...
@@ -1633,4 +1636,102 @@ void main() {
...
@@ -1633,4 +1636,102 @@ void main() {
// Release pointer after widget disappeared.
// Release pointer after widget disappeared.
await
gesture
.
up
();
await
gesture
.
up
();
});
});
group
(
'with image'
,
()
{
late
ui
.
Image
image
;
setUp
(()
async
{
image
=
await
createTestImage
(
width:
100
,
height:
100
);
});
testWidgets
(
'do not crash when imageProvider completes after Switch is disposed'
,
(
WidgetTester
tester
)
async
{
final
DelayedImageProvider
imageProvider
=
DelayedImageProvider
(
image
);
await
tester
.
pumpWidget
(
MaterialApp
(
home:
Material
(
child:
Center
(
child:
Switch
(
value:
true
,
onChanged:
null
,
inactiveThumbImage:
imageProvider
,
),
),
),
),
);
expect
(
find
.
byType
(
Switch
),
findsOneWidget
);
// Dispose the switch by taking down the tree.
await
tester
.
pumpWidget
(
Container
());
expect
(
find
.
byType
(
Switch
),
findsNothing
);
imageProvider
.
complete
();
expect
(
tester
.
takeException
(),
isNull
);
});
testWidgets
(
'do not crash when previous imageProvider completes after Switch is disposed'
,
(
WidgetTester
tester
)
async
{
final
DelayedImageProvider
imageProvider1
=
DelayedImageProvider
(
image
);
final
DelayedImageProvider
imageProvider2
=
DelayedImageProvider
(
image
);
Future
<
void
>
buildSwitch
(
ImageProvider
imageProvider
)
{
return
tester
.
pumpWidget
(
MaterialApp
(
home:
Material
(
child:
Center
(
child:
Switch
(
value:
true
,
onChanged:
null
,
inactiveThumbImage:
imageProvider
,
),
),
),
),
);
}
await
buildSwitch
(
imageProvider1
);
expect
(
find
.
byType
(
Switch
),
findsOneWidget
);
// Replace the ImageProvider.
await
buildSwitch
(
imageProvider2
);
expect
(
find
.
byType
(
Switch
),
findsOneWidget
);
// Dispose the switch by taking down the tree.
await
tester
.
pumpWidget
(
Container
());
expect
(
find
.
byType
(
Switch
),
findsNothing
);
// Completing the replaced ImageProvider shouldn't crash.
imageProvider1
.
complete
();
expect
(
tester
.
takeException
(),
isNull
);
imageProvider2
.
complete
();
expect
(
tester
.
takeException
(),
isNull
);
});
});
}
class
DelayedImageProvider
extends
ImageProvider
<
DelayedImageProvider
>
{
DelayedImageProvider
(
this
.
image
);
final
ui
.
Image
image
;
final
Completer
<
ImageInfo
>
_completer
=
Completer
<
ImageInfo
>();
@override
Future
<
DelayedImageProvider
>
obtainKey
(
ImageConfiguration
configuration
)
{
return
SynchronousFuture
<
DelayedImageProvider
>(
this
);
}
@override
ImageStreamCompleter
load
(
DelayedImageProvider
key
,
DecoderCallback
decode
)
{
return
OneFrameImageStreamCompleter
(
_completer
.
future
);
}
Future
<
void
>
complete
()
async
{
_completer
.
complete
(
ImageInfo
(
image:
image
));
}
@override
String
toString
()
=>
'
${describeIdentity(this)}
()'
;
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment