VR: Fix click during scrolling

chrome/browser/android/vr_shell/vr_controller.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_controller.h"
 
 #include <cmath>
 
 #include "base/logging.h"
 #include "base/time/time.h"
@@ skipping 184 matching lines @@
   }
   UpdateTouchInfo();
   UpdateGestureFromTouchInfo(gesture.get());
 
   if (gesture->type == WebInputEvent::Undefined &&
       IsButtonDown(gvr::kControllerButtonClick)) {
     gesture->type = WebInputEvent::GestureTapDown;
     gesture->data.tapDown.width = 0;
     gesture->data.tapDown.height = 0;
   }
+
+  if (state_ == SCROLLING && IsButtonDown(gvr::kControllerButtonClick))

[mthiesse, 2016/11/28 16:06:57]

nit: extract "state_ == SCROLLING && IsButtonDown(gvr::kControllerButtonClick)"
out to bool to avoid duplication.

[bshe, 2016/11/28 16:33:57]

can this logic move to HandleScrollingState ? It probably makes more sense in
that function.

[asimjour1, 2016/11/28 21:38:04]

Done.

[asimjour1, 2016/11/28 21:38:04]

This part is moved and there is no duplication anymore.

+    gesture->type = WebInputEvent::GestureScrollEnd;
+
   gesture->sourceDevice = blink::WebGestureDeviceTouchpad;
   gesture_list.push_back(std::move(gesture));
 
-  if (gesture_list.back()->type == WebInputEvent::GestureScrollEnd) {
+  if (state_ == SCROLLING && IsButtonDown(gvr::kControllerButtonClick)) {
+    std::unique_ptr<WebGestureEvent> tap_down(new WebGestureEvent());
+    tap_down->type = WebInputEvent::GestureTapDown;
+    tap_down->timeStampSeconds = gesture_list.back()->timeStampSeconds;
+    tap_down->sourceDevice = blink::WebGestureDeviceTouchpad;
+    tap_down->data.tapDown.width = 0;
+    tap_down->data.tapDown.height = 0;
+    gesture_list.push_back(std::move(tap_down));
+    Reset();
+  } else if (gesture_list.back()->type == WebInputEvent::GestureScrollEnd) {
     std::unique_ptr<WebGestureEvent> fling(new WebGestureEvent());
     fling->timeStampSeconds = gesture_list.back()->timeStampSeconds;
     fling->sourceDevice = blink::WebGestureDeviceTouchpad;
     fling->type = WebInputEvent::GestureFlingStart;
     if (IsHorizontalGesture()) {
       fling->data.flingStart.velocityX =
           overall_velocity_.x * kDisplacementScaleFactor;
     } else {
       fling->data.flingStart.velocityY =
           overall_velocity_.y * kDisplacementScaleFactor;
@@ skipping 42 matching lines @@
   }
 }
 
 void VrController::HandleDetectingState(WebGestureEvent* gesture) {
   // User lifts up finger from touch pad.
   if (touch_info_->touch_up || !(touch_info_->is_touching)) {
     Reset();
     return;
   }
 
   // Touch position is changed and the touch point moves outside of slop.

[bshe, 2016/11/28 16:33:57]

update the comment here to include buttondown detection here.

[asimjour1, 2016/11/28 21:38:04]

Done.

   if (UpdateCurrentTouchpoint() && touch_info_->is_touching &&
-      !InSlop(touch_info_->touch_point.position)) {
+      !InSlop(touch_info_->touch_point.position) &&
+      !IsButtonDown(gvr::kControllerButtonClick)) {
     state_ = SCROLLING;
     gesture->type = WebInputEvent::GestureScrollBegin;
     UpdateGesture(gesture);
     gesture->data.scrollBegin.deltaXHint =
         displacement_.x * kDisplacementScaleFactor;
     gesture->data.scrollBegin.deltaYHint =
         displacement_.y * kDisplacementScaleFactor;
   }
 }
 
@@ skipping 77 matching lines @@
   gvr::Vec2f velocity = Vector::ScalarMult(displacement, 1 / duration);
 
   float weight = duration / (kRC + duration);
 
   overall_velocity_ =
       Vector::Add(Vector::ScalarMult(overall_velocity_, 1 - weight),
                   Vector::ScalarMult(velocity, weight));
 }
 
 }  // namespace vr_shell