Skip to content
This repository was archived by the owner on Feb 22, 2023. It is now read-only.

Commit 224e6aa

Browse files
goderbauergoderbauer
authored
Remove unnecessary null checks in flutter/gestures (#118926)
1 parent 90ffb1c commit 224e6aa

16 files changed

+52
-159
lines changed

‎packages/flutter/lib/src/gestures/arena.dart‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,6 @@ class GestureArenaManager {
266266

267267
void _resolveInFavorOf(int pointer, _GestureArena state, GestureArenaMember member) {
268268
assert(state == _arenas[pointer]);
269-
assert(state != null);
270269
assert(state.eagerWinner == null || state.eagerWinner == member);
271270
assert(!state.isOpen);
272271
_arenas.remove(pointer);

‎packages/flutter/lib/src/gestures/binding.dart‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,6 @@ class _Resampler {
8383
// Add `event` for resampling or dispatch it directly if
8484
// not a touch event.
8585
void addOrDispatch(PointerEvent event) {
86-
final SchedulerBinding scheduler = SchedulerBinding.instance;
87-
assert(scheduler != null);
8886
// Add touch event to resampler or dispatch pointer event directly.
8987
if (event.kind == PointerDeviceKind.touch) {
9088
// Save last event time for debugPrint of resampling margin.
@@ -108,7 +106,6 @@ class _Resampler {
108106
// The `samplingClock` is the clock used to determine frame time age.
109107
void sample(Duration samplingOffset, SamplingClock clock) {
110108
final SchedulerBinding scheduler = SchedulerBinding.instance;
111-
assert(scheduler != null);
112109

113110
// Initialize `_frameTime` if needed. This will be used for periodic
114111
// sampling when frame callbacks are not received.
@@ -391,7 +388,6 @@ mixin GestureBinding on BindingBase implements HitTestable, HitTestDispatcher, H
391388
if (hitTestResult != null ||
392389
event is PointerAddedEvent ||
393390
event is PointerRemovedEvent) {
394-
assert(event.position != null);
395391
dispatchEvent(event, hitTestResult);
396392
}
397393
}

‎packages/flutter/lib/src/gestures/converter.dart‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,15 +54,13 @@ class PointerEventConverter {
5454
.where((ui.PointerData datum) => datum.signalKind != ui.PointerSignalKind.unknown)
5555
.map((ui.PointerData datum) {
5656
final Offset position = Offset(datum.physicalX, datum.physicalY) / devicePixelRatio;
57-
assert(position != null);
5857
final Offset delta = Offset(datum.physicalDeltaX, datum.physicalDeltaY) / devicePixelRatio;
5958
final double radiusMinor = _toLogicalPixels(datum.radiusMinor, devicePixelRatio);
6059
final double radiusMajor = _toLogicalPixels(datum.radiusMajor, devicePixelRatio);
6160
final double radiusMin = _toLogicalPixels(datum.radiusMin, devicePixelRatio);
6261
final double radiusMax = _toLogicalPixels(datum.radiusMax, devicePixelRatio);
6362
final Duration timeStamp = datum.timeStamp;
6463
final PointerDeviceKind kind = datum.kind;
65-
assert(datum.change != null);
6664
switch (datum.signalKind ?? ui.PointerSignalKind.none) {
6765
case ui.PointerSignalKind.none:
6866
switch (datum.change) {

‎packages/flutter/lib/src/gestures/drag_details.dart‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,7 @@ class DragDownDetails {
2525
DragDownDetails({
2626
this.globalPosition = Offset.zero,
2727
Offset? localPosition,
28-
}) : assert(globalPosition != null),
29-
localPosition = localPosition ?? globalPosition;
28+
}) : localPosition = localPosition ?? globalPosition;
3029

3130
/// The global position at which the pointer contacted the screen.
3231
///
@@ -73,8 +72,7 @@ class DragStartDetails {
7372
this.globalPosition = Offset.zero,
7473
Offset? localPosition,
7574
this.kind,
76-
}) : assert(globalPosition != null),
77-
localPosition = localPosition ?? globalPosition;
75+
}) : localPosition = localPosition ?? globalPosition;
7876

7977
/// Recorded timestamp of the source pointer event that triggered the drag
8078
/// event.
@@ -142,8 +140,7 @@ class DragUpdateDetails {
142140
this.primaryDelta,
143141
required this.globalPosition,
144142
Offset? localPosition,
145-
}) : assert(delta != null),
146-
assert(
143+
}) : assert(
147144
primaryDelta == null
148145
|| (primaryDelta == delta.dx && delta.dy == 0.0)
149146
|| (primaryDelta == delta.dy && delta.dx == 0.0),
@@ -223,8 +220,7 @@ class DragEndDetails {
223220
DragEndDetails({
224221
this.velocity = Velocity.zero,
225222
this.primaryVelocity,
226-
}) : assert(velocity != null),
227-
assert(
223+
}) : assert(
228224
primaryVelocity == null
229225
|| primaryVelocity == velocity.pixelsPerSecond.dx
230226
|| primaryVelocity == velocity.pixelsPerSecond.dy,

‎packages/flutter/lib/src/gestures/events.dart‎

Lines changed: 21 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -843,8 +843,7 @@ class PointerAddedEvent extends PointerEvent with _PointerEventDescription, _Cop
843843
}
844844

845845
class _TransformedPointerAddedEvent extends _TransformedPointerEvent with _CopyPointerAddedEvent implements PointerAddedEvent {
846-
_TransformedPointerAddedEvent(this.original, this.transform)
847-
: assert(original != null), assert(transform != null);
846+
_TransformedPointerAddedEvent(this.original, this.transform);
848847

849848
@override
850849
final PointerAddedEvent original;
@@ -934,8 +933,7 @@ class PointerRemovedEvent extends PointerEvent with _PointerEventDescription, _C
934933
}
935934

936935
class _TransformedPointerRemovedEvent extends _TransformedPointerEvent with _CopyPointerRemovedEvent implements PointerRemovedEvent {
937-
_TransformedPointerRemovedEvent(this.original, this.transform)
938-
: assert(original != null), assert(transform != null);
936+
_TransformedPointerRemovedEvent(this.original, this.transform);
939937

940938
@override
941939
final PointerRemovedEvent original;
@@ -1051,8 +1049,7 @@ class PointerHoverEvent extends PointerEvent with _PointerEventDescription, _Cop
10511049
}
10521050

10531051
class _TransformedPointerHoverEvent extends _TransformedPointerEvent with _CopyPointerHoverEvent implements PointerHoverEvent {
1054-
_TransformedPointerHoverEvent(this.original, this.transform)
1055-
: assert(original != null), assert(transform != null);
1052+
_TransformedPointerHoverEvent(this.original, this.transform);
10561053

10571054
@override
10581055
final PointerHoverEvent original;
@@ -1198,8 +1195,7 @@ class PointerEnterEvent extends PointerEvent with _PointerEventDescription, _Cop
11981195
}
11991196

12001197
class _TransformedPointerEnterEvent extends _TransformedPointerEvent with _CopyPointerEnterEvent implements PointerEnterEvent {
1201-
_TransformedPointerEnterEvent(this.original, this.transform)
1202-
: assert(original != null), assert(transform != null);
1198+
_TransformedPointerEnterEvent(this.original, this.transform);
12031199

12041200
@override
12051201
final PointerEnterEvent original;
@@ -1344,8 +1340,7 @@ class PointerExitEvent extends PointerEvent with _PointerEventDescription, _Copy
13441340
}
13451341

13461342
class _TransformedPointerExitEvent extends _TransformedPointerEvent with _CopyPointerExitEvent implements PointerExitEvent {
1347-
_TransformedPointerExitEvent(this.original, this.transform)
1348-
: assert(original != null), assert(transform != null);
1343+
_TransformedPointerExitEvent(this.original, this.transform);
13491344

13501345
@override
13511346
final PointerExitEvent original;
@@ -1453,8 +1448,7 @@ class PointerDownEvent extends PointerEvent with _PointerEventDescription, _Copy
14531448
}
14541449

14551450
class _TransformedPointerDownEvent extends _TransformedPointerEvent with _CopyPointerDownEvent implements PointerDownEvent {
1456-
_TransformedPointerDownEvent(this.original, this.transform)
1457-
: assert(original != null), assert(transform != null);
1451+
_TransformedPointerDownEvent(this.original, this.transform);
14581452

14591453
@override
14601454
final PointerDownEvent original;
@@ -1571,8 +1565,7 @@ class PointerMoveEvent extends PointerEvent with _PointerEventDescription, _Copy
15711565
}
15721566

15731567
class _TransformedPointerMoveEvent extends _TransformedPointerEvent with _CopyPointerMoveEvent implements PointerMoveEvent {
1574-
_TransformedPointerMoveEvent(this.original, this.transform)
1575-
: assert(original != null), assert(transform != null);
1568+
_TransformedPointerMoveEvent(this.original, this.transform);
15761569

15771570
@override
15781571
final PointerMoveEvent original;
@@ -1684,8 +1677,7 @@ class PointerUpEvent extends PointerEvent with _PointerEventDescription, _CopyPo
16841677
}
16851678

16861679
class _TransformedPointerUpEvent extends _TransformedPointerEvent with _CopyPointerUpEvent implements PointerUpEvent {
1687-
_TransformedPointerUpEvent(this.original, this.transform)
1688-
: assert(original != null), assert(transform != null);
1680+
_TransformedPointerUpEvent(this.original, this.transform);
16891681

16901682
@override
16911683
final PointerUpEvent original;
@@ -1784,11 +1776,7 @@ class PointerScrollEvent extends PointerSignalEvent with _PointerEventDescriptio
17841776
super.position,
17851777
this.scrollDelta = Offset.zero,
17861778
super.embedderId,
1787-
}) : assert(timeStamp != null),
1788-
assert(kind != null),
1789-
assert(device != null),
1790-
assert(position != null),
1791-
assert(scrollDelta != null);
1779+
});
17921780

17931781
@override
17941782
final Offset scrollDelta;
@@ -1809,8 +1797,7 @@ class PointerScrollEvent extends PointerSignalEvent with _PointerEventDescriptio
18091797
}
18101798

18111799
class _TransformedPointerScrollEvent extends _TransformedPointerEvent with _CopyPointerScrollEvent implements PointerScrollEvent {
1812-
_TransformedPointerScrollEvent(this.original, this.transform)
1813-
: assert(original != null), assert(transform != null);
1800+
_TransformedPointerScrollEvent(this.original, this.transform);
18141801

18151802
@override
18161803
final PointerScrollEvent original;
@@ -1888,10 +1875,7 @@ class PointerScrollInertiaCancelEvent extends PointerSignalEvent with _PointerEv
18881875
super.device,
18891876
super.position,
18901877
super.embedderId,
1891-
}) : assert(timeStamp != null),
1892-
assert(kind != null),
1893-
assert(device != null),
1894-
assert(position != null);
1878+
});
18951879

