Skip to content

Commit 8ed8b06

Browse files
iskakaushikiskakaushik
authored
Revert "Add embedderId to PointerEvent (flutter#60930)" (flutter#61010)
This reverts commit 2ab5099.
1 parent 2ab5099 commit 8ed8b06

File tree

5 files changed

+1
-59
lines changed

5 files changed

+1
-59
lines changed

‎bin/internal/engine.version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
d0d6a4c2362d2ed478006bb3b01c34c0e96033b4
1+
f22ac9da9c78215a3caf038b2205444dc2ee3d0d

‎dev/integration_tests/android_views/lib/wm_integrations.dart

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,6 @@ class WindowManagerBodyState extends State<WindowManagerBody> {
219219
eventTime: 723657071,
220220
action: 0,
221221
xPrecision: 1.0,
222-
motionEventId: 1,
223222
),
224223
AndroidMotionEvent(
225224
downTime: 723657071,
@@ -253,7 +252,6 @@ class WindowManagerBodyState extends State<WindowManagerBody> {
253252
edgeFlags: 0,
254253
source: 4098,
255254
flags: 0,
256-
motionEventId: 2,
257255
),
258256
];
259257
}

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

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,6 @@ class PointerEventConverter {
7474
radiusMax: radiusMax,
7575
orientation: datum.orientation,
7676
tilt: datum.tilt,
77-
embedderId: datum.embedderId,
7877
);
7978
break;
8079
case ui.PointerChange.hover:
@@ -98,7 +97,6 @@ class PointerEventConverter {
9897
orientation: datum.orientation,
9998
tilt: datum.tilt,
10099
synthesized: datum.synthesized,
101-
embedderId: datum.embedderId,
102100
);
103101
break;
104102
case ui.PointerChange.down:
@@ -121,7 +119,6 @@ class PointerEventConverter {
121119
radiusMax: radiusMax,
122120
orientation: datum.orientation,
123121
tilt: datum.tilt,
124-
embedderId: datum.embedderId,
125122
);
126123
break;
127124
case ui.PointerChange.move:
@@ -147,7 +144,6 @@ class PointerEventConverter {
147144
tilt: datum.tilt,
148145
platformData: datum.platformData,
149146
synthesized: datum.synthesized,
150-
embedderId: datum.embedderId,
151147
);
152148
break;
153149
case ui.PointerChange.up:
@@ -171,7 +167,6 @@ class PointerEventConverter {
171167
radiusMax: radiusMax,
172168
orientation: datum.orientation,
173169
tilt: datum.tilt,
174-
embedderId: datum.embedderId,
175170
);
176171
break;
177172
case ui.PointerChange.cancel:
@@ -194,7 +189,6 @@ class PointerEventConverter {
194189
radiusMax: radiusMax,
195190
orientation: datum.orientation,
196191
tilt: datum.tilt,
197-
embedderId: datum.embedderId,
198192
);
199193
break;
200194
case ui.PointerChange.remove:
@@ -209,7 +203,6 @@ class PointerEventConverter {
209203
distanceMax: datum.distanceMax,
210204
radiusMin: radiusMin,
211205
radiusMax: radiusMax,
212-
embedderId: datum.embedderId,
213206
);
214207
break;
215208
}
@@ -224,7 +217,6 @@ class PointerEventConverter {
224217
device: datum.device,
225218
position: position,
226219
scrollDelta: scrollDelta,
227-
embedderId: datum.embedderId,
228220
);
229221
break;
230222
case ui.PointerSignalKind.none:

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

