WIP: working copy-no-compositor path

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 <list>
 #include <memory>
 
 #include "base/android/jni_weak_ref.h"
 #include "base/callback.h"
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/single_thread_task_runner.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "device/vr/android/gvr/gvr_delegate.h"
 #include "third_party/gvr-android-sdk/src/libraries/headers/vr/gvr/capi/include/gvr.h"
@@ skipping 50 matching lines @@
   void Destroy(JNIEnv* env, const base::android::JavaParamRef<jobject>& obj);
   void OnTriggerEvent(JNIEnv* env,
                       const base::android::JavaParamRef<jobject>& obj);
   void OnPause(JNIEnv* env,
                const base::android::JavaParamRef<jobject>& obj);
   void OnResume(JNIEnv* env,
                 const base::android::JavaParamRef<jobject>& obj);
   void SetWebVrMode(JNIEnv* env,
                     const base::android::JavaParamRef<jobject>& obj,
                     bool enabled);
+  void SetWebVrSurface(JNIEnv* env,
+                       const base::android::JavaParamRef<jobject>& obj,
+                       const base::android::JavaParamRef<jobject>& surface,
+                       jint textureHandle);
 
   void ContentWebContentsDestroyed();
   // Called when our WebContents have been hidden. Usually a sign that something
   // like another tab placed in front of it.
   void ContentWasHidden();
 
   // html/js UI hooks.
   static base::WeakPtr<VrShell> GetWeakPtr(
       const content::WebContents* web_contents);
 
   // TODO(mthiesse): Clean up threading around UiInterface.
   UiInterface* GetUiInterface();
   void OnDomContentsLoaded();
 
   // device::GvrDelegate implementation
   // TODO(mthiesse): Clean up threading around GVR API. These functions are
   // called on the UI thread, but use GL thread objects in a non-threadsafe way.
   void SetWebVRSecureOrigin(bool secure_origin) override;
-  void SubmitWebVRFrame() override;
-  void UpdateWebVRTextureBounds(const gvr::Rectf& left_bounds,
+  void SubmitWebVRFrame(int32_t surface_handle, device::mojom::VRPosePtr pose) override;
+  void UpdateWebVRTextureBounds(uint32_t for_pose_index,
+                                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 SetWebVRGvrPose(const gvr::Mat4f& pose, uint32_t pose_num,
+                       int64_t pose_time_nanos) override;
+  void GetWebVRSurfaceHandle(int width, int height, const device::mojom::VRDisplay::GetSurfaceHandleCallback& callback) override;
 
   void SurfacesChanged(jobject content_surface, jobject ui_surface);
   void GvrDelegateReady();
+  void OnWebVRFrameSubmitted(int32_t surface_handle, uint32_t frame_index, double elapsed);
   void AppButtonPressed();
 
   void ContentBoundsChanged(
       JNIEnv* env,
       const base::android::JavaParamRef<jobject>& object,
       jint width, jint height, jfloat dpr);
 
   void UIBoundsChanged(
       JNIEnv* env,
       const base::android::JavaParamRef<jobject>& object,
@@ skipping 44 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_