18961880
@override
18971881
PointerScrollInertiaCancelEvent transformed(Matrix4? transform) {
@@ -1903,8 +1887,7 @@ class PointerScrollInertiaCancelEvent extends PointerSignalEvent with _PointerEv
19031887
}
19041888

19051889
class _TransformedPointerScrollInertiaCancelEvent extends _TransformedPointerEvent with _CopyPointerScrollInertiaCancelEvent implements PointerScrollInertiaCancelEvent {
1906-
_TransformedPointerScrollInertiaCancelEvent(this.original, this.transform)
1907-
: assert(original != null), assert(transform != null);
1890+
_TransformedPointerScrollInertiaCancelEvent(this.original, this.transform);
19081891

19091892
@override
19101893
final PointerScrollInertiaCancelEvent original;
@@ -1979,12 +1962,7 @@ class PointerScaleEvent extends PointerSignalEvent with _PointerEventDescription
19791962
super.position,
19801963
super.embedderId,
19811964
this.scale = 1.0,
1982-
}) : assert(timeStamp != null),
1983-
assert(kind != null),
1984-
assert(device != null),
1985-
assert(position != null),
1986-
assert(embedderId != null),
1987-
assert(scale != null);
1965+
});
19881966

19891967
@override
19901968
final double scale;
@@ -1999,8 +1977,7 @@ class PointerScaleEvent extends PointerSignalEvent with _PointerEventDescription
19991977
}
20001978

