Refactoring how WebVR eye bounds are handled

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 74 matching lines @@
   // html/js UI hooks.
   static base::WeakPtr<VrShell> GetWeakPtr(
       const content::WebContents* web_contents);
   UiScene* GetScene();
   UiInterface* GetUiInterface();
   void OnDomContentsLoaded();
 
   // device::GvrDelegate implementation
   void SetWebVRSecureOrigin(bool secure_origin) override;
   void SubmitWebVRFrame() override;
-  void UpdateWebVRTextureBounds(
-      int eye, float left, float top, float width, float height) 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 ContentSurfaceChanged(
       JNIEnv* env,
       const base::android::JavaParamRef<jobject>& object,
       jint width,
       jint height,
       const base::android::JavaParamRef<jobject>& surface);
   void UiSurfaceChanged(
@@ skipping 39 matching lines @@
   jint content_texture_id_ = 0;
 
   std::unique_ptr<UiScene> scene_;
   std::unique_ptr<UiInterface> html_interface_;
 
   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_;
 
   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_;
@@ skipping 33 matching lines @@
   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_