Type conversion fixes, ui/ edition.

ui/events/event.cc

 // Copyright (c) 2012 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/event.h"
 
 #if defined(USE_X11)
 #include <X11/extensions/XInput2.h>
 #include <X11/Xlib.h>
 #include <X11/keysym.h>
 #endif
 
 #include <cmath>
 #include <cstring>
 
 #include "base/metrics/histogram.h"
 #include "base/strings/stringprintf.h"
 #include "ui/events/event_utils.h"
 #include "ui/events/keycodes/keyboard_code_conversion.h"
+#include "ui/gfx/geometry/safe_integer_conversions.h"
 #include "ui/gfx/point3_f.h"
 #include "ui/gfx/point_conversions.h"
 #include "ui/gfx/transform.h"
 #include "ui/gfx/transform_util.h"
 
 #if defined(USE_X11)
 #include "ui/events/keycodes/keyboard_code_conversion_x.h"
 #elif defined(USE_OZONE)
 #include "ui/events/keycodes/keyboard_code_conversion.h"
 #endif
@@ skipping 177 matching lines @@
       native_event_(native_event),
       delete_native_event_(false),
       cancelable_(true),
       target_(NULL),
       phase_(EP_PREDISPATCH),
       result_(ER_UNHANDLED),
       source_device_id_(ED_UNKNOWN_DEVICE) {
   base::TimeDelta delta = EventTimeForNow() - time_stamp_;
   if (type_ < ET_LAST)
     name_ = EventTypeName(type_);
-  UMA_HISTOGRAM_CUSTOM_COUNTS("Event.Latency.Browser",
-                              delta.InMicroseconds(), 1, 1000000, 100);
+  base::HistogramBase::Sample delta_sample =
+      static_cast<base::HistogramBase::Sample>(delta.InMicroseconds());
+  UMA_HISTOGRAM_CUSTOM_COUNTS("Event.Latency.Browser", delta_sample, 1, 1000000,
+                              100);
   std::string name_for_event =
       base::StringPrintf("Event.Latency.Browser.%s", name_.c_str());
   base::HistogramBase* counter_for_type =
       base::Histogram::FactoryGet(
           name_for_event,
           1,
           1000000,
           100,
           base::HistogramBase::kUmaTargetedHistogramFlag);
-  counter_for_type->Add(delta.InMicroseconds());
+  counter_for_type->Add(delta_sample);
 
 #if defined(USE_X11)
   if (native_event->type == GenericEvent) {
     XIDeviceEvent* xiev =
         static_cast<XIDeviceEvent*>(native_event->xcookie.data);
     source_device_id_ = xiev->sourceid;
   }
 #endif
 }
 
@@ skipping 204 matching lines @@
 ////////////////////////////////////////////////////////////////////////////////
 // MouseWheelEvent
 
 MouseWheelEvent::MouseWheelEvent(const base::NativeEvent& native_event)
     : MouseEvent(native_event),
       offset_(GetMouseWheelOffset(native_event)) {
 }
 
 MouseWheelEvent::MouseWheelEvent(const ScrollEvent& scroll_event)
     : MouseEvent(scroll_event),
-      offset_(scroll_event.x_offset(), scroll_event.y_offset()){
+      offset_(gfx::ToRoundedInt(scroll_event.x_offset()),
+              gfx::ToRoundedInt(scroll_event.y_offset())) {
   SetType(ET_MOUSEWHEEL);
 }
 
 MouseWheelEvent::MouseWheelEvent(const MouseEvent& mouse_event,
                                  int x_offset,
                                  int y_offset)
     : MouseEvent(mouse_event), offset_(x_offset, y_offset) {
   DCHECK(type() == ET_MOUSEWHEEL);
 }
 
@@ skipping 21 matching lines @@
 // This value matches GTK+ wheel scroll amount.
 const int MouseWheelEvent::kWheelDelta = 53;
 #endif
 
 void MouseWheelEvent::UpdateForRootTransform(
     const gfx::Transform& inverted_root_transform) {
   LocatedEvent::UpdateForRootTransform(inverted_root_transform);
   gfx::DecomposedTransform decomp;
   bool success = gfx::DecomposeTransform(&decomp, inverted_root_transform);
   DCHECK(success);
-  if (decomp.scale[0])
-    offset_.set_x(offset_.x() * decomp.scale[0]);
-  if (decomp.scale[1])
-    offset_.set_y(offset_.y() * decomp.scale[1]);
+  if (decomp.scale[0]) {
+    offset_.set_x(
+        gfx::ToRoundedInt(SkMScalarToFloat(offset_.x() * decomp.scale[0])));
+  }
+  if (decomp.scale[1]) {
+    offset_.set_y(
+        gfx::ToRoundedInt(SkMScalarToFloat(offset_.y() * decomp.scale[1])));
+  }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // TouchEvent
 
 TouchEvent::TouchEvent(const base::NativeEvent& native_event)
     : LocatedEvent(native_event),
       touch_id_(GetTouchId(native_event)),
       radius_x_(GetTouchRadiusX(native_event)),
       radius_y_(GetTouchRadiusY(native_event)),
@@ skipping 452 matching lines @@
                    gfx::PointF(x, y),
                    time_stamp,
                    flags | EF_FROM_TOUCH),
       details_(details) {
 }
 
 GestureEvent::~GestureEvent() {
 }
 
 }  // namespace ui