20011979
class _TransformedPointerScaleEvent extends _TransformedPointerEvent with _CopyPointerScaleEvent implements PointerScaleEvent {
2002-
_TransformedPointerScaleEvent(this.original, this.transform)
2003-
: assert(original != null), assert(transform != null);
1980+
_TransformedPointerScaleEvent(this.original, this.transform);
20041981

20051982
@override
20061983
final PointerScaleEvent original;
@@ -2068,13 +2045,7 @@ class PointerPanZoomStartEvent extends PointerEvent with _PointerEventDescriptio
20682045
super.position,
20692046
super.embedderId,
20702047
super.synthesized,
2071-
}) : assert(timeStamp != null),
2072-
assert(device != null),
2073-
assert(pointer != null),
2074-
assert(position != null),
2075-
assert(embedderId != null),
2076-
assert(synthesized != null),
2077-
super(kind: PointerDeviceKind.trackpad);
2048+
}) : super(kind: PointerDeviceKind.trackpad);
20782049

20792050
@override
20802051
PointerPanZoomStartEvent transformed(Matrix4? transform) {
@@ -2086,8 +2057,7 @@ class PointerPanZoomStartEvent extends PointerEvent with _PointerEventDescriptio
20862057
}
20872058

20882059
class _TransformedPointerPanZoomStartEvent extends _TransformedPointerEvent with _CopyPointerPanZoomStartEvent implements PointerPanZoomStartEvent {
2089-
_TransformedPointerPanZoomStartEvent(this.original, this.transform)
2090-
: assert(original != null), assert(transform != null);
2060+
_TransformedPointerPanZoomStartEvent(this.original, this.transform);
20912061

20922062
@override
20932063
final PointerPanZoomStartEvent original;
@@ -2179,17 +2149,7 @@ class PointerPanZoomUpdateEvent extends PointerEvent with _PointerEventDescripti
21792149
this.scale = 1.0,
21802150
this.rotation = 0.0,
21812151
super.synthesized,
2182-
}) : assert(timeStamp != null),
2183-
assert(device != null),
2184-
assert(pointer != null),
2185-
assert(position != null),
2186-
assert(embedderId != null),
2187-
assert(pan != null),
2188-
assert(panDelta != null),
2189-
assert(scale != null),
2190-
assert(rotation != null),
2191-
assert(synthesized != null),
2192-
super(kind: PointerDeviceKind.trackpad);
2152+
}) : super(kind: PointerDeviceKind.trackpad);
21932153

