[Android] Always insert a TouchCancel if window or tab focus is lost

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 "base/android/jni_android.h"
 #include "jni/MotionEvent_jni.h"
 
 using base::android::AttachCurrentThread;
@@ skipping 60 matching lines @@
       cached_pointer_count_(Java_MotionEvent_getPointerCount(env, event)),
       cached_history_size_(Java_MotionEvent_getHistorySize(env, event)),
       cached_action_index_(Java_MotionEvent_getActionIndex(env, event)),
       cached_x_(Java_MotionEvent_getXF(env, event)),
       cached_y_(Java_MotionEvent_getYF(env, event)),
       should_recycle_(recycle) {
   event_.Reset(env, event);
   DCHECK(event_.obj());
 }
 
-MotionEventAndroid::MotionEventAndroid(const MotionEventAndroid& other,
-                                       bool clone)
-    : cached_time_(other.cached_time_),
+MotionEventAndroid::MotionEventAndroid(const MotionEventAndroid& other)
+    : event_(Obtain(other)),
+      cached_time_(other.cached_time_),
       cached_action_(other.cached_action_),
       cached_pointer_count_(other.cached_pointer_count_),
       cached_history_size_(other.cached_history_size_),
       cached_action_index_(other.cached_action_index_),
       cached_x_(other.cached_x_),
       cached_y_(other.cached_y_),
-      should_recycle_(clone) {
-  // An event with a pending recycle should never be copied (only cloned).
-  DCHECK(clone || !other.should_recycle_);
-  if (clone)
-    event_.Reset(Obtain(other));
-  else
-    event_.Reset(other.event_);
+      should_recycle_(true) {
+  DCHECK(event_.obj());
 }
 
 MotionEventAndroid::~MotionEventAndroid() {
   if (should_recycle_)
     Java_MotionEvent_recycle(AttachCurrentThread(), event_.obj());
 }
 
 MotionEventAndroid::Action MotionEventAndroid::GetAction() const {
   return cached_action_;
 }
@@ skipping 27 matching lines @@
   return Java_MotionEvent_getYF_I(
       AttachCurrentThread(), event_.obj(), pointer_index);
 }
 
 float MotionEventAndroid::GetTouchMajor(size_t pointer_index) const {
   DCHECK_LT(pointer_index, cached_pointer_count_);
   return Java_MotionEvent_getTouchMajorF_I(
       AttachCurrentThread(), event_.obj(), pointer_index);
 }
 
+float MotionEventAndroid::GetPressure(size_t pointer_index) const {
+  DCHECK_LT(pointer_index, cached_pointer_count_);
+  return Java_MotionEvent_getPressureF_I(
+      AttachCurrentThread(), event_.obj(), pointer_index);
+}
+
 base::TimeTicks MotionEventAndroid::GetEventTime() const {
   return cached_time_;
 }
 
 size_t MotionEventAndroid::GetHistorySize() const {
   return cached_history_size_;
 }
 
 base::TimeTicks MotionEventAndroid::GetHistoricalEventTime(
     size_t historical_index) const {
@@ skipping 14 matching lines @@
       AttachCurrentThread(), event_.obj(), pointer_index, historical_index);
 }
 
 float MotionEventAndroid::GetHistoricalY(size_t pointer_index,
                                          size_t historical_index) const {
   return Java_MotionEvent_getHistoricalYF_I_I(
       AttachCurrentThread(), event_.obj(), pointer_index, historical_index);
 }
 
 scoped_ptr<ui::MotionEvent> MotionEventAndroid::Clone() const {
-  return scoped_ptr<MotionEvent>(new MotionEventAndroid(*this, true));
+  return scoped_ptr<MotionEvent>(new MotionEventAndroid(*this));
 }
 
 scoped_ptr<ui::MotionEvent> MotionEventAndroid::Cancel() const {
   return scoped_ptr<MotionEvent>(new MotionEventAndroid(
       AttachCurrentThread(),
       Obtain(GetDownTime(),
              GetEventTime(),
              MotionEventAndroid::ACTION_CANCEL,
              GetX(0),
              GetY(0)).obj(),
       true));
 }
 
-float MotionEventAndroid::GetPressure(size_t pointer_index) const {
-  return Java_MotionEvent_getPressureF_I(
-      AttachCurrentThread(), event_.obj(), pointer_index);
-}
-
 float MotionEventAndroid::GetTouchMinor(size_t pointer_index) const {
   return Java_MotionEvent_getTouchMinorF_I(
       AttachCurrentThread(), event_.obj(), pointer_index);
 }
 
 float MotionEventAndroid::GetOrientation() const {
   return Java_MotionEvent_getOrientationF(AttachCurrentThread(), event_.obj());
 }
 
 base::TimeTicks MotionEventAndroid::GetDownTime() const {
@@ skipping 23 matching lines @@
   return Java_MotionEvent_obtainAVME_J_J_I_F_F_I(AttachCurrentThread(),
                                                  ToAndroidTime(down_time),
                                                  ToAndroidTime(event_time),
                                                  ToAndroidAction(action),
                                                  x,
                                                  y,
                                                  0);
 }
 
 }  // namespace content