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"
@@ skipping 97 matching lines @@
   DCHECK_GE(history_size, 0);
   // While the spec states that only ACTION_MOVE events should contain
   // historical entries, it's possible that an embedder could repurpose an
   // ACTION_MOVE event into a different kind of event. In that case, the
   // historical values are meaningless, and should not be exposed.
   if (action != ui::MotionEvent::ACTION_MOVE)
     return 0;
   return history_size;
 }
 
+uint64 get_next_event_id() {
+  // Set the first unique_id_ to 1 because we set id to 0 for other types
+  // of events.
+  static uint64 id = 1;
+  if (id==0)
+    id++;
+  DCHECK_NE(id, 0UL);

[tdresser, 2015/04/08 12:24:26]

We can remove that DCHECK.

[lanwei, 2015/04/09 04:14:28]

Done.

+  return id++;
+}
+
 }  // namespace
 
 MotionEventAndroid::Pointer::Pointer(jint id,
                                      jfloat pos_x_pixels,
                                      jfloat pos_y_pixels,
                                      jfloat touch_major_pixels,
                                      jfloat touch_minor_pixels,
                                      jfloat orientation_rad,
                                      jint tool_type)
     : id(id),
@@ skipping 29 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_id_(get_next_event_id()) {
   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::GetUniqueId() const {
+  return unique_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_;
   DCHECK_GE(cached_action_index_, 0);
   DCHECK_LT(cached_action_index_, static_cast<int>(cached_pointer_count_));
@@ skipping 137 matching lines @@
   result.tool_type = FromAndroidToolType(pointer.tool_type);
   return result;
 }
 
 // static
 bool MotionEventAndroid::RegisterMotionEventAndroid(JNIEnv* env) {
   return JNI_MotionEvent::RegisterNativesImpl(env);
 }
 
 }  // namespace content