21942154
@override
21952155
final Offset pan;
@@ -2214,8 +2174,7 @@ class PointerPanZoomUpdateEvent extends PointerEvent with _PointerEventDescripti
22142174
}
22152175

22162176
class _TransformedPointerPanZoomUpdateEvent extends _TransformedPointerEvent with _CopyPointerPanZoomUpdateEvent implements PointerPanZoomUpdateEvent {
2217-
_TransformedPointerPanZoomUpdateEvent(this.original, this.transform)
2218-
: assert(original != null), assert(transform != null);
2177+
_TransformedPointerPanZoomUpdateEvent(this.original, this.transform);
22192178

22202179
@override
22212180
Offset get pan => original.pan;
@@ -2303,13 +2262,7 @@ class PointerPanZoomEndEvent extends PointerEvent with _PointerEventDescription,
23032262
super.position,
23042263
super.embedderId,
23052264
super.synthesized,
2306-
}) : assert(timeStamp != null),
2307-
assert(device != null),
2308-
assert(pointer != null),
2309-
assert(position != null),
2310-
assert(embedderId != null),
2311-
assert(synthesized != null),
2312-
super(kind: PointerDeviceKind.trackpad);
2265+
}) : super(kind: PointerDeviceKind.trackpad);
23132266

23142267
@override
23152268
PointerPanZoomEndEvent transformed(Matrix4? transform) {
@@ -2321,8 +2274,7 @@ class PointerPanZoomEndEvent extends PointerEvent with _PointerEventDescription,
23212274
}
23222275

