WIP: working copy-no-compositor path

device/vr/vr_display_impl.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 <utility>
 
 #include "base/bind.h"
 #include "device/vr/vr_device.h"
 #include "device/vr/vr_service_impl.h"
 
 namespace device {
 
 VRDisplayImpl::VRDisplayImpl(device::VRDevice* device, VRServiceImpl* service)
     : binding_(this),
       device_(device),
       service_(service),
       weak_ptr_factory_(this) {
+  VLOG(1) << __FUNCTION__ << ": this=" << (void*)this << " device=" << device << " service=" << service;
   mojom::VRDisplayInfoPtr display_info = device->GetVRDevice();
   if (service->client()) {
     service->client()->OnDisplayConnected(binding_.CreateInterfacePtrAndBind(),
                                           mojo::MakeRequest(&client_),
                                           std::move(display_info));
   }
 }
 
 VRDisplayImpl::~VRDisplayImpl() {
+  VLOG(1) << __FUNCTION__ << ": this=" << (void*)this << " destructor";
   device_->RemoveDisplay(this);
 }
 
-void VRDisplayImpl::GetPose(const GetPoseCallback& callback) {
+void VRDisplayImpl::GetPose(mojom::VRPoseClientPtr pose_client) {
   if (!device_->IsAccessAllowed(this)) {
-    callback.Run(nullptr);
+    pose_client->OnPoseReceived(nullptr);
     return;
   }
 
-  callback.Run(device_->GetPose());
+  pose_client->OnPoseReceived(device_->GetPose());
 }
 
 void VRDisplayImpl::ResetPose() {
   if (!device_->IsAccessAllowed(this))
     return;
 
   device_->ResetPose();
 }
 
 void VRDisplayImpl::RequestPresent(bool secure_origin,
@@ skipping 16 matching lines @@
     device_->SetSecureOrigin(secure_origin);
   }
   callback.Run(success);
 }
 
 void VRDisplayImpl::ExitPresent() {
   if (device_->CheckPresentingDisplay(this))
     device_->ExitPresent();
 }
 
-void VRDisplayImpl::SubmitFrame(mojom::VRPosePtr pose) {
-  if (!device_->CheckPresentingDisplay(this))
+void VRDisplayImpl::SubmitFrame(int32_t surface_handle,
+                                mojom::VRPosePtr pose,
+                                const SubmitFrameCallback& callback) {
+  if (!device_->CheckPresentingDisplay(this)) {
+    VLOG(1) << ": no presenting service, running callback";
+    callback.Run(0, pose ? pose->poseIndex : 0, -1.0);
     return;
-  device_->SubmitFrame(std::move(pose));
+  }
+  device_->SubmitFrame(surface_handle, std::move(pose), std::move(callback));
 }
 
 void VRDisplayImpl::UpdateLayerBounds(mojom::VRLayerBoundsPtr left_bounds,
                                       mojom::VRLayerBoundsPtr right_bounds) {
-  if (!device_->IsAccessAllowed(this))
+  if (!device_->CheckPresentingDisplay(this))
     return;
 
   device_->UpdateLayerBounds(std::move(left_bounds), std::move(right_bounds));
 }
+
+void VRDisplayImpl::GetSurfaceHandle(int32_t width, int32_t height,
+                                     const GetSurfaceHandleCallback& callback) {
+  if (!device_->CheckPresentingDisplay(this))
+    return;
+
+  device_->GetSurfaceHandle(width, height, callback);
 }
+}