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

content/browser/android/content_view_core_impl.cc

Index: content/browser/android/content_view_core_impl.cc
diff --git a/content/browser/android/content_view_core_impl.cc b/content/browser/android/content_view_core_impl.cc
index 3452b26e4bb65034c8d8ec8b13b33e09dc7dce50..8e1e157141ca65c3e89d04c95e167cc2460abbdb 100644
--- a/content/browser/android/content_view_core_impl.cc
+++ b/content/browser/android/content_view_core_impl.cc
@@ -26,6 +26,7 @@
 #include "content/browser/renderer_host/compositor_impl_android.h"
 #include "content/browser/renderer_host/input/motion_event_android.h"
 #include "content/browser/renderer_host/input/web_input_event_builders_android.h"
+#include "content/browser/renderer_host/input/web_input_event_util.h"
 #include "content/browser/renderer_host/java/java_bound_object.h"
 #include "content/browser/renderer_host/java/java_bridge_dispatcher_host_manager.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
@@ -994,6 +995,25 @@ void ContentViewCoreImpl::SendOrientationChangeEvent(JNIEnv* env,
   }
 }
 
+void ContentViewCoreImpl::CancelActiveTouchSequenceIfNecessary() {
+  RenderWidgetHostViewAndroid* rwhv = GetRenderWidgetHostViewAndroid();
+  if (!rwhv)

[tdresser, 2014/03/04 16:19:34]

Is this check just for testing? Add a comment indicating when this would be the
case.

[jdduke (slow), 2014/03/04 19:07:03]

Done.

+    return;
+
+  const ui::MotionEvent* current_down_event =

[tdresser, 2014/03/04 16:19:34]

Maybe add a comment indicating why you can't just use
GestureProvider::CancelActiveTouchSequence here.

[jdduke (slow), 2014/03/04 19:07:03]

I went ahead and removed that method, as it really shouldn't be used.

+      gesture_provider_.GetCurrentDownEvent();
+  if (!current_down_event)
+    return;
+
+  scoped_ptr<ui::MotionEvent> cancel_event = current_down_event->Cancel();
+  DCHECK(cancel_event);
+  if (!gesture_provider_.OnTouchEvent(*cancel_event))
+    return;
+
+  rwhv->SendTouchEvent(
+      CreateWebTouchEventFromMotionEvent(*cancel_event, 1.f / GetDpiScale()));
+}
+
 jboolean ContentViewCoreImpl::OnTouchEvent(JNIEnv* env,
                                            jobject obj,
                                            jobject motion_event) {
@@ -1006,7 +1026,7 @@ jboolean ContentViewCoreImpl::OnTouchEvent(JNIEnv* env,
   if (!gesture_provider_.OnTouchEvent(event))
     return false;
 
-  rwhv->SendTouchEvent(WebTouchEventBuilder::Build(event, GetDpiScale()));
+  rwhv->SendTouchEvent(WebTouchEventBuilder::Build(event, 1.f / GetDpiScale()));
   return true;
 }
 
@@ -1187,11 +1207,11 @@ void ContentViewCoreImpl::ResetGestureDetectors(JNIEnv* env, jobject obj) {
 }
 
 void ContentViewCoreImpl::IgnoreRemainingTouchEvents(JNIEnv* env, jobject obj) {
-  gesture_provider_.CancelActiveTouchSequence();
+  CancelActiveTouchSequenceIfNecessary();
 }
 
 void ContentViewCoreImpl::OnWindowFocusLost(JNIEnv* env, jobject obj) {
-  gesture_provider_.CancelActiveTouchSequence();
+  CancelActiveTouchSequenceIfNecessary();
 }
 
 void ContentViewCoreImpl::SetDoubleTapSupportForPageEnabled(JNIEnv* env,