VR: Fix click during scrolling

chrome/browser/android/vr_shell/vr_shell.cc

 // Copyright 2016 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 "chrome/browser/android/vr_shell/vr_shell.h"
 
 #include "base/metrics/histogram_macros.h"
 #include "chrome/browser/android/vr_shell/ui_elements.h"
 #include "chrome/browser/android/vr_shell/ui_interface.h"
 #include "chrome/browser/android/vr_shell/ui_scene.h"
@@ skipping 483 matching lines @@
   // TODO(asimjour) for now, scroll is sent to the main content.
   if (gesture->type == WebInputEvent::GestureScrollBegin ||
       gesture->type == WebInputEvent::GestureScrollUpdate ||
       gesture->type == WebInputEvent::GestureScrollEnd ||
       gesture->type == WebInputEvent::GestureFlingCancel) {
     content_input_manager_->ProcessUpdatedGesture(*gesture.get());
   }
 
   if (gesture->type == WebInputEvent::GestureScrollEnd) {
     CHECK(gesture_list.size() == 2);
-    std::unique_ptr<WebGestureEvent> fling_gesture =
+    std::unique_ptr<WebGestureEvent> followup_gesture =
         std::move(gesture_list.back());
-    content_input_manager_->ProcessUpdatedGesture(*fling_gesture.get());
+    if (followup_gesture->type == WebInputEvent::GestureTapDown) {
+      followup_gesture->data.tapDown.width = pixel_x;
+      followup_gesture->data.tapDown.height = pixel_y;
+      if (input_target != nullptr)
+        input_target->ProcessUpdatedGesture(*followup_gesture.get());
+    } else if (followup_gesture->type == WebInputEvent::GestureFlingStart) {
+      content_input_manager_->ProcessUpdatedGesture(*followup_gesture.get());
+    }
   }
 
   WebInputEvent::Type original_type = gesture->type;
 
   bool new_target = input_target != current_input_target_;
   if (new_target && current_input_target_ != nullptr) {
     // Send a move event indicating that the pointer moved off of an element.
     blink::WebMouseEvent mouse_event = MakeMouseEvent(
         WebInputEvent::MouseLeave, gesture->timeStampSeconds, 0, 0);
     current_input_target_->ProcessUpdatedGesture(mouse_event);
@@ skipping 530 matching lines @@
            const JavaParamRef<jobject>& ui_web_contents,
            jlong ui_window_android) {
   return reinterpret_cast<intptr_t>(new VrShell(
       env, obj, content::WebContents::FromJavaWebContents(content_web_contents),
       reinterpret_cast<ui::WindowAndroid*>(content_window_android),
       content::WebContents::FromJavaWebContents(ui_web_contents),
       reinterpret_cast<ui::WindowAndroid*>(ui_window_android)));
 }
 
 }  // namespace vr_shell