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

content/browser/renderer_host/input/motion_event_android.cc

Index: content/browser/renderer_host/input/motion_event_android.cc
diff --git a/content/browser/renderer_host/input/motion_event_android.cc b/content/browser/renderer_host/input/motion_event_android.cc
index 7494d908fc1f3f39e59cc5b18f2265e8c79b9ec9..326b59f9bc834b84bc0d53a95071e5812df0dcb5 100644
--- a/content/browser/renderer_host/input/motion_event_android.cc
+++ b/content/browser/renderer_host/input/motion_event_android.cc
@@ -78,22 +78,17 @@ MotionEventAndroid::MotionEventAndroid(JNIEnv* env, jobject event, bool recycle)
   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() {
@@ -141,6 +136,12 @@ float MotionEventAndroid::GetTouchMajor(size_t pointer_index) const {
       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_;
 }
@@ -175,7 +176,7 @@ float MotionEventAndroid::GetHistoricalY(size_t pointer_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 {
@@ -189,11 +190,6 @@ scoped_ptr<ui::MotionEvent> MotionEventAndroid::Cancel() const {
       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);