Refactor VR math off of GVR types, onto gfx types where possible.

chrome/browser/android/vr_shell/vr_shell_gl.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_SHELL_GL_H_
 #define CHROME_BROWSER_ANDROID_VR_SHELL_VR_SHELL_GL_H_
 
 #include <memory>
 #include <queue>
 #include <utility>
 #include <vector>
 
 #include "base/cancelable_callback.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "base/single_thread_task_runner.h"
 #include "chrome/browser/android/vr_shell/vr_controller_model.h"
 #include "device/vr/vr_service.mojom.h"
+#include "device/vr/vr_types.h"
 #include "mojo/public/cpp/bindings/binding.h"
 #include "third_party/gvr-android-sdk/src/libraries/headers/vr/gvr/capi/include/gvr.h"
 #include "third_party/gvr-android-sdk/src/libraries/headers/vr/gvr/capi/include/gvr_types.h"
 #include "ui/gfx/native_widget_types.h"
 
 namespace base {
 class ListValue;
 }
 
 namespace blink {
@@ skipping 14 matching lines @@
 namespace vr_shell {
 
 class MailboxToSurfaceBridge;
 class UiScene;
 class VrController;
 class VrShell;
 class VrShellRenderer;
 struct ContentRectangle;
 
 struct WebVrBounds {
-  WebVrBounds(gvr::Rectf left, gvr::Rectf right, gvr::Sizei size)
+  WebVrBounds(const gfx::RectF& left,
+              const gfx::RectF& right,
+              const gfx::Size& size)
       : left_bounds(left), right_bounds(right), source_size(size) {}
-  gvr::Rectf left_bounds;
-  gvr::Rectf right_bounds;
-  gvr::Sizei source_size;
+  gfx::RectF left_bounds;
+  gfx::RectF right_bounds;
+  gfx::Size source_size;
 };
 
 // This class manages all GLThread owned objects and GL rendering for VrShell.
 // It is not threadsafe and must only be used on the GL thread.
 class VrShellGl : public device::mojom::VRVSyncProvider {
  public:
   enum class InputTarget {
     NONE = 0,
     CONTENT,
     UI,
   };
 
   VrShellGl(const base::WeakPtr<VrShell>& weak_vr_shell,
             scoped_refptr<base::SingleThreadTaskRunner> main_thread_task_runner,
             gvr_context* gvr_api,
             bool initially_web_vr,
             bool reprojected_rendering);
   ~VrShellGl() override;
 
   void Initialize();
   void InitializeGl(gfx::AcceleratedWidget window);
 
   void OnTriggerEvent();
   void OnPause();
   void OnResume();
 
   void SetWebVrMode(bool enabled);
-  void CreateOrResizeWebVRSurface(const gvr::Sizei& size);
+  void CreateOrResizeWebVRSurface(const gfx::Size& size);
   void CreateContentSurface();
   void ContentBoundsChanged(int width, int height);
   void ContentPhysicalBoundsChanged(int width, int height);
   void UIBoundsChanged(int width, int height);
   void UIPhysicalBoundsChanged(int width, int height);
   base::WeakPtr<VrShellGl> GetWeakPtr();
 
   void SetControllerModel(std::unique_ptr<VrControllerModel> model);
 
   void UpdateWebVRTextureBounds(int16_t frame_index,
-                                const gvr::Rectf& left_bounds,
-                                const gvr::Rectf& right_bounds,
-                                const gvr::Sizei& source_size);
+                                const gfx::RectF& left_bounds,
+                                const gfx::RectF& right_bounds,
+                                const gfx::Size& source_size);
 
   void UpdateScene(std::unique_ptr<base::ListValue> commands);
 
   void UpdateVSyncInterval(int64_t timebase_nanos, double interval_seconds);
 
   void OnRequest(device::mojom::VRVSyncProviderRequest request);
   void CreateVRDisplayInfo(
       const base::Callback<void(device::mojom::VRDisplayInfoPtr)>& callback,
       uint32_t device_id);
   void SubmitWebVRFrame(int16_t frame_index, const gpu::MailboxHolder& mailbox);
   void SetSubmitClient(
       device::mojom::VRSubmitFrameClientPtrInfo submit_client_info);
 
  private:
   void GvrInit(gvr_context* gvr_api);
   void InitializeRenderer();
   void DrawFrame(int16_t frame_index);
-  void DrawWorldElements(const gvr::Mat4f& head_pose);
+  void DrawWorldElements(const vr::Mat4f& head_pose);
   void DrawHeadLockedElements();
-  void DrawUiView(const gvr::Mat4f& head_pose,
+  void DrawUiView(const vr::Mat4f& head_pose,
                   const std::vector<const ContentRectangle*>& elements,
-                  const gvr::Sizei& render_size,
+                  const gfx::Size& render_size,
                   int viewport_offset,
                   bool draw_cursor);
-  void DrawElements(const gvr::Mat4f& view_proj_matrix,
+  void DrawElements(const vr::Mat4f& view_proj_matrix,
                     const std::vector<const ContentRectangle*>& elements);
   std::vector<const ContentRectangle*> GetElementsInDrawOrder(
-      const gvr::Mat4f& view_matrix,
+      const vr::Mat4f& view_matrix,
       const std::vector<const ContentRectangle*>& elements);
-  void DrawCursor(const gvr::Mat4f& render_matrix);
-  void DrawController(const gvr::Mat4f& view_proj_matrix);
+  void DrawCursor(const vr::Mat4f& render_matrix);
+  void DrawController(const vr::Mat4f& view_proj_matrix);
   bool ShouldDrawWebVr();
   void DrawWebVr();
   bool WebVrPoseByteIsValid(int pose_index_byte);
 
   void UpdateController();
-  void HandleControllerInput(const gvr::Vec3f& forward_vector);
+  void HandleControllerInput(const gfx::Vector3dF& forward_vector);
   void HandleControllerAppButtonActivity(
-      const gvr::Vec3f& controller_direction);
+      const gfx::Vector3dF& controller_direction);
   void SendEventsToTarget(InputTarget input_target, int pixel_x, int pixel_y);
   void SendGesture(InputTarget input_target,
                    std::unique_ptr<blink::WebInputEvent> event);
   void CreateUiSurface();
   void OnUIFrameAvailable();
   void OnContentFrameAvailable();
   void OnWebVRFrameAvailable();
   bool GetPixelEncodedFrameIndex(uint16_t* frame_index);
 
   void OnVSync();
@@ skipping 30 matching lines @@
   std::unique_ptr<gvr::BufferViewport> headlocked_right_viewport_;
   std::unique_ptr<gvr::BufferViewport> webvr_left_viewport_;
   std::unique_ptr<gvr::BufferViewport> webvr_right_viewport_;
   std::unique_ptr<gvr::SwapChain> swap_chain_;
   std::queue<std::pair<uint8_t, WebVrBounds>> pending_bounds_;
   int premature_received_frames_ = 0;
   std::queue<uint16_t> pending_frames_;
   std::unique_ptr<MailboxToSurfaceBridge> mailbox_bridge_;
 
   // Current sizes for the render buffers.
-  gvr::Sizei render_size_primary_;
-  gvr::Sizei render_size_headlocked_;
+  gfx::Size render_size_primary_;
+  gfx::Size render_size_headlocked_;
 
   // Intended render_size_primary_ for use by VrShell, so that it
   // can be restored after exiting WebVR mode.
-  gvr::Sizei render_size_vrshell_;
+  gfx::Size render_size_vrshell_;
 
   std::unique_ptr<VrShellRenderer> vr_shell_renderer_;
 
   bool touch_pending_ = false;
-  gvr::Quatf controller_quat_;
+  vr::Quatf controller_quat_;
 
-  gvr::Vec3f target_point_;
+  gfx::Point3F target_point_;
   const ContentRectangle* target_element_ = nullptr;
   InputTarget current_input_target_ = InputTarget::NONE;
   InputTarget current_scroll_target = InputTarget::NONE;
   int ui_tex_css_width_ = 0;
   int ui_tex_css_height_ = 0;
   int content_tex_css_width_ = 0;
   int content_tex_css_height_ = 0;
-  gvr::Sizei content_tex_physical_size_ = {0, 0};
-  gvr::Sizei webvr_surface_size_ = {0, 0};
-  gvr::Sizei ui_tex_physical_size_ = {0, 0};
+  gfx::Size content_tex_physical_size_ = {0, 0};
+  gfx::Size webvr_surface_size_ = {0, 0};
+  gfx::Size ui_tex_physical_size_ = {0, 0};
 
-  std::vector<gvr::Mat4f> webvr_head_pose_;
+  std::vector<vr::Mat4f> webvr_head_pose_;
   bool web_vr_mode_;
   bool ready_to_draw_ = false;
   bool surfaceless_rendering_;
 
   std::unique_ptr<VrController> controller_;
 
   scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
   base::CancelableClosure vsync_task_;
   base::TimeTicks vsync_timebase_;
   base::TimeDelta vsync_interval_;
 
   base::TimeDelta pending_time_;
   bool pending_vsync_ = false;
   GetVSyncCallback callback_;
   bool received_frame_ = false;
   mojo::Binding<device::mojom::VRVSyncProvider> binding_;
   device::mojom::VRSubmitFrameClientPtr submit_client_;
 
   base::WeakPtr<VrShell> weak_vr_shell_;
   scoped_refptr<base::SingleThreadTaskRunner> main_thread_task_runner_;
 
   uint8_t frame_index_ = 0;
   // Larger than frame_index_ so it can be initialized out-of-band.
   uint16_t last_frame_index_ = -1;
 
   // Attributes for gesture detection while holding app button.
-  gvr::Vec3f controller_start_direction_;
+  gfx::Vector3dF controller_start_direction_;
 
   base::WeakPtrFactory<VrShellGl> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(VrShellGl);
 };
 
 }  // namespace vr_shell
 
 #endif  // CHROME_BROWSER_ANDROID_VR_SHELL_VR_SHELL_GL_H_