| 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 f5c76e93937090ddd0f7540554915b8232ee61c9..1491f742ecb820122c112f9b20d589de03d21533 100644
|
| --- a/chrome/browser/android/vr_shell/vr_shell.h
|
| +++ b/chrome/browser/android/vr_shell/vr_shell.h
|
| @@ -88,13 +88,18 @@ class VrShell : public device::GvrDelegate {
|
| private:
|
| virtual ~VrShell();
|
| void LoadUIContent();
|
| + bool IsUiTextureReady();
|
| + Rectf MakeUiPixelCopyRect(Recti pixel_rect);
|
| void DrawVrShell(int64_t time);
|
| void DrawEye(const gvr::Mat4f& view_matrix,
|
| const gvr::BufferViewport& params);
|
| - void DrawContentRect();
|
| - void DrawWebVr();
|
| void DrawUI();
|
| void DrawCursor();
|
| + void DrawWebVr();
|
| + void DrawWebVrOverlay(int64_t present_time_nanos);
|
| + void DrawWebVrEye(const gvr::Mat4f& view_matrix,
|
| + const gvr::BufferViewport& params,
|
| + int64_t present_time_nanos);
|
|
|
| void UpdateController();
|
|
|
| @@ -141,7 +146,8 @@ class VrShell : public device::GvrDelegate {
|
| int ui_tex_height_ = 0;
|
|
|
| bool webvr_mode_ = false;
|
| - bool webvr_secure_origin_;
|
| + bool webvr_secure_origin_ = false;
|
| + int64_t webvr_warning_end_nanos_ = 0;
|
|
|
| base::WeakPtrFactory<VrShell> weak_ptr_factory_;
|
|
|
|
|