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

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

Issue 2807293002: VR: Rename ContentRectangle to UiElement (Closed)
Patch Set: Rebase onto Michael's landed GVR types CL. Created 3 years, 8 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
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 97dbddf8c1f6ab5be762a486c2a0b7f2eab76d91..eefc59ec2ce541b63da1a97d474a32e90fd0c82f 100644
--- a/chrome/browser/android/vr_shell/vr_shell_gl.h
+++ b/chrome/browser/android/vr_shell/vr_shell_gl.h
@@ -49,7 +49,7 @@ class UiScene;
class VrController;
class VrShell;
class VrShellRenderer;
-struct ContentRectangle;
+struct UiElement;
struct WebVrBounds {
WebVrBounds(const gfx::RectF& left,
@@ -120,15 +120,15 @@ class VrShellGl : public device::mojom::VRVSyncProvider {
void DrawWorldElements(const vr::Mat4f& head_pose);
void DrawHeadLockedElements();
void DrawUiView(const vr::Mat4f& head_pose,
- const std::vector<const ContentRectangle*>& elements,
+ const std::vector<const UiElement*>& elements,
const gfx::Size& render_size,
int viewport_offset,
bool draw_cursor);
void DrawElements(const vr::Mat4f& view_proj_matrix,
- const std::vector<const ContentRectangle*>& elements);
- std::vector<const ContentRectangle*> GetElementsInDrawOrder(
+ const std::vector<const UiElement*>& elements);
+ std::vector<const UiElement*> GetElementsInDrawOrder(
const vr::Mat4f& view_matrix,
- const std::vector<const ContentRectangle*>& elements);
+ const std::vector<const UiElement*>& elements);
void DrawCursor(const vr::Mat4f& render_matrix);
void DrawController(const vr::Mat4f& view_proj_matrix);
bool ShouldDrawWebVr();
@@ -202,7 +202,7 @@ class VrShellGl : public device::mojom::VRVSyncProvider {
vr::Quatf controller_quat_;
gfx::Point3F target_point_;
- const ContentRectangle* target_element_ = nullptr;
+ const UiElement* target_element_ = nullptr;
InputTarget current_input_target_ = InputTarget::NONE;
InputTarget current_scroll_target = InputTarget::NONE;
int ui_tex_css_width_ = 0;
« no previous file with comments | « chrome/browser/android/vr_shell/ui_scene_unittest.cc ('k') | chrome/browser/android/vr_shell/vr_shell_gl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698