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

Unified Diff: ui/events/android/motion_event_android.cc

Issue 2770613002: Forward GenericMotionEvent to EventForwarder (Closed)
Patch Set: comments Created 3 years, 9 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/android/motion_event_android.h ('k') | ui/events/android/motion_event_android_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/events/android/motion_event_android.cc
diff --git a/ui/events/android/motion_event_android.cc b/ui/events/android/motion_event_android.cc
index 3a8b35a26cc79aa47555cb3e717897b363ef108a..adc13f780470eaa2749edc52fc3e34a1e51cafa2 100644
--- a/ui/events/android/motion_event_android.cc
+++ b/ui/events/android/motion_event_android.cc
@@ -181,9 +181,12 @@ MotionEventAndroid::CachedPointer::CachedPointer()
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,
@@ -197,6 +200,10 @@ MotionEventAndroid::MotionEventAndroid(float pix_to_dip,
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),
@@ -223,6 +230,10 @@ MotionEventAndroid::MotionEventAndroid(float pix_to_dip,
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_),
@@ -262,6 +273,10 @@ 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_);
}
« no previous file with comments | « ui/events/android/motion_event_android.h ('k') | ui/events/android/motion_event_android_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698