Implement WebVR presentation pausing for VR Shell Menu Mode

device/vr/vr_device_manager.cc

 // Copyright 2015 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 "device/vr/vr_device_manager.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/memory/ptr_util.h"
@@ skipping 11 matching lines @@
 }
 
 VRDeviceManager::VRDeviceManager()
     : vr_initialized_(false),
       presenting_service_(nullptr),
       presenting_device_(nullptr),
       keep_alive_(false),
       has_scheduled_poll_(false) {
 // Register VRDeviceProviders for the current platform
 #if defined(OS_ANDROID)
-  RegisterProvider(base::WrapUnique(new GvrDeviceProvider()));
+  RegisterProvider(new GvrDeviceProvider());
 #endif
 }
 
-VRDeviceManager::VRDeviceManager(std::unique_ptr<VRDeviceProvider> provider)
+VRDeviceManager::VRDeviceManager(VRDeviceProvider* provider)

[dcheng, 2016/11/08 23:05:45]

This should be a scoped_refptr<VRDeviceProvider>.

[mthiesse, 2016/11/10 22:14:10]

Done.

     : vr_initialized_(false),
       presenting_service_(nullptr),
       presenting_device_(nullptr),
       keep_alive_(true),
       has_scheduled_poll_(false) {
   thread_checker_.DetachFromThread();
-  RegisterProvider(std::move(provider));
+  RegisterProvider(provider);
   SetInstance(this);
 }
 
 VRDeviceManager::~VRDeviceManager() {
   DCHECK(thread_checker_.CalledOnValidThread());
   StopSchedulingPollEvents();
   g_vr_device_manager = nullptr;
 }
 
 VRDeviceManager* VRDeviceManager::GetInstance() {
@@ skipping 18 matching lines @@
         device_manager->presenting_device_->id() == index)
       return nullptr;
   }
 
   return device_manager->GetDevice(index);
 }
 
 void VRDeviceManager::SetInstance(VRDeviceManager* instance) {
   // Unit tests can create multiple instances but only one should exist at any
   // given time so g_vr_device_manager should only go from nullptr to
-  // non-nullptr and vica versa.
+  // non-nullptr and vice versa.
   CHECK_NE(!!instance, !!g_vr_device_manager);
   g_vr_device_manager = instance;
 }
 
 bool VRDeviceManager::HasInstance() {
   // For testing. Checks to see if a VRDeviceManager instance is active.
   return !!g_vr_device_manager;
 }
 
 void VRDeviceManager::AddService(VRServiceImpl* service) {
@@ skipping 187 matching lines @@
   DCHECK(presenting_service_);
 
   // Notify the presenting service that it's been forced to end presentation.
   presenting_service_->client()->OnExitPresent(device->id());
 
   // Clear the presenting service and device.
   presenting_service_ = nullptr;
   presenting_device_ = nullptr;
 }
 
+void VRDeviceManager::OnDisplayBlur(VRDevice* device) {
+  // Ensure the presenting device is the one that we've been requested to blur.
+  if (!presenting_device_ || presenting_device_ != device)
+    return;
+
+  // Should never have a presenting device without a presenting service.
+  DCHECK(presenting_service_);
+
+  // Notify the presenting service that it should blur.
+  presenting_service_->client()->OnDisplayBlur(device->id());
+}
+
+void VRDeviceManager::OnDisplayFocus(VRDevice* device) {
+  // Ensure the presenting device is the one that we've been requested to focus.
+  if (!presenting_device_ || presenting_device_ != device)
+    return;
+
+  // Should never have a presenting device without a presenting service.
+  DCHECK(presenting_service_);
+
+  // Notify the presenting service that it should focus.
+  presenting_service_->client()->OnDisplayFocus(device->id());
+}
+
 void VRDeviceManager::InitializeProviders() {
   if (vr_initialized_) {
     return;
   }
 
   for (const auto& provider : providers_) {
     provider->SetClient(this);
     provider->Initialize();
   }
 
   vr_initialized_ = true;
 }
 
-void VRDeviceManager::RegisterProvider(
-    std::unique_ptr<VRDeviceProvider> provider) {
-  providers_.push_back(make_linked_ptr(provider.release()));
+void VRDeviceManager::RegisterProvider(VRDeviceProvider* provider) {

[dcheng, 2016/11/08 23:05:45]

Ditto: this should also be a scoped_refptr<VRDeviceProvider>.

To avoid extra refs, the ctor and this function should std::move(provider)

[mthiesse, 2016/11/10 22:14:10]

Done.

+  providers_.push_back(provider);
 }
 
 void VRDeviceManager::SchedulePollEvents() {
   if (has_scheduled_poll_)
     return;
 
   has_scheduled_poll_ = true;
 
   timer_.Start(FROM_HERE, base::TimeDelta::FromMilliseconds(500), this,
                &VRDeviceManager::PollEvents);
 }
 
 void VRDeviceManager::PollEvents() {
   for (const auto& provider : providers_)
     provider->PollEvents();
 }
 
 void VRDeviceManager::StopSchedulingPollEvents() {
   if (has_scheduled_poll_)
     timer_.Stop();
 }
 
 }  // namespace device