Add PointerDetails to ui::MouseEvent's constructors

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"
 
 #include <utility>
 
 #include "base/memory/ptr_util.h"
 
@@ skipping 515 matching lines @@
       radius_x(radius_x > 0 ? radius_x : radius_y),
       radius_y(radius_y > 0 ? radius_y : radius_x),
       force(force),
       tilt_x(tilt_x),
       tilt_y(tilt_y),
       tangential_pressure(tangential_pressure),
       twist(twist),
       id(pointer_id) {
   if (pointer_id == PointerDetails::kUnknownPointerId) {
     id = pointer_type == EventPointerType::POINTER_TYPE_MOUSE
-             ? PointerEvent::kMousePointerId
+             ? MouseEvent::kMousePointerId
              : 0;
   }
 }
 
 PointerDetails::PointerDetails(EventPointerType pointer_type,
                                const gfx::Vector2d& pointer_offset,
                                int pointer_id)
     : PointerDetails(pointer_type, pointer_id) {
   offset = pointer_offset;
 }
@@ skipping 71 matching lines @@
     default:
       NOTREACHED();
   }
 }
 
 MouseEvent::MouseEvent(EventType type,
                        const gfx::Point& location,
                        const gfx::Point& root_location,
                        base::TimeTicks time_stamp,
                        int flags,
-                       int changed_button_flags)
+                       int changed_button_flags,
+                       const PointerDetails& pointer_details)
     : LocatedEvent(type,
                    gfx::PointF(location),
                    gfx::PointF(root_location),
                    time_stamp,
                    flags),
       changed_button_flags_(changed_button_flags),
-      pointer_details_(PointerDetails(EventPointerType::POINTER_TYPE_MOUSE)) {
+      pointer_details_(pointer_details) {
   DCHECK_NE(ET_MOUSEWHEEL, type);
   latency()->AddLatencyNumber(INPUT_EVENT_LATENCY_UI_COMPONENT, 0, 0);
   if (this->type() == ET_MOUSE_MOVED && IsAnyButton())
     SetType(ET_MOUSE_DRAGGED);
 }
 
 // static
 bool MouseEvent::IsRepeatedClickEvent(
     const MouseEvent& event1,
     const MouseEvent& event2) {
@@ skipping 104 matching lines @@
       f &= ~EF_IS_TRIPLE_CLICK;
       break;
     case 3:
       f &= ~EF_IS_DOUBLE_CLICK;
       f |= EF_IS_TRIPLE_CLICK;
       break;
   }
   set_flags(f);
 }
 
-void MouseEvent::set_pointer_details(const PointerDetails& details) {
-  DCHECK_NE(EventPointerType::POINTER_TYPE_TOUCH,
-            pointer_details_.pointer_type);
-  DCHECK_NE(EventPointerType::POINTER_TYPE_TOUCH, details.pointer_type);
-  DCHECK(pointer_details_.id == PointerEvent::kMousePointerId ||
-         details.id != PointerEvent::kMousePointerId);
-  pointer_details_ = details;
-}
+const int MouseEvent::kMousePointerId = std::numeric_limits<int32_t>::max();
 
 ////////////////////////////////////////////////////////////////////////////////
 // MouseWheelEvent
 
 MouseWheelEvent::MouseWheelEvent(const base::NativeEvent& native_event)
     : MouseEvent(native_event),
       offset_(GetMouseWheelOffset(native_event)) {
 }
 
 MouseWheelEvent::MouseWheelEvent(const ScrollEvent& scroll_event)
@@ skipping 301 matching lines @@
       changed_button_flags_(changed_button_flags),
       details_(pointer_details) {
   if (details_.pointer_type == EventPointerType::POINTER_TYPE_TOUCH)
     latency()->set_source_event_type(ui::SourceEventType::TOUCH);
   else if (type == ET_POINTER_WHEEL_CHANGED)
     latency()->set_source_event_type(ui::SourceEventType::WHEEL);
   else
     latency()->set_source_event_type(ui::SourceEventType::OTHER);
 }
 
-const int PointerEvent::kMousePointerId = std::numeric_limits<int32_t>::max();
-
 ////////////////////////////////////////////////////////////////////////////////
 // KeyEvent
 
 // static
 KeyEvent* KeyEvent::last_key_event_ = NULL;
 
 // static
 bool KeyEvent::IsRepeated(const KeyEvent& event) {
   // A safe guard in case if there were continous key pressed events that are
   // not auto repeat.
@@ skipping 344 matching lines @@
                    flags | EF_FROM_TOUCH),
       details_(details),
       unique_touch_event_id_(unique_touch_event_id) {
   latency()->set_source_event_type(ui::SourceEventType::TOUCH);
 }
 
 GestureEvent::~GestureEvent() {
 }
 
 }  // namespace ui