| Index: chrome/browser/android/vr_shell/vr_shell.h
|
| diff --git a/chrome/browser/android/vr_shell/vr_shell.h b/chrome/browser/android/vr_shell/vr_shell.h
|
| index 2d6e5298f1b282463fe6fad2b638bae0b51cf645..8648aa6ae548ef53d74dfc095e87bc5fdeb8734c 100644
|
| --- a/chrome/browser/android/vr_shell/vr_shell.h
|
| +++ b/chrome/browser/android/vr_shell/vr_shell.h
|
| @@ -32,6 +32,10 @@ namespace content {
|
| class WebContents;
|
| }
|
|
|
| +namespace gpu {
|
| +struct MailboxHolder;
|
| +}
|
| +
|
| namespace ui {
|
| class WindowAndroid;
|
| }
|
| @@ -171,9 +175,10 @@ class VrShell : public device::GvrDelegate, content::WebContentsObserver {
|
|
|
| // TODO(mthiesse): Find a better place for these functions to live.
|
| static device::mojom::VRPosePtr VRPosePtrFromGvrPose(gvr::Mat4f head_mat);
|
| + static gvr::Sizei GetRecommendedWebVrSize(gvr::GvrApi* gvr_api);
|
| static device::mojom::VRDisplayInfoPtr CreateVRDisplayInfo(
|
| gvr::GvrApi* gvr_api,
|
| - gvr::Sizei compositor_size,
|
| + gvr::Sizei recommended_size,
|
| uint32_t device_id);
|
|
|
| private:
|
| @@ -190,10 +195,12 @@ class VrShell : public device::GvrDelegate, content::WebContentsObserver {
|
|
|
| // device::GvrDelegate implementation
|
| void SetWebVRSecureOrigin(bool secure_origin) override;
|
| - void SubmitWebVRFrame() override;
|
| + void SubmitWebVRFrame(int16_t frame_index,
|
| + const gpu::MailboxHolder& mailbox) override;
|
| void UpdateWebVRTextureBounds(int16_t frame_index,
|
| const gvr::Rectf& left_bounds,
|
| - const gvr::Rectf& right_bounds) override;
|
| + const gvr::Rectf& right_bounds,
|
| + const gvr::Sizei& source_size) override;
|
| void OnVRVsyncProviderRequest(
|
| device::mojom::VRVSyncProviderRequest request) override;
|
| void UpdateVSyncInterval(int64_t timebase_nanos,
|
|
|