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

Commit 5f95749

Browse files
authored
Fix inconsistent Mozart touch events. (#3448)
Mozart ADD, REMOVE and HOVER phases were going through the default value of Blink's Cancel type, causing inconsistencies. Bug: US-157
1 parent 335daf1 commit 5f95749

File tree

1 file changed

+9
-4
lines changed

1 file changed

+9
-4
lines changed

content_handler/runtime_holder.cc

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,14 +44,20 @@ constexpr int kRecoveryPipelineDepth = 1;
4444
blink::PointerData::Change GetChangeFromPointerEventPhase(
4545
mozart::PointerEvent::Phase phase) {
4646
switch (phase) {
47-
case mozart::PointerEvent::Phase::CANCEL:
48-
return blink::PointerData::Change::kCancel;
47+
case mozart::PointerEvent::Phase::ADD:
48+
return blink::PointerData::Change::kAdd;
49+
case mozart::PointerEvent::Phase::HOVER:
50+
return blink::PointerData::Change::kHover;
4951
case mozart::PointerEvent::Phase::DOWN:
5052
return blink::PointerData::Change::kDown;
5153
case mozart::PointerEvent::Phase::MOVE:
5254
return blink::PointerData::Change::kMove;
5355
case mozart::PointerEvent::Phase::UP:
5456
return blink::PointerData::Change::kUp;
57+
case mozart::PointerEvent::Phase::REMOVE:
58+
return blink::PointerData::Change::kRemove;
59+
case mozart::PointerEvent::Phase::CANCEL:
60+
return blink::PointerData::Change::kCancel;
5561
default:
5662
return blink::PointerData::Change::kCancel;
5763
}
@@ -156,8 +162,7 @@ void RuntimeHolder::CreateView(
156162
direct_input_->SetViewportMetrics(viewport_metrics_);
157163
#endif // FLUTTER_ENABLE_VULKAN
158164
if (!kernel.empty()) {
159-
runtime_->dart_controller()->RunFromKernel(kernel.data(),
160-
kernel.size());
165+
runtime_->dart_controller()->RunFromKernel(kernel.data(), kernel.size());
161166
} else {
162167
runtime_->dart_controller()->RunFromSnapshot(snapshot.data(),
163168
snapshot.size());

0 commit comments

Comments
 (0)