WIP: working copy-no-compositor path

chrome/browser/android/vr_shell/vr_shell_delegate.cc

 // 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.
 
 #include "chrome/browser/android/vr_shell/vr_shell_delegate.h"
+#include "device/vr/android/gvr/gvr_delegate.h"
 
 #include "base/android/jni_android.h"
 #include "chrome/browser/android/vr_shell/vr_shell.h"
 #include "device/vr/android/gvr/gvr_device_provider.h"
 #include "jni/VrShellDelegate_jni.h"
 
 using base::android::JavaParamRef;
 using base::android::AttachCurrentThread;
 
 namespace vr_shell {
 
 // A non presenting delegate for magic window mode.
 class GvrNonPresentingDelegate : public device::GvrDelegate {
  public:
   explicit GvrNonPresentingDelegate(jlong context) {
+    VLOG(1) << __FUNCTION__ << ": Instantiate gvr_api for non-presenting delegate";
     gvr_api_ =
         gvr::GvrApi::WrapNonOwned(reinterpret_cast<gvr_context*>(context));
   }
 
-  virtual ~GvrNonPresentingDelegate() = default;
+  virtual ~GvrNonPresentingDelegate() {
+    VLOG(1) << __FUNCTION__ << ": Destructor for non-presenting delegate and its gvr_api)";
+  };
 
   // GvrDelegate implementation
   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 {}
-  void SetGvrPoseForWebVr(const gvr::Mat4f& pose,
-                          uint32_t pose_index) override {}
-  void SetWebVRRenderSurfaceSize(int width, int height) override {}
-  gvr::Sizei GetWebVRCompositorSurfaceSize() override {
-    return device::kInvalidRenderTargetSize; }
+  void SetWebVRGvrPose(const gvr::Mat4f& pose,
+                       uint32_t pose_index, int64_t pose_time_nanos) override {}
+  void GetWebVRSurfaceHandle(int width, int height, const device::mojom::VRDisplay::GetSurfaceHandleCallback& callback) override { callback.Run(0); }
   gvr::GvrApi* gvr_api() override { return gvr_api_.get(); }
  private:
   std::unique_ptr<gvr::GvrApi> gvr_api_;
 };
 
 VrShellDelegate::VrShellDelegate(JNIEnv* env, jobject obj) {
   j_vr_shell_delegate_.Reset(env, obj);
   GvrDelegateProvider::SetInstance(this);
 }
 
@@ skipping 27 matching lines @@
 }
 
 void VrShellDelegate::SetPresentResult(JNIEnv* env, jobject obj,
                                        jboolean result) {
   CHECK(!present_callback_.is_null());
   present_callback_.Run(result);
   present_callback_.Reset();
 }
 
 void VrShellDelegate::DisplayActivate(JNIEnv* env, jobject obj) {
+  VLOG(1) << __FUNCTION__ << ": device_provider_=" << device_provider_;
   if (device_provider_) {
     device_provider_->OnDisplayActivate();
   }
 }
 
 void VrShellDelegate::SetDeviceProvider(
     device::GvrDeviceProvider* device_provider) {
   device_provider_ = device_provider;
   if (device_provider_ && delegate_) {
     device_provider_->OnGvrDelegateReady(delegate_);
@@ skipping 24 matching lines @@
 }
 
 void VrShellDelegate::ForceExitVr() {
   JNIEnv* env = AttachCurrentThread();
   Java_VrShellDelegate_forceExitVr(env, j_vr_shell_delegate_.obj());
 }
 
 device::GvrDelegate* VrShellDelegate::GetNonPresentingDelegate() {
   if (!non_presenting_delegate_) {
     JNIEnv* env = AttachCurrentThread();
+    VLOG(1) << __FUNCTION__;
     jlong context = Java_VrShellDelegate_createNonPresentingNativeContext(
         env, j_vr_shell_delegate_.obj());
     if (!context)
       return nullptr;
 
     non_presenting_delegate_.reset(new GvrNonPresentingDelegate(context));
   }
   return static_cast<GvrNonPresentingDelegate*>(non_presenting_delegate_.get());
 }
 
 void VrShellDelegate::DestroyNonPresentingDelegate() {
   if (non_presenting_delegate_) {
+    VLOG(1) << __FUNCTION__;
     non_presenting_delegate_.reset(nullptr);
     JNIEnv* env = AttachCurrentThread();
     Java_VrShellDelegate_shutdownNonPresentingNativeContext(
         env, j_vr_shell_delegate_.obj());
   }
 }
 
 void VrShellDelegate::SetListeningForActivate(bool listening) {
   JNIEnv* env = AttachCurrentThread();
+  VLOG(1) << __FUNCTION__;
   Java_VrShellDelegate_setListeningForWebVrActivate(
       env, j_vr_shell_delegate_.obj(), listening);
 }
 
 // ----------------------------------------------------------------------------
 // Native JNI methods
 // ----------------------------------------------------------------------------
 
 bool RegisterVrShellDelegate(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 jlong Init(JNIEnv* env, const JavaParamRef<jobject>& obj) {
   return reinterpret_cast<intptr_t>(new VrShellDelegate(env, obj));
 }
 
 }  // namespace vr_shell