From 35a129ecff0b508546273e159988ae8594a1317f Mon Sep 17 00:00:00 2001
From: sky <sky@chromium.org>
Date: Fri, 3 Apr 2015 08:18:02 -0700
Subject: [PATCH] Fixes time of events from android

BUG=none
TEST=none
R=jam@chromium.org
TBR=jam@chromium.org

Review URL: https://codereview.chromium.org/1059003002

Cr-Commit-Position: refs/heads/master@{#323743}
---
 mojo/services/native_viewport/platform_viewport_android.cc | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/mojo/services/native_viewport/platform_viewport_android.cc b/mojo/services/native_viewport/platform_viewport_android.cc
index 90bfc76b926f..ee5d7dd72f1d 100644
--- a/mojo/services/native_viewport/platform_viewport_android.cc
+++ b/mojo/services/native_viewport/platform_viewport_android.cc
@@ -114,7 +114,9 @@ bool PlatformViewportAndroid::TouchEvent(JNIEnv* env,
                                          jfloat h_wheel,
                                          jfloat v_wheel) {
   mojo::EventPtr event(mojo::Event::New());
-  event->time_stamp = time_ms;
+  event->time_stamp =
+      (base::TimeTicks() + base::TimeDelta::FromMilliseconds(time_ms))
+          .ToInternalValue();
   event->action = MotionEventActionToEventType(masked_action);
   if (event->action == mojo::EVENT_TYPE_UNKNOWN)
     return false;
-- 
2.11.4.GIT