Add modifier flags to MotionEvent

ui/events/gestures/motion_event_aura.cc

 // Copyright 2014 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.
 
 // MSVC++ requires this to be set before any other includes to get M_PI.
 #define _USE_MATH_DEFINES
 
 #include "ui/events/gestures/motion_event_aura.h"
 
 #include <cmath>
 
 #include "base/logging.h"
 #include "ui/events/gestures/gesture_configuration.h"
 
 namespace ui {
 
 MotionEventAura::MotionEventAura()
     : pointer_count_(0), cached_action_index_(-1) {
 }
 
 MotionEventAura::MotionEventAura(
     size_t pointer_count,
     const base::TimeTicks& last_touch_time,
     Action cached_action,
     int cached_action_index,
+    int flags,
     const PointData (&active_touches)[MotionEvent::MAX_TOUCH_POINT_COUNT])
     : pointer_count_(pointer_count),
       last_touch_time_(last_touch_time),
       cached_action_(cached_action),
-      cached_action_index_(cached_action_index) {
+      cached_action_index_(cached_action_index),
+      flags_(flags) {
   DCHECK(pointer_count_);
   for (size_t i = 0; i < pointer_count; ++i)
     active_touches_[i] = active_touches[i];
 }
 
 MotionEventAura::~MotionEventAura() {}
 
 MotionEventAura::PointData MotionEventAura::GetPointDataFromTouchEvent(
     const TouchEvent& touch) {
   PointData point_data;
@@ skipping 49 matching lines @@
       break;
     case ET_TOUCH_MOVED:
       UpdateTouch(touch);
       break;
     default:
       NOTREACHED();
       break;
   }
 
   UpdateCachedAction(touch);
+  flags_ = touch.flags();
   last_touch_time_ = touch.time_stamp() + base::TimeTicks();
 }
 
 int MotionEventAura::GetId() const {
   return GetPointerId(0);
 }
 
 MotionEvent::Action MotionEventAura::GetAction() const {
   return cached_action_;
 }
@@ skipping 57 matching lines @@
   // TODO(jdduke): Plumb tool type from the platform, crbug.com/404128.
   DCHECK_LT(pointer_index, pointer_count_);
   return MotionEvent::TOOL_TYPE_UNKNOWN;
 }
 
 int MotionEventAura::GetButtonState() const {
   NOTIMPLEMENTED();
   return 0;
 }
 
+int MotionEventAura::GetFlags() const {
+  return flags_;
+}
+
 base::TimeTicks MotionEventAura::GetEventTime() const {
   return last_touch_time_;
 }
 
 scoped_ptr<MotionEvent> MotionEventAura::Clone() const {
   return scoped_ptr<MotionEvent>(new MotionEventAura(pointer_count_,
                                                      last_touch_time_,
                                                      cached_action_,
                                                      cached_action_index_,
+                                                     flags_,
                                                      active_touches_));
 }
 scoped_ptr<MotionEvent> MotionEventAura::Cancel() const {
   return scoped_ptr<MotionEvent>(new MotionEventAura(
-      pointer_count_, last_touch_time_, ACTION_CANCEL, -1, active_touches_));
+      pointer_count_, last_touch_time_, ACTION_CANCEL, -1, 0, active_touches_));
 }
 
 void MotionEventAura::CleanupRemovedTouchPoints(const TouchEvent& event) {
   if (event.type() != ET_TOUCH_RELEASED &&
       event.type() != ET_TOUCH_CANCELLED) {
     return;
   }
 
   int index_to_delete = static_cast<int>(GetIndexFromId(event.touch_id()));
   pointer_count_--;
@@ skipping 69 matching lines @@
 size_t MotionEventAura::GetIndexFromId(int id) const {
   for (size_t i = 0; i < pointer_count_; ++i) {
     if (active_touches_[i].touch_id == id)
       return i;
   }
   NOTREACHED();
   return 0;
 }
 
 }  // namespace ui