Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(452)

Unified Diff: ui/events/event.cc

Issue 2786693002: Add PointerDetails to ui::MouseEvent's constructors (Closed)
Patch Set: mouse constructor Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/events/event.h ('k') | ui/events/event_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/events/event.cc
diff --git a/ui/events/event.cc b/ui/events/event.cc
index 64f06d0cae3d0fbef8a52b7a4c723663beca8582..07c1753c80fa920d8a47bc385aa76942a59d2105 100644
--- a/ui/events/event.cc
+++ b/ui/events/event.cc
@@ -533,7 +533,7 @@ PointerDetails::PointerDetails(EventPointerType pointer_type,
id(pointer_id) {
if (pointer_id == PointerDetails::kUnknownPointerId) {
id = pointer_type == EventPointerType::POINTER_TYPE_MOUSE
- ? PointerEvent::kMousePointerId
+ ? MouseEvent::kMousePointerId
: 0;
}
}
@@ -625,14 +625,15 @@ MouseEvent::MouseEvent(EventType type,
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())
@@ -757,14 +758,7 @@ void MouseEvent::SetClickCount(int click_count) {
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
@@ -1086,8 +1080,6 @@ PointerEvent::PointerEvent(EventType type,
latency()->set_source_event_type(ui::SourceEventType::OTHER);
}
-const int PointerEvent::kMousePointerId = std::numeric_limits<int32_t>::max();
-
////////////////////////////////////////////////////////////////////////////////
// KeyEvent
« no previous file with comments | « ui/events/event.h ('k') | ui/events/event_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698