Skip to content

Commit 7f741e9

Browse files
zandersozanderso
authored
Revert "Clean up the bindings APIs (flutter#86388)" (flutter#86404)
This reverts commit 31de052.
1 parent c3d6187 commit 7f741e9

File tree

248 files changed

+1266
-1614
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

248 files changed

+1266
-1614
lines changed

‎dev/benchmarks/complex_layout/test_memory/scroll_perf.dart‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ Future<void> main() async {
3232
child: ComplexLayoutApp(),
3333
),
3434
));
35-
await SchedulerBinding.instance.endOfFrame;
35+
await SchedulerBinding.instance?.endOfFrame;
3636

3737
/// Wait 50ms to allow the raster thread to actually put up the frame. (The
3838
/// endOfFrame future ends when we send the data to the engine, before
@@ -50,9 +50,9 @@ Future<void> main() async {
5050
child: ComplexLayoutApp(),
5151
),
5252
));
53-
await SchedulerBinding.instance.endOfFrame;
53+
await SchedulerBinding.instance?.endOfFrame;
5454

55-
final WidgetController controller = LiveWidgetController(WidgetsBinding.instance);
55+
final WidgetController controller = LiveWidgetController(WidgetsBinding.instance!);
5656

5757
// Scroll down
5858
for (int iteration = 0; iteration < maxIterations; iteration += 1) {

‎dev/benchmarks/macrobenchmarks/lib/src/filtered_child_animation.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ class _FilteredChildAnimationPageState extends State<FilteredChildAnimationPage>
4141
_filterType = widget.initialFilterType;
4242
_complexChild = widget.initialComplexChild;
4343
_useRepaintBoundary = widget.initialUseRepaintBoundary;
44-
WidgetsBinding.instance.addPostFrameCallback((_) {
44+
WidgetsBinding.instance!.addPostFrameCallback((_) {
4545
final RenderBox childBox = _childKey.currentContext!.findRenderObject()! as RenderBox;
4646
_childCenter = childBox.paintBounds.center;
4747
});

‎dev/benchmarks/macrobenchmarks/lib/src/large_images.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ class LargeImagesPage extends StatelessWidget {
1111

1212
@override
1313
Widget build(BuildContext context) {
14-
final ImageCache imageCache = PaintingBinding.instance.imageCache;
14+
final ImageCache imageCache = PaintingBinding.instance!.imageCache!;
1515
imageCache.maximumSize = 30;
1616
imageCache.maximumSizeBytes = 50 << 20;
1717
return GridView.builder(

‎dev/benchmarks/macrobenchmarks/lib/src/web/bench_mouse_region_grid_hover.dart‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ class BenchMouseRegionGridHover extends WidgetRecorder {
6666
void frameDidDraw() {
6767
if (!started) {
6868
started = true;
69-
SchedulerBinding.instance.addPostFrameCallback((Duration timeStamp) async {
69+
SchedulerBinding.instance!.addPostFrameCallback((Duration timeStamp) async {
7070
_tester.start();
7171
registerDidStop(_tester.stop);
7272
});
@@ -124,7 +124,7 @@ class _UntilNextFrame {
124124
static Future<void> wait() {
125125
if (_UntilNextFrame._completer == null) {
126126
_UntilNextFrame._completer = Completer<void>();
127-
SchedulerBinding.instance.addPostFrameCallback((_) {
127+
SchedulerBinding.instance!.addPostFrameCallback((_) {
128128
_UntilNextFrame._completer!.complete(null);
129129
_UntilNextFrame._completer = null;
130130
});
@@ -145,7 +145,7 @@ class _Tester {
145145
TestGesture get gesture {
146146
return _gesture ??= TestGesture(
147147
dispatcher: (PointerEvent event) async {
148-
RendererBinding.instance.handlePointerEvent(event);
148+
RendererBinding.instance!.handlePointerEvent(event);
149149
},
150150
kind: PointerDeviceKind.mouse,
151151
);

‎dev/benchmarks/macrobenchmarks/lib/src/web/bench_mouse_region_grid_scroll.dart‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ class BenchMouseRegionGridScroll extends WidgetRecorder {
4141
void frameDidDraw() {
4242
if (!started) {
4343
started = true;
44-
SchedulerBinding.instance.addPostFrameCallback((Duration timeStamp) async {
44+
SchedulerBinding.instance!.addPostFrameCallback((Duration timeStamp) async {
4545
_tester.start();
4646
registerDidStop(_tester.stop);
4747
});
@@ -96,7 +96,7 @@ class _UntilNextFrame {
9696
static Future<void> wait() {
9797
if (_UntilNextFrame._completer == null) {
9898
_UntilNextFrame._completer = Completer<void>();
99-
SchedulerBinding.instance.addPostFrameCallback((_) {
99+
SchedulerBinding.instance!.addPostFrameCallback((_) {
100100
_UntilNextFrame._completer!.complete(null);
101101
_UntilNextFrame._completer = null;
102102
});
@@ -117,7 +117,7 @@ class _Tester {
117117
TestGesture get gesture {
118118
return _gesture ??= TestGesture(
119119
dispatcher: (PointerEvent event) async {
120-
RendererBinding.instance.handlePointerEvent(event);
120+
RendererBinding.instance!.handlePointerEvent(event);
121121
},
122122
kind: PointerDeviceKind.mouse,
123123
);

‎dev/benchmarks/macrobenchmarks/lib/src/web/bench_mouse_region_mixed_grid_hover.dart‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ class BenchMouseRegionMixedGridHover extends WidgetRecorder {
8585
void frameDidDraw() {
8686
if (!started) {
8787
started = true;
88-
SchedulerBinding.instance.addPostFrameCallback((Duration timeStamp) async {
88+
SchedulerBinding.instance!.addPostFrameCallback((Duration timeStamp) async {
8989
_tester.start();
9090
registerDidStop(_tester.stop);
9191
});
@@ -146,7 +146,7 @@ class _UntilNextFrame {
146146
static Future<void> wait() {
147147
if (_UntilNextFrame._completer == null) {
148148
_UntilNextFrame._completer = Completer<void>();
149-
SchedulerBinding.instance.addPostFrameCallback((_) {
149+
SchedulerBinding.instance!.addPostFrameCallback((_) {
150150
_UntilNextFrame._completer!.complete(null);
151151
_UntilNextFrame._completer = null;
152152
});
@@ -167,7 +167,7 @@ class _Tester {
167167
TestGesture get gesture {
168168
return _gesture ??= TestGesture(
169169
dispatcher: (PointerEvent event) async {
170-
RendererBinding.instance.handlePointerEvent(event);
170+
RendererBinding.instance!.handlePointerEvent(event);
171171
},
172172
kind: PointerDeviceKind.mouse,
173173
);

‎dev/benchmarks/macrobenchmarks/lib/src/web/recorder.dart‎

Lines changed: 4 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -935,7 +935,7 @@ double _computeAverage(String label, Iterable<double> values) {
935935
///
936936
/// See also:
937937
///
938-
/// * <https://en.wikipedia.org/wiki/Standard_deviation>
938+
/// * https://en.wikipedia.org/wiki/Standard_deviation
939939
double _computeStandardDeviationForPopulation(String label, Iterable<double> population) {
940940
if (population.isEmpty) {
941941
throw StateError('$label: attempted to compute the standard deviation of empty population.');
@@ -987,32 +987,12 @@ class _RecordingWidgetsBinding extends BindingBase
987987
SemanticsBinding,
988988
RendererBinding,
989989
WidgetsBinding {
990-
991-
@override
992-
void initInstances() {
993-
super.initInstances();
994-
_instance = this;
995-
}
996-
997-
/// The singleton instance of this object.
998-
///
999-
/// Provides access to the features exposed by this class. The binding must
1000-
/// be initialized before using this getter; this is typically done by calling
1001-
/// [_RecordingWidgetsBinding.ensureInitialized].
1002-
static _RecordingWidgetsBinding get instance => BindingBase.checkInstance(_instance);
1003-
static _RecordingWidgetsBinding? _instance;
1004-
1005-
/// Returns an instance of the [_RecordingWidgetsBinding], creating and
1006-
/// initializing it if necessary.
1007-
///
1008-
/// See also:
1009-
///
1010-
/// * [WidgetsFlutterBinding.ensureInitialized], the equivalent in the widgets framework.
990+
/// Makes an instance of [_RecordingWidgetsBinding] the current binding.
1011991
static _RecordingWidgetsBinding ensureInitialized() {
1012-
if (_instance == null) {
992+
if (WidgetsBinding.instance == null) {
1013993
_RecordingWidgetsBinding();
1014994
}
1015-
return instance;
995+
return WidgetsBinding.instance! as _RecordingWidgetsBinding;
1016996
}
1017997

1018998
FrameRecorder? _recorder;

‎dev/benchmarks/macrobenchmarks/test/frame_policy.dart‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@ import 'package:integration_test/integration_test.dart';
1010
import 'package:macrobenchmarks/src/simple_scroll.dart';
1111

1212
void main() {
13-
final IntegrationTestWidgetsFlutterBinding binding = IntegrationTestWidgetsFlutterBinding.ensureInitialized();
13+
final IntegrationTestWidgetsFlutterBinding binding =
14+
IntegrationTestWidgetsFlutterBinding.ensureInitialized() as IntegrationTestWidgetsFlutterBinding;
1415
testWidgets(
1516
'Frame Counter and Input Delay for benchmarkLive',
1617
(WidgetTester tester) async {

‎dev/benchmarks/macrobenchmarks/test_memory/heavy_gridview.dart‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ import 'package:macrobenchmarks/main.dart';
1010

1111
Future<void> endOfAnimation() async {
1212
do {
13-
await SchedulerBinding.instance.endOfFrame;
14-
} while (SchedulerBinding.instance.hasScheduledFrame);
13+
await SchedulerBinding.instance!.endOfFrame;
14+
} while (SchedulerBinding.instance!.hasScheduledFrame);
1515
}
1616

1717
Future<void> main() async {

‎dev/benchmarks/macrobenchmarks/test_memory/large_images.dart‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ import 'package:macrobenchmarks/main.dart';
1010

1111
Future<void> endOfAnimation() async {
1212
do {
13-
await SchedulerBinding.instance.endOfFrame;
14-
} while (SchedulerBinding.instance.hasScheduledFrame);
13+
await SchedulerBinding.instance!.endOfFrame;
14+
} while (SchedulerBinding.instance!.hasScheduledFrame);
1515
}
1616

1717
Future<void> main() async {

0 commit comments

Comments
 (0)