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

content/browser/android/content_view_core_impl.cc

 // Copyright 2012 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/android/content_view_core_impl.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
 #include "base/android/scoped_java_ref.h"
 #include "base/command_line.h"
 #include "base/json/json_writer.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "cc/layers/layer.h"
 #include "cc/output/begin_frame_args.h"
 #include "content/browser/android/gesture_event_type.h"
 #include "content/browser/android/interstitial_page_delegate_android.h"
 #include "content/browser/android/load_url_params.h"
 #include "content/browser/frame_host/interstitial_page_impl.h"
 #include "content/browser/frame_host/navigation_controller_impl.h"
 #include "content/browser/frame_host/navigation_entry_impl.h"
 #include "content/browser/media/android/browser_media_player_manager.h"
 #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"
 #include "content/browser/renderer_host/render_widget_host_impl.h"
 #include "content/browser/renderer_host/render_widget_host_view_android.h"
 #include "content/browser/screen_orientation/screen_orientation_dispatcher_host.h"
 #include "content/browser/ssl/ssl_host_state.h"
 #include "content/browser/web_contents/web_contents_view_android.h"
 #include "content/common/input/web_input_event_traits.h"
 #include "content/common/input_messages.h"
@@ skipping 948 matching lines @@
 
 void ContentViewCoreImpl::SendOrientationChangeEvent(JNIEnv* env,
                                                      jobject obj,
                                                      jint orientation) {
   if (device_orientation_ != orientation) {
     device_orientation_ = orientation;
     SendOrientationChangeEventInternal();
   }
 }
 
+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) {
   RenderWidgetHostViewAndroid* rwhv = GetRenderWidgetHostViewAndroid();
   if (!rwhv)
     return false;
 
   MotionEventAndroid event(env, motion_event, false);
 
   if (!gesture_provider_.OnTouchEvent(event))
     return false;
 
-  rwhv->SendTouchEvent(WebTouchEventBuilder::Build(event, GetDpiScale()));
+  rwhv->SendTouchEvent(WebTouchEventBuilder::Build(event, 1.f / GetDpiScale()));
   return true;
 }
 
 float ContentViewCoreImpl::GetDpiScale() const {
   return dpi_scale_;
 }
 
 jboolean ContentViewCoreImpl::SendMouseMoveEvent(JNIEnv* env,
                                                  jobject obj,
                                                  jlong time_ms,
@@ skipping 160 matching lines @@
     GetRenderWidgetHostViewAndroid()->MoveCaret(
         gfx::Point(x / GetDpiScale(), y / GetDpiScale()));
   }
 }
 
 void ContentViewCoreImpl::ResetGestureDetectors(JNIEnv* env, jobject obj) {
   gesture_provider_.ResetGestureDetectors();
 }
 
 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,
                                                             jobject obj,
                                                             jboolean enabled) {
   gesture_provider_.SetDoubleTapSupportForPageEnabled(enabled);
 }
 
 void ContentViewCoreImpl::SetDoubleTapSupportEnabled(JNIEnv* env,
                                                      jobject obj,
@@ skipping 507 matching lines @@
       reinterpret_cast<ui::ViewAndroid*>(view_android),
       reinterpret_cast<ui::WindowAndroid*>(window_android));
   return reinterpret_cast<intptr_t>(view);
 }
 
 bool RegisterContentViewCore(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace content