| Index: chrome/browser/android/vr_shell/vr_shell_gl.h
|
| diff --git a/chrome/browser/android/vr_shell/vr_shell_gl.h b/chrome/browser/android/vr_shell/vr_shell_gl.h
|
| index 6c2940428d2ff707a274fe6a5f212a6d69ddf060..1f82f88c4c292b42f0b2f7586a3c4d30cf0b0116 100644
|
| --- a/chrome/browser/android/vr_shell/vr_shell_gl.h
|
| +++ b/chrome/browser/android/vr_shell/vr_shell_gl.h
|
| @@ -53,16 +53,15 @@ class VrShellGl : public device::mojom::VRVSyncProvider {
|
| enum class InputTarget {
|
| NONE = 0,
|
| CONTENT,
|
| - UI
|
| + UI,
|
| };
|
|
|
| - VrShellGl(
|
| - const base::WeakPtr<VrShell>& weak_vr_shell,
|
| - const base::WeakPtr<VrShellDelegate>& delegate_provider,
|
| - scoped_refptr<base::SingleThreadTaskRunner> main_thread_task_runner,
|
| - gvr_context* gvr_api,
|
| - bool initially_web_vr,
|
| - bool reprojected_rendering);
|
| + VrShellGl(const base::WeakPtr<VrShell>& weak_vr_shell,
|
| + const base::WeakPtr<VrShellDelegate>& delegate_provider,
|
| + scoped_refptr<base::SingleThreadTaskRunner> main_thread_task_runner,
|
| + gvr_context* gvr_api,
|
| + bool initially_web_vr,
|
| + bool reprojected_rendering);
|
| ~VrShellGl() override;
|
|
|
| void Initialize();
|
| @@ -100,10 +99,11 @@ class VrShellGl : public device::mojom::VRVSyncProvider {
|
| void GvrInit(gvr_context* gvr_api);
|
| void InitializeRenderer();
|
| void DrawFrame();
|
| - void DrawVrShell(const gvr::Mat4f& head_pose, gvr::Frame &frame);
|
| + void DrawVrShell(const gvr::Mat4f& head_pose, gvr::Frame& frame);
|
| void DrawUiView(const gvr::Mat4f* head_pose,
|
| const std::vector<const ContentRectangle*>& elements,
|
| - const gvr::Sizei& render_size, int viewport_offset);
|
| + const gvr::Sizei& render_size,
|
| + int viewport_offset);
|
| void DrawElements(const gvr::Mat4f& view_proj_matrix,
|
| const gvr::Mat4f& view_matrix,
|
| const std::vector<const ContentRectangle*>& elements);
|
| @@ -115,8 +115,7 @@ class VrShellGl : public device::mojom::VRVSyncProvider {
|
| bool WebVrPoseByteIsValid(int pose_index_byte);
|
|
|
| void UpdateController(const gvr::Vec3f& forward_vector);
|
| - void SendEventsToTarget(InputTarget input_target, int pixel_x,
|
| - int pixel_y);
|
| + void SendEventsToTarget(InputTarget input_target, int pixel_x, int pixel_y);
|
| void SendGesture(InputTarget input_target,
|
| std::unique_ptr<blink::WebInputEvent> event);
|
| void CreateUiSurface();
|
|
|