Change ui::Event::time_stamp from TimeDelta to TimeTicks

components/exo/wayland/server.cc

 // Copyright 2015 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 "components/exo/wayland/server.h"
 
 #include <grp.h>
 #include <linux/input.h>
 #include <stddef.h>
 #include <stdint.h>
@@ skipping 91 matching lines @@
 }
 
 template <class T>
 void SetImplementation(wl_resource* resource,
                        const void* implementation,
                        std::unique_ptr<T> user_data) {
   wl_resource_set_implementation(resource, implementation, user_data.release(),
                                  DestroyUserData<T>);
 }
 
+int64_t InMilliseconds(base::TimeTicks ticks) {

[reveman, 2016/06/03 13:06:00]

Can you make this "uint32_t EventTimeStampToMilliseconds(base::TimeTicks
ticks)"?

uint32_t as that's what wayland interfaces use for event time stamps. It's fine
for this to potentially overflow as long as overflow is well defined as when
using uint32_t.

[majidvp, 2016/06/03 19:14:21]

Done. I used TimeTicksToMilleseconds because it was not limited to event
timestamps.

+  return (ticks - base::TimeTicks()).InMilliseconds();
+}
+
 // A property key containing the surface resource that is associated with
 // window. If unset, no surface resource is associated with window.
 DEFINE_WINDOW_PROPERTY_KEY(wl_resource*, kSurfaceResourceKey, nullptr);
 
 // A property key containing a boolean set to true if a viewport is associated
 // with window.
 DEFINE_WINDOW_PROPERTY_KEY(bool, kSurfaceHasViewportKey, false);
 
 // A property key containing a boolean set to true if a security object is
 // associated with window.
@@ skipping 1531 matching lines @@
     // if client's pressed button state is different from |button_flags|?
     wl_pointer_send_enter(pointer_resource_, next_serial(), surface_resource,
                           wl_fixed_from_double(location.x()),
                           wl_fixed_from_double(location.y()));
   }
   void OnPointerLeave(Surface* surface) override {
     wl_resource* surface_resource = surface->GetProperty(kSurfaceResourceKey);
     DCHECK(surface_resource);
     wl_pointer_send_leave(pointer_resource_, next_serial(), surface_resource);
   }
