Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(343)

Unified Diff: chrome/browser/android/vr_shell/vr_shell.h

Issue 2436863002: Use the HTML UI to render WebVR warnings (Closed)
Patch Set: Fix whitespace. Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/android/vr_shell/vr_shell.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 b375403914b447e84de0f1a2d9a596e93c9c7d2d..9cdd10b04b2b325640f0367fb32c5406a688e7e3 100644
--- a/chrome/browser/android/vr_shell/vr_shell.h
+++ b/chrome/browser/android/vr_shell/vr_shell.h
@@ -114,23 +114,13 @@ class VrShell : public device::GvrDelegate {
private:
virtual ~VrShell();
void LoadUIContent();
- bool IsUiTextureReady();
- // Converts a pixel rectangle to (0..1) float texture coordinates.
- // Callers need to ensure that the texture width/height is
- // initialized by checking IsUiTextureReady() first.
- Rectf MakeUiGlCopyRect(Recti pixel_rect);
- void DrawVrShell(const gvr::Mat4f& head_pose);
- void DrawEye(gvr::Eye eye,
- const gvr::Mat4f& head_pose,
- const gvr::BufferViewport& params);
- void DrawUI(const gvr::Mat4f& world_matrix,
- const gvr::Mat4f& fov_matrix);
+ void DrawVrShell(const gvr::Mat4f& head_pose, gvr::Frame &frame);
+ void DrawUiView(const gvr::Mat4f* head_pose,
+ const std::vector<const ContentRectangle*>& elements);
+ void DrawElements(const gvr::Mat4f& render_matrix,
+ const std::vector<const ContentRectangle*>& elements);
void DrawCursor(const gvr::Mat4f& render_matrix);
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(const gvr::Vec3f& forward_vector);
@@ -179,8 +169,7 @@ class VrShell : public device::GvrDelegate {
bool dom_contents_loaded_ = false;
bool webvr_mode_ = false;
- bool webvr_secure_origin_ = false;
- int64_t webvr_warning_end_nanos_ = 0;
+
// The pose ring buffer size must be a power of two to avoid glitches when
// the pose index wraps around. It should be large enough to handle the
// current backlog of poses which is 2-3 frames.
« no previous file with comments | « no previous file | chrome/browser/android/vr_shell/vr_shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698