Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1192)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: mojo/converters/input_events/input_events_type_converters.cc

Issue 1375313006: For c++, Generate enum classes instead of enum from mojom. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « examples/wm_flow/wm/wm.cc ('k') | mojo/converters/surfaces/surfaces_type_converters.cc » ('j') | mojo/public/tools/bindings/generators/cpp_templates/enum_macros.tmpl » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/converters/input_events/input_events_type_converters.cc
diff --git a/mojo/converters/input_events/input_events_type_converters.cc b/mojo/converters/input_events/input_events_type_converters.cc
index 572cd0cb58c637cdeed3e4c83dc0118cfed0baa4..e5b37df2aaaaf900f2ae4c3264b53cac0a2891ec 100644
--- a/mojo/converters/input_events/input_events_type_converters.cc
+++ b/mojo/converters/input_events/input_events_type_converters.cc
@@ -22,24 +22,24 @@ namespace {
ui::EventType MojoMouseEventTypeToUIEvent(const EventPtr& event) {
DCHECK(!event->pointer_data.is_null());
- DCHECK_EQ(POINTER_KIND_MOUSE, event->pointer_data->kind);
+ DCHECK_EQ(PointerKind::MOUSE, event->pointer_data->kind);
switch (event->action) {
- case EVENT_TYPE_POINTER_DOWN:
+ case EventType::POINTER_DOWN:
return ui::ET_MOUSE_PRESSED;
- case EVENT_TYPE_POINTER_UP:
+ case EventType::POINTER_UP:
return ui::ET_MOUSE_RELEASED;
- case EVENT_TYPE_POINTER_MOVE:
+ case EventType::POINTER_MOVE:
DCHECK(event->pointer_data);
if (event->pointer_data->horizontal_wheel != 0 ||
event->pointer_data->vertical_wheel != 0) {
return ui::ET_MOUSEWHEEL;
}
if (static_cast<uint32_t>(event->flags) &
- (static_cast<uint32_t>(EVENT_FLAGS_LEFT_MOUSE_BUTTON) |
- static_cast<uint32_t>(EVENT_FLAGS_MIDDLE_MOUSE_BUTTON) |
- static_cast<uint32_t>(EVENT_FLAGS_RIGHT_MOUSE_BUTTON))) {
+ (static_cast<uint32_t>(EventFlags::LEFT_MOUSE_BUTTON) |
+ static_cast<uint32_t>(EventFlags::MIDDLE_MOUSE_BUTTON) |
+ static_cast<uint32_t>(EventFlags::RIGHT_MOUSE_BUTTON))) {
return ui::ET_MOUSE_DRAGGED;
}
return ui::ET_MOUSE_MOVED;
@@ -53,18 +53,18 @@ ui::EventType MojoMouseEventTypeToUIEvent(const EventPtr& event) {
ui::EventType MojoTouchEventTypeToUIEvent(const EventPtr& event) {
DCHECK(!event->pointer_data.is_null());
- DCHECK_EQ(POINTER_KIND_TOUCH, event->pointer_data->kind);
+ DCHECK_EQ(PointerKind::TOUCH, event->pointer_data->kind);
switch (event->action) {
- case EVENT_TYPE_POINTER_DOWN:
+ case EventType::POINTER_DOWN:
return ui::ET_TOUCH_PRESSED;
- case EVENT_TYPE_POINTER_UP:
+ case EventType::POINTER_UP:
return ui::ET_TOUCH_RELEASED;
- case EVENT_TYPE_POINTER_MOVE:
+ case EventType::POINTER_MOVE:
return ui::ET_TOUCH_MOVED;
- case EVENT_TYPE_POINTER_CANCEL:
+ case EventType::POINTER_CANCEL:
return ui::ET_TOUCH_CANCELLED;
default:
@@ -84,43 +84,43 @@ void SetPointerDataLocationFromEvent(const ui::LocatedEvent& located_event,
} // namespace
-COMPILE_ASSERT(static_cast<int32>(EVENT_FLAGS_NONE) ==
+COMPILE_ASSERT(static_cast<int32>(EventFlags::NONE) ==
static_cast<int32>(ui::EF_NONE),
event_flags_should_match);
-COMPILE_ASSERT(static_cast<int32>(EVENT_FLAGS_CAPS_LOCK_DOWN) ==
+COMPILE_ASSERT(static_cast<int32>(EventFlags::CAPS_LOCK_DOWN) ==
static_cast<int32>(ui::EF_CAPS_LOCK_DOWN),
event_flags_should_match);
-COMPILE_ASSERT(static_cast<int32>(EVENT_FLAGS_SHIFT_DOWN) ==
+COMPILE_ASSERT(static_cast<int32>(EventFlags::SHIFT_DOWN) ==
static_cast<int32>(ui::EF_SHIFT_DOWN),
event_flags_should_match);
-COMPILE_ASSERT(static_cast<int32>(EVENT_FLAGS_CONTROL_DOWN) ==
+COMPILE_ASSERT(static_cast<int32>(EventFlags::CONTROL_DOWN) ==
static_cast<int32>(ui::EF_CONTROL_DOWN),
event_flags_should_match);
-COMPILE_ASSERT(static_cast<int32>(EVENT_FLAGS_ALT_DOWN) ==
+COMPILE_ASSERT(static_cast<int32>(EventFlags::ALT_DOWN) ==
static_cast<int32>(ui::EF_ALT_DOWN),
event_flags_should_match);
-COMPILE_ASSERT(static_cast<int32>(EVENT_FLAGS_LEFT_MOUSE_BUTTON) ==
+COMPILE_ASSERT(static_cast<int32>(EventFlags::LEFT_MOUSE_BUTTON) ==
static_cast<int32>(ui::EF_LEFT_MOUSE_BUTTON),
event_flags_should_match);
-COMPILE_ASSERT(static_cast<int32>(EVENT_FLAGS_MIDDLE_MOUSE_BUTTON) ==
+COMPILE_ASSERT(static_cast<int32>(EventFlags::MIDDLE_MOUSE_BUTTON) ==
static_cast<int32>(ui::EF_MIDDLE_MOUSE_BUTTON),
event_flags_should_match);
-COMPILE_ASSERT(static_cast<int32>(EVENT_FLAGS_RIGHT_MOUSE_BUTTON) ==
+COMPILE_ASSERT(static_cast<int32>(EventFlags::RIGHT_MOUSE_BUTTON) ==
static_cast<int32>(ui::EF_RIGHT_MOUSE_BUTTON),
event_flags_should_match);
-COMPILE_ASSERT(static_cast<int32>(EVENT_FLAGS_COMMAND_DOWN) ==
+COMPILE_ASSERT(static_cast<int32>(EventFlags::COMMAND_DOWN) ==
static_cast<int32>(ui::EF_COMMAND_DOWN),
event_flags_should_match);
-COMPILE_ASSERT(static_cast<int32>(EVENT_FLAGS_EXTENDED) ==
+COMPILE_ASSERT(static_cast<int32>(EventFlags::EXTENDED) ==
static_cast<int32>(ui::EF_EXTENDED),
event_flags_should_match);
-COMPILE_ASSERT(static_cast<int32>(EVENT_FLAGS_IS_SYNTHESIZED) ==
+COMPILE_ASSERT(static_cast<int32>(EventFlags::IS_SYNTHESIZED) ==
static_cast<int32>(ui::EF_IS_SYNTHESIZED),
event_flags_should_match);
-COMPILE_ASSERT(static_cast<int32>(EVENT_FLAGS_ALTGR_DOWN) ==
+COMPILE_ASSERT(static_cast<int32>(EventFlags::ALTGR_DOWN) ==
static_cast<int32>(ui::EF_ALTGR_DOWN),
event_flags_should_match);
-COMPILE_ASSERT(static_cast<int32>(EVENT_FLAGS_MOD3_DOWN) ==
+COMPILE_ASSERT(static_cast<int32>(EventFlags::MOD3_DOWN) ==
static_cast<int32>(ui::EF_MOD3_DOWN),
event_flags_should_match);
@@ -130,7 +130,7 @@ EventType TypeConverter<EventType, ui::EventType>::Convert(ui::EventType type) {
switch (type) {
case ui::ET_MOUSE_PRESSED:
case ui::ET_TOUCH_PRESSED:
- return EVENT_TYPE_POINTER_DOWN;
+ return EventType::POINTER_DOWN;
case ui::ET_MOUSE_DRAGGED:
case ui::ET_MOUSE_MOVED:
@@ -138,30 +138,30 @@ EventType TypeConverter<EventType, ui::EventType>::Convert(ui::EventType type) {
case ui::ET_MOUSE_EXITED:
case ui::ET_TOUCH_MOVED:
case ui::ET_MOUSEWHEEL:
- return EVENT_TYPE_POINTER_MOVE;
+ return EventType::POINTER_MOVE;
case ui::ET_MOUSE_RELEASED:
case ui::ET_TOUCH_RELEASED:
- return EVENT_TYPE_POINTER_UP;
+ return EventType::POINTER_UP;
case ui::ET_TOUCH_CANCELLED:
- return EVENT_TYPE_POINTER_CANCEL;
+ return EventType::POINTER_CANCEL;
case ui::ET_KEY_PRESSED:
- return EVENT_TYPE_KEY_PRESSED;
+ return EventType::KEY_PRESSED;
case ui::ET_KEY_RELEASED:
- return EVENT_TYPE_KEY_RELEASED;
+ return EventType::KEY_RELEASED;
default:
break;
}
- return EVENT_TYPE_UNKNOWN;
+ return EventType::UNKNOWN;
}
EventPtr TypeConverter<EventPtr, ui::Event>::Convert(const ui::Event& input) {
const EventType type = ConvertTo<EventType>(input.type());
- if (type == EVENT_TYPE_UNKNOWN)
+ if (type == EventType::UNKNOWN)
return nullptr;
EventPtr event = Event::New();
@@ -176,7 +176,7 @@ EventPtr TypeConverter<EventPtr, ui::Event>::Convert(const ui::Event& input) {
PointerDataPtr pointer_data(PointerData::New());
// TODO(sky): come up with a better way to handle this.
pointer_data->pointer_id = std::numeric_limits<int32>::max();
- pointer_data->kind = POINTER_KIND_MOUSE;
+ pointer_data->kind = PointerKind::MOUSE;
SetPointerDataLocationFromEvent(*located_event, pointer_data.get());
if (input.IsMouseWheelEvent()) {
const ui::MouseWheelEvent* wheel_event =
@@ -194,7 +194,7 @@ EventPtr TypeConverter<EventPtr, ui::Event>::Convert(const ui::Event& input) {
static_cast<const ui::TouchEvent*>(&input);
PointerDataPtr pointer_data(PointerData::New());
pointer_data->pointer_id = touch_event->touch_id();
- pointer_data->kind = POINTER_KIND_TOUCH;
+ pointer_data->kind = PointerKind::TOUCH;
SetPointerDataLocationFromEvent(*touch_event, pointer_data.get());
pointer_data->radius_major = touch_event->radius_x();
pointer_data->radius_minor = touch_event->radius_y();
@@ -246,8 +246,8 @@ scoped_ptr<ui::Event> TypeConverter<scoped_ptr<ui::Event>, EventPtr>::Convert(
}
switch (input->action) {
- case EVENT_TYPE_KEY_PRESSED:
- case EVENT_TYPE_KEY_RELEASED: {
+ case EventType::KEY_PRESSED:
+ case EventType::KEY_RELEASED: {
scoped_ptr<ui::KeyEvent> key_event;
if (input->key_data->is_char) {
// TODO(johngro) : Need to verify that input->flags (a mojom generated
@@ -261,7 +261,7 @@ scoped_ptr<ui::Event> TypeConverter<scoped_ptr<ui::Event>, EventPtr>::Convert(
// TODO(johngro) : Need to verify that input->flags (a mojom generated
// enum) is a valid set of flags for a ui::KeyEvent
key_event.reset(new ui::KeyEvent(
- input->action == EVENT_TYPE_KEY_PRESSED ? ui::ET_KEY_PRESSED
+ input->action == EventType::KEY_PRESSED ? ui::ET_KEY_PRESSED
: ui::ET_KEY_RELEASED,
static_cast<ui::KeyboardCode>(input->key_data->key_code),
@@ -275,11 +275,11 @@ scoped_ptr<ui::Event> TypeConverter<scoped_ptr<ui::Event>, EventPtr>::Convert(
key_event->set_platform_keycode(input->key_data->native_key_code);
return key_event.Pass();
}
- case EVENT_TYPE_POINTER_DOWN:
- case EVENT_TYPE_POINTER_UP:
- case EVENT_TYPE_POINTER_MOVE:
- case EVENT_TYPE_POINTER_CANCEL: {
- if (input->pointer_data->kind == POINTER_KIND_MOUSE) {
+ case EventType::POINTER_DOWN:
+ case EventType::POINTER_UP:
+ case EventType::POINTER_MOVE:
+ case EventType::POINTER_CANCEL: {
+ if (input->pointer_data->kind == PointerKind::MOUSE) {
// TODO: last flags isn't right. Need to send changed_flags.
scoped_ptr<ui::MouseEvent> event(new ui::MouseEvent(
MojoMouseEventTypeToUIEvent(input), location, screen_location,
« no previous file with comments | « examples/wm_flow/wm/wm.cc ('k') | mojo/converters/surfaces/surfaces_type_converters.cc » ('j') | mojo/public/tools/bindings/generators/cpp_templates/enum_macros.tmpl » ('J')

Powered by Google App Engine
This is Rietveld 408576698