Commit 1270bcb7 authored by Sidney San Martín's avatar Sidney San Martín Committed by Commit Bot

Pass swipe gesture events over Mojo.

Bug: 913688
Change-Id: Ibd0124bd99389142c4538fdb6c55ca2c634f6f42
Reviewed-on: https://chromium-review.googlesource.com/c/1371164Reviewed-by: default avatarDominick Ng <dominickn@chromium.org>
Commit-Queue: Sidney San Martín <sdy@chromium.org>
Cr-Commit-Position: refs/heads/master@{#615449}
parent 38567472
...@@ -17,6 +17,7 @@ enum EventType { ...@@ -17,6 +17,7 @@ enum EventType {
KEY_PRESSED, KEY_PRESSED,
KEY_RELEASED, KEY_RELEASED,
GESTURE_TAP, GESTURE_TAP,
GESTURE_SWIPE,
SCROLL, SCROLL,
SCROLL_FLING_START, SCROLL_FLING_START,
SCROLL_FLING_CANCEL, SCROLL_FLING_CANCEL,
......
...@@ -117,6 +117,8 @@ ui::mojom::EventType TypeConverter<ui::mojom::EventType, ...@@ -117,6 +117,8 @@ ui::mojom::EventType TypeConverter<ui::mojom::EventType,
return ui::mojom::EventType::KEY_RELEASED; return ui::mojom::EventType::KEY_RELEASED;
case ui::ET_GESTURE_TAP: case ui::ET_GESTURE_TAP:
return ui::mojom::EventType::GESTURE_TAP; return ui::mojom::EventType::GESTURE_TAP;
case ui::ET_GESTURE_SWIPE:
return ui::mojom::EventType::GESTURE_SWIPE;
case ui::ET_SCROLL: case ui::ET_SCROLL:
return ui::mojom::EventType::SCROLL; return ui::mojom::EventType::SCROLL;
case ui::ET_SCROLL_FLING_START: case ui::ET_SCROLL_FLING_START:
...@@ -169,6 +171,8 @@ ui::EventType TypeConverter<ui::EventType, ui::mojom::EventType>::Convert( ...@@ -169,6 +171,8 @@ ui::EventType TypeConverter<ui::EventType, ui::mojom::EventType>::Convert(
return ui::ET_KEY_RELEASED; return ui::ET_KEY_RELEASED;
case ui::mojom::EventType::GESTURE_TAP: case ui::mojom::EventType::GESTURE_TAP:
return ui::ET_GESTURE_TAP; return ui::ET_GESTURE_TAP;
case ui::mojom::EventType::GESTURE_SWIPE:
return ui::ET_GESTURE_SWIPE;
case ui::mojom::EventType::SCROLL: case ui::mojom::EventType::SCROLL:
return ui::ET_SCROLL; return ui::ET_SCROLL;
case ui::mojom::EventType::SCROLL_FLING_START: case ui::mojom::EventType::SCROLL_FLING_START:
...@@ -357,6 +361,7 @@ bool StructTraits<ui::mojom::EventDataView, EventUniquePtr>::Read( ...@@ -357,6 +361,7 @@ bool StructTraits<ui::mojom::EventDataView, EventUniquePtr>::Read(
break; break;
} }
case ui::mojom::EventType::GESTURE_TAP: case ui::mojom::EventType::GESTURE_TAP:
case ui::mojom::EventType::GESTURE_SWIPE:
if (!ReadGestureData(&event, time_stamp, out)) if (!ReadGestureData(&event, time_stamp, out))
return false; return false;
break; break;
......
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