Lines changed: 0 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,6 @@ abstract class PointerEvent with Diagnosticable {
202202
/// Abstract const constructor. This constructor enables subclasses to provide
203203
/// const constructors so that they can be used in const expressions.
204204
const PointerEvent({
205-
this.embedderId = 0,
206205
this.timeStamp = Duration.zero,
207206
this.pointer = 0,
208207
this.kind = PointerDeviceKind.touch,
@@ -233,14 +232,6 @@ abstract class PointerEvent with Diagnosticable {
233232
}) : localPosition = localPosition ?? position,
234233
localDelta = localDelta ?? delta;
235234

236-
/// Unique identifier that ties the [PointerEvent] to the embedder event that created it.
237-
///
238-
/// No two pointer events can have the same [embedderId] on platforms that set it.
239-
/// This is different from [pointer] identifier - used for hit-testing,
240-
/// whereas [embedderId] is used to identify the platform event.
241-
///
242-
/// On Android this is ID of the underlying [MotionEvent](https://developer.android.com/reference/android/view/MotionEvent).
243-
final int embedderId;
244235

245236
/// Time of event dispatch, relative to an arbitrary timeline.
246237
final Duration timeStamp;
@@ -513,7 +504,6 @@ abstract class PointerEvent with Diagnosticable {
513504
properties.add(IntProperty('platformData', platformData, defaultValue: 0, level: DiagnosticLevel.debug));
514505
properties.add(FlagProperty('obscured', value: obscured, ifTrue: 'obscured', level: DiagnosticLevel.debug));
515506
properties.add(FlagProperty('synthesized', value: synthesized, ifTrue: 'synthesized', level: DiagnosticLevel.debug));
516-
properties.add(IntProperty('embedderId', embedderId, defaultValue: 0, level: DiagnosticLevel.debug));
517507
}
518508

519509
/// Returns a complete textual description of this event.
@@ -602,7 +592,6 @@ class PointerAddedEvent extends PointerEvent {
602592
double tilt = 0.0,
603593
Matrix4 transform,
604594
PointerAddedEvent original,
605-
int embedderId = 0,
606595
}) : super(
607596
timeStamp: timeStamp,
608597
kind: kind,
@@ -621,7 +610,6 @@ class PointerAddedEvent extends PointerEvent {
621610
tilt: tilt,
622611
transform: transform,
623612
original: original,
624-
embedderId: embedderId,
625613
);
626614

627615
@override
@@ -646,7 +634,6 @@ class PointerAddedEvent extends PointerEvent {
646634
tilt: tilt,
647635
transform: transform,
648636
original: original as PointerAddedEvent ?? this,
649-
embedderId: embedderId,
650637
);
651638
}
652639
}
@@ -673,7 +660,6 @@ class PointerRemovedEvent extends PointerEvent {
673660
double radiusMax = 0.0,
674661
Matrix4 transform,
675662
PointerRemovedEvent original,
676-
int embedderId = 0,
677663
}) : super(
678664
timeStamp: timeStamp,
679665
kind: kind,
@@ -689,7 +675,6 @@ class PointerRemovedEvent extends PointerEvent {
689675
radiusMax: radiusMax,
690676
transform: transform,
691677
original: original,
692-
embedderId: embedderId,
693678
);
694679

695680
@override
@@ -711,7 +696,6 @@ class PointerRemovedEvent extends PointerEvent {
711696
radiusMax: radiusMax,
712697
transform: transform,
713698
original: original as PointerRemovedEvent ?? this,
714-
embedderId: embedderId,
715699
);
716700
}
717701
}
@@ -754,7 +738,6 @@ class PointerHoverEvent extends PointerEvent {
754738
bool synthesized = false,
755739
Matrix4 transform,
756740
PointerHoverEvent original,
757-
int embedderId = 0,
758741
}) : super(
759742
timeStamp: timeStamp,
760743
kind: kind,
@@ -781,7 +764,6 @@ class PointerHoverEvent extends PointerEvent {
781764
synthesized: synthesized,
782765
transform: transform,
783766
original: original,
784-
embedderId: embedderId,
785767
);
786768

787769
@override
@@ -819,7 +801,6 @@ class PointerHoverEvent extends PointerEvent {
819801
synthesized: synthesized,
820802
transform: transform,
821803
original: original as PointerHoverEvent ?? this,
822-
embedderId: embedderId,
823804
);
824805
}
825806
}
@@ -863,7 +844,6 @@ class PointerEnterEvent extends PointerEvent {
863844
bool synthesized = false,
864845
Matrix4 transform,
865846
PointerEnterEvent original,
866-
int embedderId = 0,
867847
}) : super(
868848
timeStamp: timeStamp,
869849
kind: kind,
@@ -890,7 +870,6 @@ class PointerEnterEvent extends PointerEvent {
890870
synthesized: synthesized,
891871
transform: transform,
892872
original: original,
893-
embedderId: embedderId,
894873
);
895874

896875
/// Creates an enter event from a [PointerHoverEvent].
@@ -968,7 +947,6 @@ class PointerEnterEvent extends PointerEvent {
968947
synthesized: synthesized,
969948
transform: transform,
970949
original: original as PointerEnterEvent ?? this,
971-
embedderId: embedderId,
972950
);
973951
}
974952
}
@@ -1012,7 +990,6 @@ class PointerExitEvent extends PointerEvent {
1012990
bool synthesized = false,
1013991
Matrix4 transform,
1014992
PointerExitEvent original,
1015-
int embedderId = 0,
1016993
}) : super(
1017994
timeStamp: timeStamp,
1018995
kind: kind,
@@ -1039,7 +1016,6 @@ class PointerExitEvent extends PointerEvent {
10391016
synthesized: synthesized,
10401017
transform: transform,
10411018
original: original,
1042-
embedderId: embedderId,
10431019
);
10441020

10451021
/// Creates an exit event from a [PointerHoverEvent].
@@ -1117,7 +1093,6 @@ class PointerExitEvent extends PointerEvent {
11171093
synthesized: synthesized,
11181094
transform: transform,
11191095
original: original as PointerExitEvent ?? this,
1120-
embedderId: embedderId,
11211096
);
11221097
}
11231098
}
@@ -1149,7 +1124,6 @@ class PointerDownEvent extends PointerEvent {
11491124
double tilt = 0.0,
11501125
Matrix4 transform,
11511126
PointerDownEvent original,
1152-
int embedderId = 0,
11531127
}) : super(
11541128
timeStamp: timeStamp,
11551129
pointer: pointer,
@@ -1174,7 +1148,6 @@ class PointerDownEvent extends PointerEvent {
11741148
tilt: tilt,
11751149
transform: transform,
11761150
original: original,
1177-
embedderId: embedderId,
11781151
);
11791152

11801153
@override
@@ -1204,7 +1177,6 @@ class PointerDownEvent extends PointerEvent {
12041177
tilt: tilt,
12051178
transform: transform,
12061179
original: original as PointerDownEvent ?? this,
1207-
embedderId: embedderId,
12081180
);
12091181
}
12101182
}
@@ -1246,7 +1218,6 @@ class PointerMoveEvent extends PointerEvent {
12461218
bool synthesized = false,
12471219
Matrix4 transform,
12481220
PointerMoveEvent original,
1249-
int embedderId = 0,
12501221
}) : super(
12511222
timeStamp: timeStamp,
12521223
pointer: pointer,
@@ -1275,7 +1246,6 @@ class PointerMoveEvent extends PointerEvent {
12751246
synthesized: synthesized,
12761247
transform: transform,
12771248
original: original,
1278-
embedderId: embedderId,
12791249
);
12801250

12811251
@override
@@ -1316,7 +1286,6 @@ class PointerMoveEvent extends PointerEvent {
13161286
synthesized: synthesized,
13171287
transform: transform,
13181288
original: original as PointerMoveEvent ?? this,
1319-
embedderId: embedderId,
13201289
);
13211290
}
13221291
}
@@ -1351,7 +1320,6 @@ class PointerUpEvent extends PointerEvent {
13511320
double tilt = 0.0,
13521321
Matrix4 transform,
13531322
PointerUpEvent original,
1354-
int embedderId = 0,
13551323
}) : super(
13561324
timeStamp: timeStamp,
13571325
pointer: pointer,
@@ -1376,7 +1344,6 @@ class PointerUpEvent extends PointerEvent {
13761344
tilt: tilt,
13771345
transform: transform,
13781346
original: original,
1379-
embedderId: embedderId,
13801347
);
13811348

13821349
@override
@@ -1407,7 +1374,6 @@ class PointerUpEvent extends PointerEvent {
14071374
tilt: tilt,
14081375
transform: transform,
14091376
original: original as PointerUpEvent ?? this,
1410-
embedderId: embedderId,
14111377
);
14121378
}
14131379
}
@@ -1429,7 +1395,6 @@ abstract class PointerSignalEvent extends PointerEvent {
14291395
Offset localPosition,
14301396
Matrix4 transform,
14311397
PointerSignalEvent original,
1432-
int embedderId = 0,
14331398
}) : super(
14341399
timeStamp: timeStamp,
14351400
pointer: pointer,
@@ -1439,7 +1404,6 @@ abstract class PointerSignalEvent extends PointerEvent {
14391404
localPosition: localPosition,
14401405
transform: transform,
14411406
original: original,
1442-
embedderId: embedderId,
14431407
);
14441408
}
14451409

