Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(122)

Side by Side Diff: device/vr/android/gvr/gvr_device_provider.cc

Issue 2471433002: Implement WebVR presentation pausing for VR Shell Menu Mode (Closed)
Patch Set: rebase Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "device/vr/android/gvr/gvr_device_provider.h" 5 #include "device/vr/android/gvr/gvr_device_provider.h"
6 6
7 #include <jni.h> 7 #include <jni.h>
8 8
9 #include "base/android/context_utils.h" 9 #include "base/android/context_utils.h"
10 #include "base/android/jni_android.h" 10 #include "base/android/jni_android.h"
11 #include "base/android/jni_utils.h" 11 #include "base/android/jni_utils.h"
12 #include "base/android/scoped_java_ref.h" 12 #include "base/android/scoped_java_ref.h"
13 #include "device/vr/android/gvr/gvr_delegate.h" 13 #include "device/vr/android/gvr/gvr_delegate.h"
14 #include "device/vr/android/gvr/gvr_device.h" 14 #include "device/vr/android/gvr/gvr_device.h"
15 #include "device/vr/android/gvr/gvr_gamepad_data_fetcher.h" 15 #include "device/vr/android/gvr/gvr_gamepad_data_fetcher.h"
16 #include "device/vr/vr_device_manager.h" 16 #include "device/vr/vr_device_manager.h"
17 #include "third_party/gvr-android-sdk/src/ndk/include/vr/gvr/capi/include/gvr.h" 17 #include "third_party/gvr-android-sdk/src/ndk/include/vr/gvr/capi/include/gvr.h"
18 #include "third_party/gvr-android-sdk/src/ndk/include/vr/gvr/capi/include/gvr_co ntroller.h" 18 #include "third_party/gvr-android-sdk/src/ndk/include/vr/gvr/capi/include/gvr_co ntroller.h"
19 #include "third_party/gvr-android-sdk/src/ndk/include/vr/gvr/capi/include/gvr_ty pes.h" 19 #include "third_party/gvr-android-sdk/src/ndk/include/vr/gvr/capi/include/gvr_ty pes.h"
20 20
21 using base::android::AttachCurrentThread; 21 using base::android::AttachCurrentThread;
22 using base::android::GetApplicationContext; 22 using base::android::GetApplicationContext;
23 23
24 namespace device { 24 namespace device {
25 25
26 GvrDeviceProvider::GvrDeviceProvider() 26 GvrDeviceProvider::GvrDeviceProvider() : weak_ptr_factory_(this) {}
27 : VRDeviceProvider(),
28 main_thread_task_runner_(base::ThreadTaskRunnerHandle::Get()) {}
29 27
30 GvrDeviceProvider::~GvrDeviceProvider() { 28 GvrDeviceProvider::~GvrDeviceProvider() {
31 device::GvrDelegateProvider* delegate_provider = 29 device::GvrDelegateProvider* delegate_provider =
32 device::GvrDelegateProvider::GetInstance(); 30 device::GvrDelegateProvider::GetInstance();
33 if (delegate_provider) 31 if (delegate_provider)
34 delegate_provider->DestroyNonPresentingDelegate(); 32 delegate_provider->DestroyNonPresentingDelegate();
35 33
36 ExitPresent(); 34 ExitPresent();
37 } 35 }
38 36
(...skipping 16 matching lines...) Expand all
55 } 53 }
56 } 54 }
57 55
58 bool GvrDeviceProvider::RequestPresent() { 56 bool GvrDeviceProvider::RequestPresent() {
59 device::GvrDelegateProvider* delegate_provider = 57 device::GvrDelegateProvider* delegate_provider =
60 device::GvrDelegateProvider::GetInstance(); 58 device::GvrDelegateProvider::GetInstance();
61 if (!delegate_provider) 59 if (!delegate_provider)
62 return false; 60 return false;
63 61
64 // RequestWebVRPresent is async as a render thread may be created. 62 // RequestWebVRPresent is async as a render thread may be created.
65 return delegate_provider->RequestWebVRPresent(this); 63 return delegate_provider->RequestWebVRPresent(weak_ptr_factory_.GetWeakPtr());
66 } 64 }
67 65
68 void GvrDeviceProvider::ExitPresent() { 66 void GvrDeviceProvider::ExitPresent() {
69 DCHECK(main_thread_task_runner_->BelongsToCurrentThread());
70
71 if (!vr_device_) 67 if (!vr_device_)
72 return; 68 return;
73 69
74 device::GvrDelegateProvider* delegate_provider = 70 device::GvrDelegateProvider* delegate_provider =
75 device::GvrDelegateProvider::GetInstance(); 71 device::GvrDelegateProvider::GetInstance();
76 if (!delegate_provider) 72 if (!delegate_provider)
77 return; 73 return;
78 74
79 vr_device_->SetDelegate(delegate_provider->GetNonPresentingDelegate()); 75 vr_device_->SetDelegate(delegate_provider->GetNonPresentingDelegate());
80 76
81 GamepadDataFetcherManager::GetInstance()->RemoveSourceFactory( 77 GamepadDataFetcherManager::GetInstance()->RemoveSourceFactory(
82 GAMEPAD_SOURCE_GVR); 78 GAMEPAD_SOURCE_GVR);
83 79
84 delegate_provider->ExitWebVRPresent(); 80 delegate_provider->ExitWebVRPresent();
85 } 81 }
86 82
87 void GvrDeviceProvider::OnGvrDelegateReady(GvrDelegate* delegate) { 83 void GvrDeviceProvider::OnGvrDelegateReady(
88 main_thread_task_runner_->PostTask( 84 const base::WeakPtr<GvrDelegate>& delegate) {
89 FROM_HERE,
90 base::Bind(&GvrDeviceProvider::GvrDelegateReady, base::Unretained(this),
91 base::Unretained(delegate)));
92 }
93
94 void GvrDeviceProvider::OnGvrDelegateRemoved() {
95 DCHECK(main_thread_task_runner_->BelongsToCurrentThread());
96 if (!vr_device_) 85 if (!vr_device_)
97 return; 86 return;
98 ExitPresent();
99 }
100
101 void GvrDeviceProvider::GvrDelegateReady(GvrDelegate* delegate) {
102 DCHECK(main_thread_task_runner_->BelongsToCurrentThread());
103
104 vr_device_->SetDelegate(delegate); 87 vr_device_->SetDelegate(delegate);
105 GamepadDataFetcherManager::GetInstance()->AddFactory( 88 GamepadDataFetcherManager::GetInstance()->AddFactory(
106 new GvrGamepadDataFetcher::Factory(delegate, vr_device_->id())); 89 new GvrGamepadDataFetcher::Factory(delegate, vr_device_->id()));
107 } 90 }
108 91
92 void GvrDeviceProvider::OnGvrDelegateRemoved() {
93 ExitPresent();
94 }
95
96 void GvrDeviceProvider::OnDisplayBlur() {
97 if (!vr_device_)
98 return;
99 vr_device_->OnDisplayBlur();
100 }
101
102 void GvrDeviceProvider::OnDisplayFocus() {
103 if (!vr_device_)
104 return;
105 vr_device_->OnDisplayFocus();
106 }
107
109 } // namespace device 108 } // namespace device
OLDNEW
« no previous file with comments | « device/vr/android/gvr/gvr_device_provider.h ('k') | device/vr/android/gvr/gvr_gamepad_data_fetcher.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698