| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "ui/events/mojo/event_struct_traits.h" | 5 #include "ui/events/mojo/event_struct_traits.h" |
| 6 | 6 |
| 7 #include "ui/events/event.h" | 7 #include "ui/events/event.h" |
| 8 #include "ui/events/event_utils.h" | 8 #include "ui/events/event_utils.h" |
| 9 #include "ui/events/keycodes/dom/keycode_converter.h" | 9 #include "ui/events/keycodes/dom/keycode_converter.h" |
| 10 #include "ui/events/mojo/event_constants.mojom.h" | 10 #include "ui/events/mojo/event_constants.mojom.h" |
| (...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 159 } | 159 } |
| 160 | 160 |
| 161 ui::mojom::PointerDataPtr | 161 ui::mojom::PointerDataPtr |
| 162 StructTraits<ui::mojom::EventDataView, EventUniquePtr>::pointer_data( | 162 StructTraits<ui::mojom::EventDataView, EventUniquePtr>::pointer_data( |
| 163 const EventUniquePtr& event) { | 163 const EventUniquePtr& event) { |
| 164 if (!event->IsPointerEvent()) | 164 if (!event->IsPointerEvent()) |
| 165 return nullptr; | 165 return nullptr; |
| 166 | 166 |
| 167 const ui::PointerEvent* pointer_event = event->AsPointerEvent(); | 167 const ui::PointerEvent* pointer_event = event->AsPointerEvent(); |
| 168 ui::mojom::PointerDataPtr pointer_data(ui::mojom::PointerData::New()); | 168 ui::mojom::PointerDataPtr pointer_data(ui::mojom::PointerData::New()); |
| 169 pointer_data->pointer_id = pointer_event->pointer_id(); | 169 pointer_data->pointer_id = pointer_event->pointer_details().id; |
| 170 pointer_data->changed_button_flags = pointer_event->changed_button_flags(); | 170 pointer_data->changed_button_flags = pointer_event->changed_button_flags(); |
| 171 const ui::PointerDetails* pointer_details = &pointer_event->pointer_details(); | 171 const ui::PointerDetails* pointer_details = &pointer_event->pointer_details(); |
| 172 | 172 |
| 173 switch (pointer_details->pointer_type) { | 173 switch (pointer_details->pointer_type) { |
| 174 case ui::EventPointerType::POINTER_TYPE_MOUSE: | 174 case ui::EventPointerType::POINTER_TYPE_MOUSE: |
| 175 pointer_data->kind = ui::mojom::PointerKind::MOUSE; | 175 pointer_data->kind = ui::mojom::PointerKind::MOUSE; |
| 176 break; | 176 break; |
| 177 case ui::EventPointerType::POINTER_TYPE_TOUCH: | 177 case ui::EventPointerType::POINTER_TYPE_TOUCH: |
| 178 pointer_data->kind = ui::mojom::PointerKind::TOUCH; | 178 pointer_data->kind = ui::mojom::PointerKind::TOUCH; |
| 179 break; | 179 break; |
| (...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 305 } | 305 } |
| 306 } | 306 } |
| 307 case ui::mojom::EventType::UNKNOWN: | 307 case ui::mojom::EventType::UNKNOWN: |
| 308 return false; | 308 return false; |
| 309 } | 309 } |
| 310 | 310 |
| 311 return false; | 311 return false; |
| 312 } | 312 } |
| 313 | 313 |
| 314 } // namespace mojo | 314 } // namespace mojo |
| OLD | NEW |