Skip to content

Commit e9ca9cc

Browse files
authored
Remove references to dart:ui's window singelton (#119296)
1 parent ab2232a commit e9ca9cc

File tree

3 files changed

+4
-6
lines changed

3 files changed

+4
-6
lines changed

packages/flutter/test/gestures/gesture_binding_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -350,7 +350,7 @@ void main() {
350350
final List<PointerEvent> events = <PointerEvent>[];
351351
binding.callback = events.add;
352352

353-
ui.window.onPointerDataPacket?.call(packet);
353+
binding.platformDispatcher.onPointerDataPacket?.call(packet);
354354
expect(events.length, 3);
355355
expect(events[0], isA<PointerPanZoomStartEvent>());
356356
expect(events[1], isA<PointerPanZoomUpdateEvent>());

packages/flutter/test/rendering/mouse_tracker_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ void main() {
134134
test('should not crash if the first event is a Removed event', () {
135135
final List<PointerEvent> events = <PointerEvent>[];
136136
setUpWithOneAnnotation(logEvents: events);
137-
ui.window.onPointerDataPacket!(ui.PointerDataPacket(data: <ui.PointerData>[
137+
binding.platformDispatcher.onPointerDataPacket!(ui.PointerDataPacket(data: <ui.PointerData>[
138138
_pointerData(PointerChange.remove, Offset.zero),
139139
]));
140140
events.clear();

packages/flutter/test/widgets/independent_widget_layout_test.dart

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,14 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5-
import 'dart:ui' as ui;
6-
75
import 'package:flutter/material.dart';
86
import 'package:flutter/rendering.dart';
97
import 'package:flutter_test/flutter_test.dart';
108

119
const Size _kTestViewSize = Size(800.0, 600.0);
1210

1311
class ScheduledFrameTrackingWindow extends TestWindow {
14-
ScheduledFrameTrackingWindow() : super(window: ui.window);
12+
ScheduledFrameTrackingWindow({ required super.window });
1513

1614
int _scheduledFrameCount = 0;
1715
int get scheduledFrameCount => _scheduledFrameCount;
@@ -28,7 +26,7 @@ class ScheduledFrameTrackingWindow extends TestWindow {
2826
}
2927

3028
class ScheduledFrameTrackingBindings extends AutomatedTestWidgetsFlutterBinding {
31-
final ScheduledFrameTrackingWindow _window = ScheduledFrameTrackingWindow();
29+
late final ScheduledFrameTrackingWindow _window = ScheduledFrameTrackingWindow(window: super.window);
3230

3331
@override
3432
ScheduledFrameTrackingWindow get window => _window;

0 commit comments

Comments
 (0)