Forward GenericMotionEvent to EventForwarder

ui/events/android/motion_event_android.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.
 
 #include "ui/events/android/motion_event_android.h"
 
 #include <android/input.h>
 
 #include <cmath>
 
@@ skipping 163 matching lines @@
 
 MotionEventAndroid::CachedPointer::CachedPointer()
     : id(0),
       touch_major(0),
       touch_minor(0),
       orientation(0),
       tilt(0),
       tool_type(TOOL_TYPE_UNKNOWN) {
 }
 
-MotionEventAndroid::MotionEventAndroid(float pix_to_dip,
-                                       JNIEnv* env,
+MotionEventAndroid::MotionEventAndroid(JNIEnv* env,
                                        jobject event,
+                                       jfloat pix_to_dip,
+                                       jfloat ticks_x,
+                                       jfloat ticks_y,
+                                       jfloat tick_multiplier,
                                        jlong time_ms,
                                        jint android_action,
                                        jint pointer_count,
                                        jint history_size,
                                        jint action_index,
                                        jint android_action_button,
                                        jint android_button_state,
                                        jint android_meta_state,
                                        jfloat raw_offset_x_pixels,
                                        jfloat raw_offset_y_pixels,
                                        const Pointer* const pointer0,
                                        const Pointer* const pointer1)
     : pix_to_dip_(pix_to_dip),
+      ticks_x_(ticks_x),
+      ticks_y_(ticks_y),
+      tick_multiplier_(tick_multiplier),
+      time_sec_(time_ms / 1000),
       cached_time_(FromAndroidTime(time_ms)),
       cached_action_(FromAndroidAction(android_action)),
       cached_pointer_count_(pointer_count),
       cached_history_size_(ToValidHistorySize(history_size, cached_action_)),
       cached_action_index_(action_index),
       cached_action_button_(android_action_button),
       cached_button_state_(FromAndroidButtonState(android_button_state)),
       cached_flags_(ToEventFlags(android_meta_state, android_button_state)),
       cached_raw_position_offset_(ToDips(raw_offset_x_pixels),
                                   ToDips(raw_offset_y_pixels)),
       unique_event_id_(ui::GetNextTouchEventId()) {
   DCHECK_GT(cached_pointer_count_, 0U);
   DCHECK(cached_pointer_count_ == 1 || pointer1);
 
   event_.Reset(env, event);
   if (cached_pointer_count_ > MAX_POINTERS_TO_CACHE || cached_history_size_ > 0)
     DCHECK(event_.obj());
 
   cached_pointers_[0] = FromAndroidPointer(*pointer0);
   if (cached_pointer_count_ > 1)
     cached_pointers_[1] = FromAndroidPointer(*pointer1);
 }
 
 MotionEventAndroid::MotionEventAndroid(const MotionEventAndroid& e)
     : event_(e.event_),
       pix_to_dip_(e.pix_to_dip_),
+      ticks_x_(e.ticks_x_),
+      ticks_y_(e.ticks_y_),
+      tick_multiplier_(e.tick_multiplier_),
+      time_sec_(e.time_sec_),
       cached_time_(e.cached_time_),
       cached_action_(e.cached_action_),
       cached_pointer_count_(e.cached_pointer_count_),
       cached_history_size_(e.cached_history_size_),
       cached_action_index_(e.cached_action_index_),
       cached_action_button_(e.cached_action_button_),
       cached_button_state_(e.cached_button_state_),
       cached_flags_(e.cached_flags_),
       cached_raw_position_offset_(e.cached_raw_position_offset_),
       unique_event_id_(ui::GetNextTouchEventId()) {
@@ skipping 19 matching lines @@
 }
 
 MotionEventAndroid::Action MotionEventAndroid::GetAction() const {
   return cached_action_;
 }
 
 int MotionEventAndroid::GetActionButton() const {
   return cached_action_button_;
 }
 
+float MotionEventAndroid::GetTickMultiplier() const {
+  return ToDips(tick_multiplier_);
+}
+
 ScopedJavaLocalRef<jobject> MotionEventAndroid::GetJavaObject() const {
   return ScopedJavaLocalRef<jobject>(event_);
 }
 
 int MotionEventAndroid::GetActionIndex() const {
   DCHECK(cached_action_ == MotionEvent::ACTION_POINTER_UP ||
          cached_action_ == MotionEvent::ACTION_POINTER_DOWN)
       << "Invalid action for GetActionIndex(): " << cached_action_;
   DCHECK_GE(cached_action_index_, 0);
   DCHECK_LT(cached_action_index_, static_cast<int>(cached_pointer_count_));
@@ skipping 161 matching lines @@
                                 pointer.position.y() + ToDips(y));
   result.touch_major = pointer.touch_major;
   result.touch_minor = pointer.touch_minor;
   result.orientation = pointer.orientation;
   result.tilt = pointer.tilt;
   result.tool_type = pointer.tool_type;
   return result;
 }
 
 }  // namespace ui