WebVR: Use content CVC size for compositor rendering

chrome/browser/android/vr_shell/vr_shell.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_H_
 #define CHROME_BROWSER_ANDROID_VR_SHELL_VR_SHELL_H_
 
 #include <jni.h>
 
 #include <memory>
@@ skipping 78 matching lines @@
   UiInterface* GetUiInterface();
   void OnDomContentsLoaded();
 
   // device::GvrDelegate implementation
   void SetWebVRSecureOrigin(bool secure_origin) override;
   void SubmitWebVRFrame() override;
   void UpdateWebVRTextureBounds(const gvr::Rectf& left_bounds,
                                 const gvr::Rectf& right_bounds) override;
   gvr::GvrApi* gvr_api() override;
   void SetGvrPoseForWebVr(const gvr::Mat4f& pose, uint32_t pose_num) override;
+  void SetWebVRRenderSurfaceSize(int width, int height) override;
+  gvr::Sizei GetWebVRCompositorSurfaceSize() override;
 
   void ContentSurfaceChanged(
       JNIEnv* env,
       const base::android::JavaParamRef<jobject>& object,
       jint width,
       jint height,
       const base::android::JavaParamRef<jobject>& surface);
   void UiSurfaceChanged(
       JNIEnv* env,
       const base::android::JavaParamRef<jobject>& object,
       jint width,
       jint height,
       const base::android::JavaParamRef<jobject>& surface);
 
   // Called from non-render thread to queue a callback onto the render thread.
   // The render thread checks for callbacks and processes them between frames.
   void QueueTask(base::Callback<void()>& callback);
 
   // Perform a UI action triggered by the javascript API.
   void DoUiAction(const UiAction action);
 
  private:
   ~VrShell() override;
   void LoadUIContent();
   void DrawVrShell(const gvr::Mat4f& head_pose, gvr::Frame &frame);
   void DrawUiView(const gvr::Mat4f* head_pose,
-                  const std::vector<const ContentRectangle*>& elements);
+                  const std::vector<const ContentRectangle*>& elements,
+                  const gvr::Sizei& render_size, int viewport_offset);
   void DrawElements(const gvr::Mat4f& render_matrix,
                     const std::vector<const ContentRectangle*>& elements);
   void DrawCursor(const gvr::Mat4f& render_matrix);
   void DrawWebVr();
 
   void UpdateController(const gvr::Vec3f& forward_vector);
   void SendEventsToTarget(VrInputManager* input_target,
                           int pixel_x,
                           int pixel_y);
 
@@ skipping 13 matching lines @@
 
   std::unique_ptr<gvr::GvrApi> gvr_api_;
   std::unique_ptr<gvr::BufferViewportList> buffer_viewport_list_;
   std::unique_ptr<gvr::BufferViewport> buffer_viewport_;
   std::unique_ptr<gvr::BufferViewport> headlocked_left_viewport_;
   std::unique_ptr<gvr::BufferViewport> headlocked_right_viewport_;
   std::unique_ptr<gvr::BufferViewport> webvr_left_viewport_;
   std::unique_ptr<gvr::BufferViewport> webvr_right_viewport_;
   std::unique_ptr<gvr::SwapChain> swap_chain_;
 
-  gvr::Sizei render_size_;
+  gvr::Sizei render_size_primary_;
+  gvr::Sizei render_size_headlocked_;
 
   std::queue<base::Callback<void()>> task_queue_;
   base::Lock task_queue_lock_;
   base::Lock gvr_init_lock_;
 
   std::unique_ptr<VrCompositor> content_compositor_;
   content::WebContents* main_contents_;
   std::unique_ptr<VrCompositor> ui_compositor_;
   content::WebContents* ui_contents_;
   std::unique_ptr<VrWebContentsObserver> vr_web_contents_observer_;
 
   VrShellDelegate* delegate_ = nullptr;
   std::unique_ptr<VrShellRenderer> vr_shell_renderer_;
   base::android::ScopedJavaGlobalRef<jobject> j_vr_shell_;
 
   bool touch_pending_ = false;
   gvr::Quatf controller_quat_;
 
   gvr::Vec3f target_point_;
   const ContentRectangle* target_element_ = nullptr;
   VrInputManager* current_input_target_ = nullptr;
   int ui_tex_width_ = 0;
   int ui_tex_height_ = 0;
   int content_tex_width_ = 0;
   int content_tex_height_ = 0;
 
   bool webvr_mode_ = false;
+  bool webvr_needs_ui_ = false;

[mthiesse, 2016/11/16 21:30:41]

Seems unused, remove?

 
   // 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.
   static constexpr int kPoseRingBufferSize = 8;
   std::vector<gvr::Mat4f> webvr_head_pose_;
+  jint webvr_texture_id_ = 0;
+  int webvr_width_ = 2048;

[mthiesse, 2016/11/16 21:30:41]

magic numbers to constants somewhere? Also why these exact values?

+  int webvr_height_ = 1200;
 
   std::unique_ptr<VrController> controller_;
   scoped_refptr<VrInputManager> content_input_manager_;
   scoped_refptr<VrInputManager> ui_input_manager_;
 
   scoped_refptr<base::SingleThreadTaskRunner> main_thread_task_runner_;
 
   base::WeakPtrFactory<VrShell> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(VrShell);
 };
 
 bool RegisterVrShell(JNIEnv* env);
 
 }  // namespace vr_shell
 
 #endif  // CHROME_BROWSER_ANDROID_VR_SHELL_VR_SHELL_H_