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

Commit 2ff6ad8

Browse files
author
Kaushik Iska
committed
change to embedderId
1 parent e5e9ec2 commit 2ff6ad8

File tree

4 files changed

+12
-8
lines changed

4 files changed

+12
-8
lines changed

lib/ui/hooks.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,7 @@ PointerDataPacket _unpackPointerDataPacket(ByteData packet) {
300300
for (int i = 0; i < length; ++i) {
301301
int offset = i * _kPointerDataFieldCount;
302302
data.add(PointerData(
303-
motionEventId: packet.getInt64(kStride * offset++, _kFakeHostEndian),
303+
embedderId: packet.getInt64(kStride * offset++, _kFakeHostEndian),
304304
timeStamp: Duration(microseconds: packet.getInt64(kStride * offset++, _kFakeHostEndian)),
305305
change: PointerChange.values[packet.getInt64(kStride * offset++, _kFakeHostEndian)],
306306
kind: PointerDeviceKind.values[packet.getInt64(kStride * offset++, _kFakeHostEndian)],

lib/ui/pointer.dart

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ enum PointerSignalKind {
7272
class PointerData {
7373
/// Creates an object that represents the state of a pointer.
7474
const PointerData({
75-
this.motionEventId = 0,
75+
this.embedderId = 0,
7676
this.timeStamp = Duration.zero,
7777
this.change = PointerChange.cancel,
7878
this.kind = PointerDeviceKind.touch,
@@ -103,8 +103,12 @@ class PointerData {
103103
this.scrollDeltaY = 0.0,
104104
});
105105

106-
/// Unique identifier for the motion event corresponding to the pointer event.
107-
final int motionEventId;
106+
/// Unique identifier that ties the [PointerEvent] to embedder event created it.
107+
///
108+
/// No two pointer events can have the same [embedderId]. This is different from
109+
/// [pointerIdentifier] - used for hit-testing, whereas [embedderId] is used to
110+
/// identify the platform event.
111+
final int embedderId;
108112

109113
/// Time of event dispatch, relative to an arbitrary timeline.
110114
final Duration timeStamp;
@@ -267,7 +271,7 @@ class PointerData {
267271
/// Returns a complete textual description of the information in this object.
268272
String toStringFull() {
269273
return '$runtimeType('
270-
'motionEventId: $motionEventId, '
274+
'embedderId: $embedderId, '
271275
'timeStamp: $timeStamp, '
272276
'change: $change, '
273277
'kind: $kind, '

lib/ui/window/pointer_data.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ struct alignas(8) PointerData {
5858
kScroll,
5959
};
6060

61-
int64_t motion_event_id;
61+
int64_t embedder_id;
6262
int64_t time_stamp;
6363
Change change;
6464
DeviceKind kind;

shell/platform/embedder/embedder.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1225,8 +1225,8 @@ FlutterEngineResult FlutterEngineSendPointerEvent(
12251225
for (size_t i = 0; i < events_count; ++i) {
12261226
flutter::PointerData pointer_data;
12271227
pointer_data.Clear();
1228-
// this is only for android embedding.
1229-
pointer_data.motion_event_id = 0;
1228+
// this is currely in use only on android embedding.
1229+
pointer_data.embedder_id = 0;
12301230
pointer_data.time_stamp = SAFE_ACCESS(current, timestamp, 0);
12311231
pointer_data.change = ToPointerDataChange(
12321232
SAFE_ACCESS(current, phase, FlutterPointerPhase::kCancel));

0 commit comments

Comments
 (0)