-  void OnPointerMotion(base::TimeDelta time_stamp,
+  void OnPointerMotion(base::TimeTicks time_stamp,
                        const gfx::PointF& location) override {
-    wl_pointer_send_motion(pointer_resource_, time_stamp.InMilliseconds(),
+    wl_pointer_send_motion(pointer_resource_, InMilliseconds(time_stamp),
                            wl_fixed_from_double(location.x()),
                            wl_fixed_from_double(location.y()));
   }
-  void OnPointerButton(base::TimeDelta time_stamp,
+  void OnPointerButton(base::TimeTicks time_stamp,
                        int button_flags,
                        bool pressed) override {
     struct {
       ui::EventFlags flag;
       uint32_t value;
     } buttons[] = {
         {ui::EF_LEFT_MOUSE_BUTTON, BTN_LEFT},
         {ui::EF_RIGHT_MOUSE_BUTTON, BTN_RIGHT},
         {ui::EF_MIDDLE_MOUSE_BUTTON, BTN_MIDDLE},
         {ui::EF_FORWARD_MOUSE_BUTTON, BTN_FORWARD},
         {ui::EF_BACK_MOUSE_BUTTON, BTN_BACK},
     };
     uint32_t serial = next_serial();
     for (auto button : buttons) {
       if (button_flags & button.flag) {
         wl_pointer_send_button(pointer_resource_, serial,
-                               time_stamp.InMilliseconds(), button.value,
+                               InMilliseconds(time_stamp), button.value,
                                pressed ? WL_POINTER_BUTTON_STATE_PRESSED
                                        : WL_POINTER_BUTTON_STATE_RELEASED);
       }
     }
   }
 
-  void OnPointerScroll(base::TimeDelta time_stamp,
+  void OnPointerScroll(base::TimeTicks time_stamp,
                        const gfx::Vector2dF& offset,
                        bool discrete) override {
     // Same as Weston, the reference compositor.
     const double kAxisStepDistance = 10.0 / ui::MouseWheelEvent::kWheelDelta;
 
     if (wl_resource_get_version(pointer_resource_) >=
         WL_POINTER_AXIS_SOURCE_SINCE_VERSION) {
       int32_t axis_source = discrete ? WL_POINTER_AXIS_SOURCE_WHEEL
                                      : WL_POINTER_AXIS_SOURCE_FINGER;
       wl_pointer_send_axis_source(pointer_resource_, axis_source);
     }
 
     double x_value = offset.x() * kAxisStepDistance;
-    wl_pointer_send_axis(pointer_resource_, time_stamp.InMilliseconds(),
+    wl_pointer_send_axis(pointer_resource_, InMilliseconds(time_stamp),
                          WL_POINTER_AXIS_HORIZONTAL_SCROLL,
                          wl_fixed_from_double(-x_value));
 
     double y_value = offset.y() * kAxisStepDistance;
-    wl_pointer_send_axis(pointer_resource_, time_stamp.InMilliseconds(),
+    wl_pointer_send_axis(pointer_resource_, InMilliseconds(time_stamp),
                          WL_POINTER_AXIS_VERTICAL_SCROLL,
                          wl_fixed_from_double(-y_value));
   }
 
-  void OnPointerScrollCancel(base::TimeDelta time_stamp) override {
+  void OnPointerScrollCancel(base::TimeTicks time_stamp) override {
     // Wayland doesn't know the concept of a canceling kinetic scrolling.
     // But we can send a 0 distance scroll to emulate this behavior.
     OnPointerScroll(time_stamp, gfx::Vector2dF(0, 0), false);
     OnPointerScrollStop(time_stamp);
   }
 
-  void OnPointerScrollStop(base::TimeDelta time_stamp) override {
+  void OnPointerScrollStop(base::TimeTicks time_stamp) override {
     if (wl_resource_get_version(pointer_resource_) >=
         WL_POINTER_AXIS_STOP_SINCE_VERSION) {
-      wl_pointer_send_axis_stop(pointer_resource_, time_stamp.InMilliseconds(),
+      wl_pointer_send_axis_stop(pointer_resource_, InMilliseconds(time_stamp),
                                 WL_POINTER_AXIS_HORIZONTAL_SCROLL);
-      wl_pointer_send_axis_stop(pointer_resource_, time_stamp.InMilliseconds(),
+      wl_pointer_send_axis_stop(pointer_resource_, InMilliseconds(time_stamp),
                                 WL_POINTER_AXIS_VERTICAL_SCROLL);
     }
   }
 
   void OnPointerFrame() override {
     if (wl_resource_get_version(pointer_resource_) >=
         WL_POINTER_FRAME_SINCE_VERSION) {
       wl_pointer_send_frame(pointer_resource_);
     }
     wl_client_flush(client());
@@ skipping 90 matching lines @@
                            &keys);
     wl_array_release(&keys);
     wl_client_flush(client());
   }
   void OnKeyboardLeave(Surface* surface) override {
     wl_resource* surface_resource = surface->GetProperty(kSurfaceResourceKey);
     DCHECK(surface_resource);
     wl_keyboard_send_leave(keyboard_resource_, next_serial(), surface_resource);
     wl_client_flush(client());
   }
-  void OnKeyboardKey(base::TimeDelta time_stamp,
+  void OnKeyboardKey(base::TimeTicks time_stamp,
                      ui::DomCode key,
                      bool pressed) override {
     wl_keyboard_send_key(keyboard_resource_, next_serial(),
-                         time_stamp.InMilliseconds(), DomCodeToKey(key),
+                         InMilliseconds(time_stamp), DomCodeToKey(key),
                          pressed ? WL_KEYBOARD_KEY_STATE_PRESSED
                                  : WL_KEYBOARD_KEY_STATE_RELEASED);
     wl_client_flush(client());
   }
   void OnKeyboardModifiers(int modifier_flags) override {
     xkb_state_update_mask(xkb_state_.get(),
                           ModifierFlagsToXkbModifiers(modifier_flags), 0, 0, 0,
                           0, 0);
     wl_keyboard_send_modifiers(
         keyboard_resource_, next_serial(),
@@ skipping 84 matching lines @@
   // Overridden from TouchDelegate:
   void OnTouchDestroying(Touch* touch) override { delete this; }
   bool CanAcceptTouchEventsForSurface(Surface* surface) const override {
     wl_resource* surface_resource = surface->GetProperty(kSurfaceResourceKey);
     // We can accept events for this surface if the client is the same as the
     // touch resource.
     return surface_resource &&
            wl_resource_get_client(surface_resource) == client();
   }
   void OnTouchDown(Surface* surface,
-                   base::TimeDelta time_stamp,
+                   base::TimeTicks time_stamp,
                    int id,
                    const gfx::Point& location) override {
     wl_resource* surface_resource = surface->GetProperty(kSurfaceResourceKey);
     DCHECK(surface_resource);
     wl_touch_send_down(touch_resource_, next_serial(),
-                       time_stamp.InMilliseconds(), surface_resource, id,
+                       InMilliseconds(time_stamp), surface_resource, id,
                        wl_fixed_from_int(location.x()),
                        wl_fixed_from_int(location.y()));
     wl_client_flush(client());
   }
-  void OnTouchUp(base::TimeDelta time_stamp, int id) override {
-    wl_touch_send_up(touch_resource_, next_serial(),
-                     time_stamp.InMilliseconds(), id);
+  void OnTouchUp(base::TimeTicks time_stamp, int id) override {
+    wl_touch_send_up(touch_resource_, next_serial(), InMilliseconds(time_stamp),
+                     id);
     wl_client_flush(client());
   }
-  void OnTouchMotion(base::TimeDelta time_stamp,
+  void OnTouchMotion(base::TimeTicks time_stamp,
                      int id,
                      const gfx::Point& location) override {
-    wl_touch_send_motion(touch_resource_, time_stamp.InMilliseconds(), id,
+    wl_touch_send_motion(touch_resource_, InMilliseconds(time_stamp), id,
                          wl_fixed_from_int(location.x()),
                          wl_fixed_from_int(location.y()));
     wl_client_flush(client());
   }
   void OnTouchCancel() override {
     wl_touch_send_cancel(touch_resource_);
     wl_client_flush(client());
   }
 
  private:
@@ skipping 628 matching lines @@
   DCHECK(event_loop);
   wl_event_loop_dispatch(event_loop, timeout.InMilliseconds());
 }
 
 void Server::Flush() {
   wl_display_flush_clients(wl_display_.get());
 }
 
 }  // namespace wayland
 }  // namespace exo