Set the unique_event_id when converting from TouchEvent to WebTouchEvent

content/browser/renderer_host/input/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 "content/browser/renderer_host/input/motion_event_android.h"
 
 #include <android/input.h>
 
 #include "base/android/jni_android.h"
 #include "base/float_util.h"
 #include "jni/MotionEvent_jni.h"
+#include "ui/events/base_event_utils.h"
 #include "ui/events/event_constants.h"
 
 using base::android::AttachCurrentThread;
 using namespace JNI_MotionEvent;
 
 namespace content {
 namespace {
 
 MotionEventAndroid::Action FromAndroidAction(int android_action) {
   switch (android_action) {
@@ skipping 135 matching lines @@
                                        const Pointer& pointer1)
     : pix_to_dip_(pix_to_dip),
       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_button_state_(FromAndroidButtonState(android_button_state)),
       cached_flags_(FromAndroidMetaState(meta_state)),
       cached_raw_position_offset_(ToDips(raw_offset_x_pixels),
-                                  ToDips(raw_offset_y_pixels)) {
+                                  ToDips(raw_offset_y_pixels)),
+      unique_event_id_(ui::GetNextTouchEventId()) {
   DCHECK_GT(pointer_count, 0);
 
   event_.Reset(env, event);
   if (cached_pointer_count_ > MAX_POINTERS_TO_CACHE || cached_history_size_ > 0)
     DCHECK(event_.obj());
 
   cached_pointers_[0] = FromAndroidPointer(pointer0);
   cached_pointers_[1] = FromAndroidPointer(pointer1);
 }
 
 MotionEventAndroid::~MotionEventAndroid() {
 }
 
-int MotionEventAndroid::GetId() const {
-  return 0;
+uint64 MotionEventAndroid::GetUniqueEventId() const {
+  return unique_event_id_;
 }
 
 MotionEventAndroid::Action MotionEventAndroid::GetAction() const {
   return cached_action_;
 }
 
 int MotionEventAndroid::GetActionIndex() const {
   DCHECK(cached_action_ == ACTION_POINTER_UP ||
          cached_action_ == ACTION_POINTER_DOWN)
       << "Invalid action for GetActionIndex(): " << cached_action_;
@@ skipping 139 matching lines @@
   result.tool_type = FromAndroidToolType(pointer.tool_type);
   return result;
 }
 
 // static
 bool MotionEventAndroid::RegisterMotionEventAndroid(JNIEnv* env) {
   return JNI_MotionEvent::RegisterNativesImpl(env);
 }
 
 }  // namespace content