@@ -1460,7 +1424,6 @@ class PointerScrollEvent extends PointerSignalEvent {
14601424
this.scrollDelta = Offset.zero,
14611425
Matrix4 transform,
14621426
PointerScrollEvent original,
1463-
int embedderId = 0,
14641427
}) : assert(timeStamp != null),
14651428
assert(kind != null),
14661429
assert(device != null),
@@ -1474,7 +1437,6 @@ class PointerScrollEvent extends PointerSignalEvent {
14741437
localPosition: localPosition,
14751438
transform: transform,
14761439
original: original,
1477-
embedderId: embedderId,
14781440
);
14791441

14801442
/// The amount to scroll, in logical pixels.
@@ -1494,7 +1456,6 @@ class PointerScrollEvent extends PointerSignalEvent {
14941456
scrollDelta: scrollDelta,
14951457
transform: transform,
14961458
original: original as PointerScrollEvent ?? this,
1497-
embedderId: embedderId,
14981459
);
14991460
}
15001461

@@ -1532,7 +1493,6 @@ class PointerCancelEvent extends PointerEvent {
15321493
double tilt = 0.0,
15331494
Matrix4 transform,
15341495
PointerCancelEvent original,
1535-
int embedderId = 0,
15361496
}) : super(
15371497
timeStamp: timeStamp,
15381498
pointer: pointer,
@@ -1557,7 +1517,6 @@ class PointerCancelEvent extends PointerEvent {
15571517
tilt: tilt,
15581518
transform: transform,
15591519
original: original,
1560-
embedderId: embedderId,
15611520
);
15621521

15631522
@override
@@ -1587,7 +1546,6 @@ class PointerCancelEvent extends PointerEvent {
15871546
tilt: tilt,
15881547
transform: transform,
15891548
original: original as PointerCancelEvent ?? this,
1590-
embedderId: embedderId,
15911549
);
15921550
}
15931551
}

0 commit comments

Comments
 (0)