Refactor VR Shell Input. Locks input to click/scroll targets.

chrome/browser/android/vr_shell/vr_controller.h

 // 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.
 
 #ifndef CHROME_BROWSER_ANDROID_VR_SHELL_VR_CONTROLLER_H_
 #define CHROME_BROWSER_ANDROID_VR_SHELL_VR_CONTROLLER_H_
 
 #include <memory>
 #include <vector>
 
 #include "base/macros.h"
 #include "chrome/browser/android/vr_shell/vr_controller_model.h"
 #include "device/vr/android/gvr/gvr_gamepad_data_provider.h"
 #include "device/vr/vr_types.h"
-#include "third_party/WebKit/public/platform/WebGestureEvent.h"
-#include "third_party/WebKit/public/platform/WebInputEvent.h"
 #include "third_party/gvr-android-sdk/src/libraries/headers/vr/gvr/capi/include/gvr_types.h"
 
-using blink::WebGestureEvent;
-using blink::WebInputEvent;
+namespace blink {
+class WebGestureEvent;
+}
 
 namespace gvr {
 class ControllerState;
 }
 
 namespace vr_shell {
 
 class ElbowModel;
 
 // Angle (radians) the beam down from the controller axis, for wrist comfort.
 constexpr float kErgoAngleOffset = 0.26f;
 
+using GestureList = std::vector<std::unique_ptr<blink::WebGestureEvent>>;
+
 class VrController {
  public:
   // Controller API entry point.
   explicit VrController(gvr_context* gvr_context);
   ~VrController();
 
   // Must be called when the Activity gets OnResume().
   void OnResume();
 
   // Must be called when the Activity gets OnPause().
   void OnPause();
 
   device::GvrGamepadData GetGamepadData();
 
   // Must be called when the GL renderer gets OnDrawFrame().
   void UpdateState(const gfx::Vector3dF& head_direction);
 
-  std::vector<std::unique_ptr<WebGestureEvent>> DetectGestures();
+  std::unique_ptr<GestureList> DetectGestures();
 
   bool IsTouching();
 
   float TouchPosX();
 
   float TouchPosY();
 
   vr::Quatf Orientation() const;
   void GetTransform(vr::Mat4f* out) const;
   float GetOpacity() const;
@@ skipping 31 matching lines @@
   };
 
   struct ButtonInfo {
     gvr::ControllerButton button;
     bool button_up;
     bool button_down;
     bool button_state;
     int64_t timestamp;
   };
 
-  void UpdateGestureFromTouchInfo(WebGestureEvent* gesture);
+  void UpdateGestureFromTouchInfo(blink::WebGestureEvent* gesture);
 
   bool GetButtonLongPressFromButtonInfo();
 
   // Handle the waiting state.
-  void HandleWaitingState(WebGestureEvent* gesture);
+  void HandleWaitingState(blink::WebGestureEvent* gesture);
 
   // Handle the detecting state.
-  void HandleDetectingState(WebGestureEvent* gesture);
+  void HandleDetectingState(blink::WebGestureEvent* gesture);
 
   // Handle the scrolling state.
-  void HandleScrollingState(WebGestureEvent* gesture);
+  void HandleScrollingState(blink::WebGestureEvent* gesture);
   void UpdateTouchInfo();
 
   // Returns true if the touch position is within the slop of the initial touch
   // point, false otherwise.
   bool InSlop(const gfx::Vector2dF touch_position);
 
   // Returns true if the gesture is in horizontal direction.
   bool IsHorizontalGesture();
 
   void Reset();
@@ skipping 52 matching lines @@
   int extrapolated_touch_ = 0;
 
   std::unique_ptr<ElbowModel> elbow_model_;
 
   DISALLOW_COPY_AND_ASSIGN(VrController);
 };
 
 }  // namespace vr_shell
 
 #endif  // CHROME_BROWSER_ANDROID_VR_SHELL_VR_CONTROLLER_H_