Adding LatencyInfo to mojom::Event.

ui/events/mojo/event_struct_traits.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/events/mojo/event_struct_traits.h"
 
 #include "ui/events/event.h"
 #include "ui/events/event_utils.h"
 #include "ui/events/keycodes/dom/keycode_converter.h"
 #include "ui/events/mojo/event_constants.mojom.h"
+#include "ui/events/mojo/latency_info_struct_traits.h"
 
 namespace mojo {
 namespace {
 
 ui::mojom::EventType UIEventTypeToMojo(ui::EventType type) {
   switch (type) {
     case ui::ET_POINTER_DOWN:
       return ui::mojom::EventType::POINTER_DOWN;
 
     case ui::ET_POINTER_MOVED:
@@ skipping 109 matching lines @@
 int32_t StructTraits<ui::mojom::EventDataView, EventUniquePtr>::flags(
     const EventUniquePtr& event) {
   return event->flags();
 }
 
 int64_t StructTraits<ui::mojom::EventDataView, EventUniquePtr>::time_stamp(
     const EventUniquePtr& event) {
   return event->time_stamp().ToInternalValue();
 }
 
+const ui::LatencyInfo&
+StructTraits<ui::mojom::EventDataView, EventUniquePtr>::latency(
+    const EventUniquePtr& event) {
+  return *event->latency();
+}
+
 ui::mojom::KeyDataPtr
 StructTraits<ui::mojom::EventDataView, EventUniquePtr>::key_data(
     const EventUniquePtr& event) {
   if (!event->IsKeyEvent())
     return nullptr;
 
   const ui::KeyEvent* key_event = event->AsKeyEvent();
   ui::mojom::KeyDataPtr key_data(ui::mojom::KeyData::New());
   key_data->key_code = key_event->GetConflatedWindowsKeyCode();
   key_data->native_key_code =
@@ skipping 74 matching lines @@
     }
     pointer_data->wheel_data = std::move(wheel_data);
   }
 
   return pointer_data;
 }
 
 bool StructTraits<ui::mojom::EventDataView, EventUniquePtr>::Read(
     ui::mojom::EventDataView event,
     EventUniquePtr* out) {
+  DCHECK(!out->get());
+
   switch (event.action()) {
     case ui::mojom::EventType::KEY_PRESSED:
     case ui::mojom::EventType::KEY_RELEASED: {
       ui::mojom::KeyDataPtr key_data;
       if (!event.ReadKeyData<ui::mojom::KeyDataPtr>(&key_data))
         return false;
 
       if (key_data->is_char) {
         out->reset(new ui::KeyEvent(
             static_cast<base::char16>(key_data->character),
             static_cast<ui::KeyboardCode>(key_data->key_code), event.flags()));
-        return true;
+
+      } else {
+        out->reset(new ui::KeyEvent(
+            event.action() == ui::mojom::EventType::KEY_PRESSED
+                ? ui::ET_KEY_PRESSED
+                : ui::ET_KEY_RELEASED,
+            static_cast<ui::KeyboardCode>(key_data->key_code), event.flags()));
       }
-      out->reset(new ui::KeyEvent(
-          event.action() == ui::mojom::EventType::KEY_PRESSED
-              ? ui::ET_KEY_PRESSED
-              : ui::ET_KEY_RELEASED,
-
-          static_cast<ui::KeyboardCode>(key_data->key_code), event.flags()));
-      return true;
+      break;
     }
     case ui::mojom::EventType::POINTER_DOWN:
     case ui::mojom::EventType::POINTER_UP:
     case ui::mojom::EventType::POINTER_MOVE:
     case ui::mojom::EventType::POINTER_CANCEL:
     case ui::mojom::EventType::MOUSE_EXIT:
     case ui::mojom::EventType::POINTER_WHEEL_CHANGED: {
       ui::mojom::PointerDataPtr pointer_data;
       if (!event.ReadPointerData<ui::mojom::PointerDataPtr>(&pointer_data))
         return false;
@@ skipping 12 matching lines @@
               event.action() == ui::mojom::EventType::POINTER_WHEEL_CHANGED
                   ? ui::PointerDetails(
                         ui::EventPointerType::POINTER_TYPE_MOUSE,
                         gfx::Vector2d(
                             static_cast<int>(pointer_data->wheel_data->delta_x),
                             static_cast<int>(
                                 pointer_data->wheel_data->delta_y)))
                   : ui::PointerDetails(
                         ui::EventPointerType::POINTER_TYPE_MOUSE),
               ui::EventTimeForNow()));
-          return true;
+          break;
         }
         case ui::mojom::PointerKind::TOUCH: {
           out->reset(new ui::PointerEvent(
               MojoPointerEventTypeToUIEvent(event.action()), location,
               screen_location, event.flags(), pointer_data->pointer_id,
               pointer_data->changed_button_flags,
               ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_TOUCH,
                                  pointer_data->brush_data->width,
                                  pointer_data->brush_data->height,
                                  pointer_data->brush_data->pressure,
                                  pointer_data->brush_data->tilt_x,
                                  pointer_data->brush_data->tilt_y),
               ui::EventTimeForNow()));
-          return true;
+          break;
         }
         case ui::mojom::PointerKind::PEN:
           NOTIMPLEMENTED();
           return false;
       }
+      break;
     }
     case ui::mojom::EventType::UNKNOWN:
       return false;
   }
 
-  return false;
+  if (!out->get())
+    return false;
+
+  return event.ReadLatency((*out)->latency());
 }
 
 }  // namespace mojo