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

Side by Side Diff: chrome/browser/android/vr_shell/vr_shell_delegate.h

Issue 2774933003: Fixes WebVR presentation from within VRShell. (Closed)
Patch Set: Rebased on ToT, nits Created 3 years, 8 months 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 #ifndef CHROME_BROWSER_ANDROID_VR_SHELL_VR_SHELL_DELEGATE_H_ 5 #ifndef CHROME_BROWSER_ANDROID_VR_SHELL_VR_SHELL_DELEGATE_H_
6 #define CHROME_BROWSER_ANDROID_VR_SHELL_VR_SHELL_DELEGATE_H_ 6 #define CHROME_BROWSER_ANDROID_VR_SHELL_VR_SHELL_DELEGATE_H_
7 7
8 #include <jni.h> 8 #include <jni.h>
9 9
10 #include <memory> 10 #include <memory>
(...skipping 20 matching lines...) Expand all
31 31
32 static VrShellDelegate* GetNativeVrShellDelegate(JNIEnv* env, 32 static VrShellDelegate* GetNativeVrShellDelegate(JNIEnv* env,
33 jobject jdelegate); 33 jobject jdelegate);
34 34
35 void SetPresentingDelegate(device::PresentingGvrDelegate* delegate, 35 void SetPresentingDelegate(device::PresentingGvrDelegate* delegate,
36 gvr_context* context); 36 gvr_context* context);
37 void RemoveDelegate(); 37 void RemoveDelegate();
38 38
39 void SetPresentResult(JNIEnv* env, 39 void SetPresentResult(JNIEnv* env,
40 const base::android::JavaParamRef<jobject>& obj, 40 const base::android::JavaParamRef<jobject>& obj,
41 jboolean result); 41 jboolean success);
42 void DisplayActivate(JNIEnv* env, 42 void DisplayActivate(JNIEnv* env,
43 const base::android::JavaParamRef<jobject>& obj); 43 const base::android::JavaParamRef<jobject>& obj);
44 void UpdateVSyncInterval(JNIEnv* env, 44 void UpdateVSyncInterval(JNIEnv* env,
45 const base::android::JavaParamRef<jobject>& obj, 45 const base::android::JavaParamRef<jobject>& obj,
46 jlong timebase_nanos, 46 jlong timebase_nanos,
47 jdouble interval_seconds); 47 jdouble interval_seconds);
48 void OnPause(JNIEnv* env, const base::android::JavaParamRef<jobject>& obj); 48 void OnPause(JNIEnv* env, const base::android::JavaParamRef<jobject>& obj);
49 void OnResume(JNIEnv* env, const base::android::JavaParamRef<jobject>& obj); 49 void OnResume(JNIEnv* env, const base::android::JavaParamRef<jobject>& obj);
50 void Destroy(JNIEnv* env, const base::android::JavaParamRef<jobject>& obj); 50 void Destroy(JNIEnv* env, const base::android::JavaParamRef<jobject>& obj);
51 device::mojom::VRSubmitFrameClientPtr TakeSubmitFrameClient();
52 51
53 device::GvrDeviceProvider* device_provider() { return device_provider_; } 52 device::GvrDeviceProvider* device_provider() { return device_provider_; }
54 53
55 private: 54 private:
56 // device::GvrDelegateProvider implementation 55 // device::GvrDelegateProvider implementation
57 void SetDeviceProvider(device::GvrDeviceProvider* device_provider) override; 56 void SetDeviceProvider(device::GvrDeviceProvider* device_provider) override;
58 void ClearDeviceProvider() override; 57 void ClearDeviceProvider() override;
59 void RequestWebVRPresent(device::mojom::VRSubmitFrameClientPtr submit_client, 58 void RequestWebVRPresent(device::mojom::VRSubmitFrameClientPtr submit_client,
60 const base::Callback<void(bool)>& callback) override; 59 const base::Callback<void(bool)>& callback) override;
61 void ExitWebVRPresent() override; 60 void ExitWebVRPresent() override;
62 device::GvrDelegate* GetDelegate() override; 61 device::GvrDelegate* GetDelegate() override;
63 void SetListeningForActivate(bool listening) override; 62 void SetListeningForActivate(bool listening) override;
64 63
65 void CreateNonPresentingDelegate(); 64 void CreateNonPresentingDelegate();
66 65
67 std::unique_ptr<NonPresentingGvrDelegate> non_presenting_delegate_; 66 std::unique_ptr<NonPresentingGvrDelegate> non_presenting_delegate_;
68 base::android::ScopedJavaGlobalRef<jobject> j_vr_shell_delegate_; 67 base::android::ScopedJavaGlobalRef<jobject> j_vr_shell_delegate_;
69 device::GvrDeviceProvider* device_provider_ = nullptr; 68 device::GvrDeviceProvider* device_provider_ = nullptr;
70 device::PresentingGvrDelegate* presenting_delegate_ = nullptr; 69 device::PresentingGvrDelegate* presenting_delegate_ = nullptr;
71 base::Callback<void(bool)> present_callback_; 70 base::Callback<void(bool)> present_callback_;
72 int64_t timebase_nanos_ = 0; 71 int64_t timebase_nanos_ = 0;
73 double interval_seconds_ = 0; 72 double interval_seconds_ = 0;
74 device::mojom::VRSubmitFrameClientPtr submit_client_; 73 device::mojom::VRSubmitFrameClientPtr submit_client_;
74 bool pending_successful_present_request_ = false;
75 75
76 DISALLOW_COPY_AND_ASSIGN(VrShellDelegate); 76 DISALLOW_COPY_AND_ASSIGN(VrShellDelegate);
77 }; 77 };
78 78
79 bool RegisterVrShellDelegate(JNIEnv* env); 79 bool RegisterVrShellDelegate(JNIEnv* env);
80 80
81 } // namespace vr_shell 81 } // namespace vr_shell
82 82
83 #endif // CHROME_BROWSER_ANDROID_VR_SHELL_VR_SHELL_DELEGATE_H_ 83 #endif // CHROME_BROWSER_ANDROID_VR_SHELL_VR_SHELL_DELEGATE_H_
OLDNEW
« no previous file with comments | « chrome/browser/android/vr_shell/vr_shell.cc ('k') | chrome/browser/android/vr_shell/vr_shell_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698