| 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 bf1fc53f8cbfecf0be5362c6744d8114d6a0db3e..f7507bf9d2674067b5aba24bc3a0336dfcdd56ec 100644
|
| --- a/ui/events/android/motion_event_android.cc
|
| +++ b/ui/events/android/motion_event_android.cc
|
| @@ -12,6 +12,7 @@
|
| #include "jni/MotionEvent_jni.h"
|
| #include "ui/events/base_event_utils.h"
|
| #include "ui/events/event_constants.h"
|
| +#include "ui/events/event_utils.h"
|
|
|
| using base::android::AttachCurrentThread;
|
| using namespace JNI_MotionEvent;
|
| @@ -94,7 +95,10 @@ int FromAndroidMetaState(int meta_state) {
|
| }
|
|
|
| base::TimeTicks FromAndroidTime(int64_t time_ms) {
|
| - return base::TimeTicks() + base::TimeDelta::FromMilliseconds(time_ms);
|
| + base::TimeTicks timestamp =
|
| + base::TimeTicks() + base::TimeDelta::FromMilliseconds(time_ms);
|
| + ValidateEventTimeClock(×tamp);
|
| + return timestamp;
|
| }
|
|
|
| float ToValidFloat(float x) {
|
|
|