| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "ui/events/android/motion_event_android.h" | 5 #include "ui/events/android/motion_event_android.h" |
| 6 | 6 |
| 7 #include <android/input.h> | 7 #include <android/input.h> |
| 8 | 8 |
| 9 #include <cmath> | 9 #include <cmath> |
| 10 | 10 |
| (...skipping 336 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 347 result.position = | 347 result.position = |
| 348 gfx::PointF(ToDips(pointer.pos_x_pixels), ToDips(pointer.pos_y_pixels)); | 348 gfx::PointF(ToDips(pointer.pos_x_pixels), ToDips(pointer.pos_y_pixels)); |
| 349 result.touch_major = ToDips(pointer.touch_major_pixels); | 349 result.touch_major = ToDips(pointer.touch_major_pixels); |
| 350 result.touch_minor = ToDips(pointer.touch_minor_pixels); | 350 result.touch_minor = ToDips(pointer.touch_minor_pixels); |
| 351 result.orientation = ToValidFloat(pointer.orientation_rad); | 351 result.orientation = ToValidFloat(pointer.orientation_rad); |
| 352 result.tilt = ToValidFloat(pointer.tilt_rad); | 352 result.tilt = ToValidFloat(pointer.tilt_rad); |
| 353 result.tool_type = FromAndroidToolType(pointer.tool_type); | 353 result.tool_type = FromAndroidToolType(pointer.tool_type); |
| 354 return result; | 354 return result; |
| 355 } | 355 } |
| 356 | 356 |
| 357 // static | |
| 358 bool MotionEventAndroid::RegisterMotionEventAndroid(JNIEnv* env) { | |
| 359 return JNI_MotionEvent::RegisterNativesImpl(env); | |
| 360 } | |
| 361 | |
| 362 } // namespace content | 357 } // namespace content |
| OLD | NEW |