Skip to content

F
Front-End
Unverified Commit 8ed8b06a authored by Kaushik Iska's avatar Kaushik Iska Committed by GitHub
Browse files
Options

Revert "Add `embedderId` to `PointerEvent` (#60930)" (#61010) 

This reverts commit 2ab50994.
parent 2ab50994
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 59 deletions
bin/internal/engine.version
View file @ 8ed8b06a
d0d6a4c2362d2ed478006bb3b01c34c0e96033b4
f22ac9da9c78215a3caf038b2205444dc2ee3d0d
dev/integration_tests/android_views/lib/wm_integrations.dart
View file @ 8ed8b06a
......@@ -219,7 +219,6 @@ class WindowManagerBodyState extends State<WindowManagerBody> {
eventTime: 723657071,
action: 0,
xPrecision: 1.0,
motionEventId: 1,
),
AndroidMotionEvent(
downTime: 723657071,
......@@ -253,7 +252,6 @@ class WindowManagerBodyState extends State<WindowManagerBody> {
edgeFlags: 0,
source: 4098,
flags: 0,
motionEventId: 2,
),
];
}
packages/flutter/lib/src/gestures/converter.dart
View file @ 8ed8b06a
......@@ -74,7 +74,6 @@ class PointerEventConverter {
radiusMax: radiusMax,
orientation: datum.orientation,
tilt: datum.tilt,
embedderId: datum.embedderId,
);
break;
case ui.PointerChange.hover:
......@@ -98,7 +97,6 @@ class PointerEventConverter {
orientation: datum.orientation,
tilt: datum.tilt,
synthesized: datum.synthesized,
embedderId: datum.embedderId,
);
break;
case ui.PointerChange.down:
......@@ -121,7 +119,6 @@ class PointerEventConverter {
radiusMax: radiusMax,
orientation: datum.orientation,
tilt: datum.tilt,
embedderId: datum.embedderId,
);
break;
case ui.PointerChange.move:
......@@ -147,7 +144,6 @@ class PointerEventConverter {
tilt: datum.tilt,
platformData: datum.platformData,
synthesized: datum.synthesized,
embedderId: datum.embedderId,
);
break;
case ui.PointerChange.up:
......@@ -171,7 +167,6 @@ class PointerEventConverter {
radiusMax: radiusMax,
orientation: datum.orientation,
tilt: datum.tilt,
embedderId: datum.embedderId,
);
break;
case ui.PointerChange.cancel:
......@@ -194,7 +189,6 @@ class PointerEventConverter {
radiusMax: radiusMax,
orientation: datum.orientation,
tilt: datum.tilt,
embedderId: datum.embedderId,
);
break;
case ui.PointerChange.remove:
......@@ -209,7 +203,6 @@ class PointerEventConverter {
distanceMax: datum.distanceMax,
radiusMin: radiusMin,
radiusMax: radiusMax,
embedderId: datum.embedderId,
);
break;
}
......@@ -224,7 +217,6 @@ class PointerEventConverter {
device: datum.device,
position: position,
scrollDelta: scrollDelta,
embedderId: datum.embedderId,
);
break;
case ui.PointerSignalKind.none:
......
packages/flutter/lib/src/gestures/events.dart
View file @ 8ed8b06a
......@@ -202,7 +202,6 @@ abstract class PointerEvent with Diagnosticable {
/// Abstract const constructor. This constructor enables subclasses to provide
/// const constructors so that they can be used in const expressions.
const PointerEvent({
this.embedderId = 0,
this.timeStamp = Duration.zero,
this.pointer = 0,
this.kind = PointerDeviceKind.touch,
......@@ -233,14 +232,6 @@ abstract class PointerEvent with Diagnosticable {
}) : localPosition = localPosition ?? position,
localDelta = localDelta ?? delta;
/// Unique identifier that ties the [PointerEvent] to the embedder event that created it.
///
/// No two pointer events can have the same [embedderId] on platforms that set it.
/// This is different from [pointer] identifier - used for hit-testing,
/// whereas [embedderId] is used to identify the platform event.
///
/// On Android this is ID of the underlying [MotionEvent](https://developer.android.com/reference/android/view/MotionEvent).
final int embedderId;
/// Time of event dispatch, relative to an arbitrary timeline.
final Duration timeStamp;
......@@ -513,7 +504,6 @@ abstract class PointerEvent with Diagnosticable {
properties.add(IntProperty('platformData', platformData, defaultValue: 0, level: DiagnosticLevel.debug));
properties.add(FlagProperty('obscured', value: obscured, ifTrue: 'obscured', level: DiagnosticLevel.debug));
properties.add(FlagProperty('synthesized', value: synthesized, ifTrue: 'synthesized', level: DiagnosticLevel.debug));
properties.add(IntProperty('embedderId', embedderId, defaultValue: 0, level: DiagnosticLevel.debug));
}
/// Returns a complete textual description of this event.
......@@ -602,7 +592,6 @@ class PointerAddedEvent extends PointerEvent {
double tilt = 0.0,
Matrix4 transform,
PointerAddedEvent original,
int embedderId = 0,
}) : super(
timeStamp: timeStamp,
kind: kind,
......@@ -621,7 +610,6 @@ class PointerAddedEvent extends PointerEvent {
tilt: tilt,
transform: transform,
original: original,
embedderId: embedderId,
);
@override
......@@ -646,7 +634,6 @@ class PointerAddedEvent extends PointerEvent {
tilt: tilt,
transform: transform,
original: original as PointerAddedEvent ?? this,
embedderId: embedderId,
);
}
}
......@@ -673,7 +660,6 @@ class PointerRemovedEvent extends PointerEvent {
double radiusMax = 0.0,
Matrix4 transform,
PointerRemovedEvent original,
int embedderId = 0,
}) : super(
timeStamp: timeStamp,
kind: kind,
......@@ -689,7 +675,6 @@ class PointerRemovedEvent extends PointerEvent {
radiusMax: radiusMax,
transform: transform,
original: original,
embedderId: embedderId,
);
@override
......@@ -711,7 +696,6 @@ class PointerRemovedEvent extends PointerEvent {
radiusMax: radiusMax,
transform: transform,
original: original as PointerRemovedEvent ?? this,
embedderId: embedderId,
);
}
}
......@@ -754,7 +738,6 @@ class PointerHoverEvent extends PointerEvent {
bool synthesized = false,
Matrix4 transform,
PointerHoverEvent original,
int embedderId = 0,
}) : super(
timeStamp: timeStamp,
kind: kind,
......@@ -781,7 +764,6 @@ class PointerHoverEvent extends PointerEvent {
synthesized: synthesized,
transform: transform,
original: original,
embedderId: embedderId,
);
@override
......@@ -819,7 +801,6 @@ class PointerHoverEvent extends PointerEvent {
synthesized: synthesized,
transform: transform,
original: original as PointerHoverEvent ?? this,
embedderId: embedderId,
);
}
}
......@@ -863,7 +844,6 @@ class PointerEnterEvent extends PointerEvent {
bool synthesized = false,
Matrix4 transform,
PointerEnterEvent original,
int embedderId = 0,
}) : super(
timeStamp: timeStamp,
kind: kind,
......@@ -890,7 +870,6 @@ class PointerEnterEvent extends PointerEvent {
synthesized: synthesized,
transform: transform,
original: original,
embedderId: embedderId,
);
/// Creates an enter event from a [PointerHoverEvent].
......@@ -968,7 +947,6 @@ class PointerEnterEvent extends PointerEvent {
synthesized: synthesized,
transform: transform,
original: original as PointerEnterEvent ?? this,
embedderId: embedderId,
);
}
}
......@@ -1012,7 +990,6 @@ class PointerExitEvent extends PointerEvent {
bool synthesized = false,
Matrix4 transform,
PointerExitEvent original,
int embedderId = 0,
}) : super(
timeStamp: timeStamp,
kind: kind,
......@@ -1039,7 +1016,6 @@ class PointerExitEvent extends PointerEvent {
synthesized: synthesized,
transform: transform,
original: original,
embedderId: embedderId,
);
/// Creates an exit event from a [PointerHoverEvent].
......@@ -1117,7 +1093,6 @@ class PointerExitEvent extends PointerEvent {
synthesized: synthesized,
transform: transform,
original: original as PointerExitEvent ?? this,
embedderId: embedderId,
);
}
}
......@@ -1149,7 +1124,6 @@ class PointerDownEvent extends PointerEvent {
double tilt = 0.0,
Matrix4 transform,
PointerDownEvent original,
int embedderId = 0,
}) : super(
timeStamp: timeStamp,
pointer: pointer,
......@@ -1174,7 +1148,6 @@ class PointerDownEvent extends PointerEvent {
tilt: tilt,
transform: transform,
original: original,
embedderId: embedderId,
);
@override
......@@ -1204,7 +1177,6 @@ class PointerDownEvent extends PointerEvent {
tilt: tilt,
transform: transform,
original: original as PointerDownEvent ?? this,
embedderId: embedderId,
);
}
}
......@@ -1246,7 +1218,6 @@ class PointerMoveEvent extends PointerEvent {
bool synthesized = false,
Matrix4 transform,
PointerMoveEvent original,
int embedderId = 0,
}) : super(
timeStamp: timeStamp,
pointer: pointer,
......@@ -1275,7 +1246,6 @@ class PointerMoveEvent extends PointerEvent {
synthesized: synthesized,
transform: transform,
original: original,
embedderId: embedderId,
);
@override
......@@ -1316,7 +1286,6 @@ class PointerMoveEvent extends PointerEvent {
synthesized: synthesized,
transform: transform,
original: original as PointerMoveEvent ?? this,
embedderId: embedderId,
);
}
}
......@@ -1351,7 +1320,6 @@ class PointerUpEvent extends PointerEvent {
double tilt = 0.0,
Matrix4 transform,
PointerUpEvent original,
int embedderId = 0,
}) : super(
timeStamp: timeStamp,
pointer: pointer,
......@@ -1376,7 +1344,6 @@ class PointerUpEvent extends PointerEvent {
tilt: tilt,
transform: transform,
original: original,
embedderId: embedderId,
);
@override
......@@ -1407,7 +1374,6 @@ class PointerUpEvent extends PointerEvent {
tilt: tilt,
transform: transform,
original: original as PointerUpEvent ?? this,
embedderId: embedderId,
);
}
}
......@@ -1429,7 +1395,6 @@ abstract class PointerSignalEvent extends PointerEvent {
Offset localPosition,
Matrix4 transform,
PointerSignalEvent original,
int embedderId = 0,
}) : super(
timeStamp: timeStamp,
pointer: pointer,
......@@ -1439,7 +1404,6 @@ abstract class PointerSignalEvent extends PointerEvent {
localPosition: localPosition,
transform: transform,
original: original,
embedderId: embedderId,
);
}
......@@ -1460,7 +1424,6 @@ class PointerScrollEvent extends PointerSignalEvent {
this.scrollDelta = Offset.zero,
Matrix4 transform,
PointerScrollEvent original,
int embedderId = 0,
}) : assert(timeStamp != null),
assert(kind != null),
assert(device != null),
......@@ -1474,7 +1437,6 @@ class PointerScrollEvent extends PointerSignalEvent {
localPosition: localPosition,
transform: transform,
original: original,
embedderId: embedderId,
);
/// The amount to scroll, in logical pixels.
......@@ -1494,7 +1456,6 @@ class PointerScrollEvent extends PointerSignalEvent {
scrollDelta: scrollDelta,
transform: transform,
original: original as PointerScrollEvent ?? this,
embedderId: embedderId,
);
}
......@@ -1532,7 +1493,6 @@ class PointerCancelEvent extends PointerEvent {
double tilt = 0.0,
Matrix4 transform,
PointerCancelEvent original,
int embedderId = 0,
}) : super(
timeStamp: timeStamp,
pointer: pointer,
......@@ -1557,7 +1517,6 @@ class PointerCancelEvent extends PointerEvent {
tilt: tilt,
transform: transform,
original: original,
embedderId: embedderId,
);
@override
......@@ -1587,7 +1546,6 @@ class PointerCancelEvent extends PointerEvent {
tilt: tilt,
transform: transform,
original: original as PointerCancelEvent ?? this,
embedderId: embedderId,
);
}
}
packages/flutter/lib/src/services/platform_views.dart
View file @ 8ed8b06a
......@@ -368,7 +368,6 @@ class AndroidMotionEvent {
@required this.edgeFlags,
@required this.source,
@required this.flags,
@required this.motionEventId,
}) : assert(downTime != null),
assert(eventTime != null),
assert(action != null),
......@@ -450,9 +449,6 @@ class AndroidMotionEvent {
/// See Android's [MotionEvent#getFlags](https://developer.android.com/reference/android/view/MotionEvent.html#getFlags()).
final int flags;
/// Used to identify this [MotionEvent](https://developer.android.com/reference/android/view/MotionEvent.html) uniquely in the Flutter Engine.
final int motionEventId;
List<dynamic> _asList(int viewId) {
return <dynamic>[
viewId,
......@@ -470,7 +466,6 @@ class AndroidMotionEvent {
edgeFlags,
source,
flags,
motionEventId,
];
}
......@@ -607,7 +602,6 @@ class _AndroidMotionEventConverter {
edgeFlags: 0,
source: 0,
flags: 0,
motionEventId: event.embedderId,
);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

HIAST - GitLab