VR: Fix cursor draw order.

chrome/browser/android/vr_shell/vr_shell_gl.h

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_ANDROID_VR_SHELL_VR_SHELL_GL_H_
 #define CHROME_BROWSER_ANDROID_VR_SHELL_VR_SHELL_GL_H_
 
 #include <memory>
 #include <queue>
 #include <utility>
@@ skipping 102 matching lines @@
   void InitializeRenderer();
   void DrawFrame(int16_t frame_index);
   void DrawWorldElements(const vr::Mat4f& head_pose);
   void DrawHeadLockedElements();
   void DrawUiView(const vr::Mat4f& head_pose,
                   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 UiElement*>& elements);
+                    const std::vector<const UiElement*>& elements,
+                    bool draw_cursor);
+  void DrawElement(const vr::Mat4f& view_proj_matrix, const UiElement& element);
   std::vector<const UiElement*> GetElementsInDrawOrder(
       const vr::Mat4f& view_matrix,
       const std::vector<const UiElement*>& elements);
-  void DrawCursor(const vr::Mat4f& render_matrix);
+  void DrawReticle(const vr::Mat4f& view_proj_matrix);
+  void DrawLaser(const vr::Mat4f& view_proj_matrix);
   void DrawController(const vr::Mat4f& view_proj_matrix);
   bool ShouldDrawWebVr();
   void DrawWebVr();
   bool WebVrPoseByteIsValid(int pose_index_byte);
 
   void UpdateController(const gfx::Vector3dF& head_direction);
   void HandleWebVrCompatibilityClick();
   void SendFlingCancel(GestureList& gesture_list);
   void SendScrollEnd(GestureList& gesture_list);
   bool SendScrollBegin(UiElement* target, GestureList& gesture_list);
@@ skipping 73 matching lines @@
 
   std::unique_ptr<VrShellRenderer> vr_shell_renderer_;
 
   bool touch_pending_ = false;
   vr::Quatf controller_quat_;
 
   gfx::Point3F target_point_;
 
   // TODO(mthiesse): We need to handle elements being removed, and update this
   // state appropriately.
-  UiElement* cursor_render_target_ = nullptr;
+  UiElement* reticle_render_target_ = nullptr;
   UiElement* hover_target_ = nullptr;
   // TODO(mthiesse): We shouldn't have a fling target. Elements should fling
   // independently and we should only cancel flings on the relevant element
   // when we do cancel flings.
   UiElement* fling_target_ = nullptr;
   UiElement* input_locked_element_ = nullptr;
   bool in_scroll_ = false;
   bool in_click_ = false;
 
   int content_tex_css_width_ = 0;
@@ skipping 36 matching lines @@
   gfx::Point3F pointer_start_;
 
   base::WeakPtrFactory<VrShellGl> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(VrShellGl);
 };
 
 }  // namespace vr_shell
 
 #endif  // CHROME_BROWSER_ANDROID_VR_SHELL_VR_SHELL_GL_H_