23232276
class _TransformedPointerPanZoomEndEvent extends _TransformedPointerEvent with _CopyPointerPanZoomEndEvent implements PointerPanZoomEndEvent {
2324-
_TransformedPointerPanZoomEndEvent(this.original, this.transform)
2325-
: assert(original != null), assert(transform != null);
2277+
_TransformedPointerPanZoomEndEvent(this.original, this.transform);
23262278

23272279
@override
23282280
final PointerPanZoomEndEvent original;
@@ -2472,8 +2424,7 @@ double computeScaleSlop(PointerDeviceKind kind) {
24722424
}
24732425

24742426
class _TransformedPointerCancelEvent extends _TransformedPointerEvent with _CopyPointerCancelEvent implements PointerCancelEvent {
2475-
_TransformedPointerCancelEvent(this.original, this.transform)
2476-
: assert(original != null), assert(transform != null);
2427+
_TransformedPointerCancelEvent(this.original, this.transform);
24772428

24782429
@override
24792430
final PointerCancelEvent original;

‎packages/flutter/lib/src/gestures/force_press.dart‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,7 @@ class ForcePressDetails {
5252
required this.globalPosition,
5353
Offset? localPosition,
5454
required this.pressure,
55-
}) : assert(globalPosition != null),
56-
assert(pressure != null),
57-
localPosition = localPosition ?? globalPosition;
55+
}) : localPosition = localPosition ?? globalPosition;
5856

5957
/// The global position at which the function was called.
6058
final Offset globalPosition;
@@ -134,10 +132,7 @@ class ForcePressGestureRecognizer extends OneSequenceGestureRecognizer {
134132
super.kind,
135133
super.supportedDevices,
136134
super.allowedButtonsFilter,
137-
}) : assert(startPressure != null),
138-
assert(peakPressure != null),
139-
assert(interpolation != null),
140-
assert(peakPressure > startPressure);
135+
}) : assert(peakPressure > startPressure);
141136

142137
/// A pointer is in contact with the screen and has just pressed with a force
143138
/// exceeding the [startPressure]. Consequently, if there were other gesture

‎packages/flutter/lib/src/gestures/hit_test.dart‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,6 @@ class HitTestResult {
215215
/// around this function for hit testing on [RenderBox]s.
216216
@protected
217217
void pushTransform(Matrix4 transform) {
218-
assert(transform != null);
219218
assert(
220219
_debugVectorMoreOrLessEquals(transform.getRow(2), Vector4(0, 0, 1, 0)) &&
221220
_debugVectorMoreOrLessEquals(transform.getColumn(2), Vector4(0, 0, 1, 0)),
@@ -255,7 +254,6 @@ class HitTestResult {
255254
/// around this function for hit testing on [RenderSliver]s.
256255
@protected
257256
void pushOffset(Offset offset) {
258-
assert(offset != null);
259257
_localTransforms.add(_OffsetTransformPart(offset));
260258
}
261259

0 commit comments

Comments
 (0)