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 012a384b2760ee98ac3c0bf8ce8b680244e4c621..0697568a4c1d54814bce7140b3435277912ab7e1 100644 |
--- a/chrome/browser/android/vr_shell/vr_shell.h |
+++ b/chrome/browser/android/vr_shell/vr_shell.h |
@@ -94,13 +94,18 @@ class VrShell : public device::GvrDelegate { |
private: |
virtual ~VrShell(); |
void LoadUIContent(); |
+ bool IsUiTextureReady(); |
+ Rectf MakeUiGlCopyRect(Recti pixel_rect); |
void DrawVrShell(); |
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(); |
@@ -152,7 +157,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_; |