| 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 143 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 154 ui::mojom::KeyDataPtr key_data(ui::mojom::KeyData::New()); | 154 ui::mojom::KeyDataPtr key_data(ui::mojom::KeyData::New()); |
| 155 key_data->key_code = key_event->GetConflatedWindowsKeyCode(); | 155 key_data->key_code = key_event->GetConflatedWindowsKeyCode(); |
| 156 key_data->native_key_code = | 156 key_data->native_key_code = |
| 157 ui::KeycodeConverter::DomCodeToNativeKeycode(key_event->code()); | 157 ui::KeycodeConverter::DomCodeToNativeKeycode(key_event->code()); |
| 158 key_data->is_char = key_event->is_char(); | 158 key_data->is_char = key_event->is_char(); |
| 159 key_data->character = key_event->GetCharacter(); | 159 key_data->character = key_event->GetCharacter(); |
| 160 key_data->windows_key_code = static_cast<ui::mojom::KeyboardCode>( | 160 key_data->windows_key_code = static_cast<ui::mojom::KeyboardCode>( |
| 161 key_event->GetLocatedWindowsKeyboardCode()); | 161 key_event->GetLocatedWindowsKeyboardCode()); |
| 162 key_data->text = key_event->GetText(); | 162 key_data->text = key_event->GetText(); |
| 163 key_data->unmodified_text = key_event->GetUnmodifiedText(); | 163 key_data->unmodified_text = key_event->GetUnmodifiedText(); |
| 164 if (key_event->properties()) |
| 165 key_data->properties = *(key_event->properties()); |
| 164 | 166 |
| 165 return key_data; | 167 return key_data; |
| 166 } | 168 } |
| 167 | 169 |
| 168 ui::mojom::PointerDataPtr | 170 ui::mojom::PointerDataPtr |
| 169 StructTraits<ui::mojom::EventDataView, EventUniquePtr>::pointer_data( | 171 StructTraits<ui::mojom::EventDataView, EventUniquePtr>::pointer_data( |
| 170 const EventUniquePtr& event) { | 172 const EventUniquePtr& event) { |
| 171 if (!event->IsPointerEvent()) | 173 if (!event->IsPointerEvent()) |
| 172 return nullptr; | 174 return nullptr; |
| 173 | 175 |
| (...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 254 base::TimeTicks::FromInternalValue(event.time_stamp()))); | 256 base::TimeTicks::FromInternalValue(event.time_stamp()))); |
| 255 | 257 |
| 256 } else { | 258 } else { |
| 257 out->reset(new ui::KeyEvent( | 259 out->reset(new ui::KeyEvent( |
| 258 event.action() == ui::mojom::EventType::KEY_PRESSED | 260 event.action() == ui::mojom::EventType::KEY_PRESSED |
| 259 ? ui::ET_KEY_PRESSED | 261 ? ui::ET_KEY_PRESSED |
| 260 : ui::ET_KEY_RELEASED, | 262 : ui::ET_KEY_RELEASED, |
| 261 static_cast<ui::KeyboardCode>(key_data->key_code), event.flags(), | 263 static_cast<ui::KeyboardCode>(key_data->key_code), event.flags(), |
| 262 base::TimeTicks::FromInternalValue(event.time_stamp()))); | 264 base::TimeTicks::FromInternalValue(event.time_stamp()))); |
| 263 } | 265 } |
| 266 if (key_data->properties) |
| 267 (*out)->AsKeyEvent()->SetProperties(*key_data->properties); |
| 264 break; | 268 break; |
| 265 } | 269 } |
| 266 case ui::mojom::EventType::POINTER_DOWN: | 270 case ui::mojom::EventType::POINTER_DOWN: |
| 267 case ui::mojom::EventType::POINTER_UP: | 271 case ui::mojom::EventType::POINTER_UP: |
| 268 case ui::mojom::EventType::POINTER_MOVE: | 272 case ui::mojom::EventType::POINTER_MOVE: |
| 269 case ui::mojom::EventType::POINTER_CANCEL: | 273 case ui::mojom::EventType::POINTER_CANCEL: |
| 270 case ui::mojom::EventType::MOUSE_EXIT: | 274 case ui::mojom::EventType::MOUSE_EXIT: |
| 271 case ui::mojom::EventType::POINTER_WHEEL_CHANGED: { | 275 case ui::mojom::EventType::POINTER_WHEEL_CHANGED: { |
| 272 ui::mojom::PointerDataPtr pointer_data; | 276 ui::mojom::PointerDataPtr pointer_data; |
| 273 if (!event.ReadPointerData<ui::mojom::PointerDataPtr>(&pointer_data)) | 277 if (!event.ReadPointerData<ui::mojom::PointerDataPtr>(&pointer_data)) |
| (...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 321 return false; | 325 return false; |
| 322 } | 326 } |
| 323 | 327 |
| 324 if (!out->get()) | 328 if (!out->get()) |
| 325 return false; | 329 return false; |
| 326 | 330 |
| 327 return event.ReadLatency((*out)->latency()); | 331 return event.ReadLatency((*out)->latency()); |
| 328 } | 332 } |
| 329 | 333 |
| 330 } // namespace mojo | 334 } // namespace mojo |
| OLD | NEW |