| OLD | NEW |
| 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_H_ | 5 #ifndef CHROME_BROWSER_ANDROID_VR_SHELL_VR_SHELL_H_ |
| 6 #define CHROME_BROWSER_ANDROID_VR_SHELL_VR_SHELL_H_ | 6 #define CHROME_BROWSER_ANDROID_VR_SHELL_VR_SHELL_H_ |
| 7 | 7 |
| 8 #include <jni.h> | 8 #include <jni.h> |
| 9 | 9 |
| 10 #include <memory> | 10 #include <memory> |
| (...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 93 | 93 |
| 94 // TODO(mthiesse): Clean up threading around UiInterface. | 94 // TODO(mthiesse): Clean up threading around UiInterface. |
| 95 UiInterface* GetUiInterface(); | 95 UiInterface* GetUiInterface(); |
| 96 void OnDomContentsLoaded(); | 96 void OnDomContentsLoaded(); |
| 97 | 97 |
| 98 // device::GvrDelegate implementation | 98 // device::GvrDelegate implementation |
| 99 // TODO(mthiesse): Clean up threading around GVR API. These functions are | 99 // TODO(mthiesse): Clean up threading around GVR API. These functions are |
| 100 // called on the UI thread, but use GL thread objects in a non-threadsafe way. | 100 // called on the UI thread, but use GL thread objects in a non-threadsafe way. |
| 101 void SetWebVRSecureOrigin(bool secure_origin) override; | 101 void SetWebVRSecureOrigin(bool secure_origin) override; |
| 102 void SubmitWebVRFrame() override; | 102 void SubmitWebVRFrame() override; |
| 103 void UpdateWebVRTextureBounds(const gvr::Rectf& left_bounds, | 103 void UpdateWebVRTextureBounds(uint32_t frame_index, |
| 104 const gvr::Rectf& left_bounds, |
| 104 const gvr::Rectf& right_bounds) override; | 105 const gvr::Rectf& right_bounds) override; |
| 105 gvr::GvrApi* gvr_api() override; | 106 gvr::GvrApi* gvr_api() override; |
| 106 void SetGvrPoseForWebVr(const gvr::Mat4f& pose, uint32_t pose_num) override; | 107 void SetGvrPoseForWebVr(const gvr::Mat4f& pose, uint32_t pose_num) override; |
| 107 void SetWebVRRenderSurfaceSize(int width, int height) override; | 108 void SetWebVRRenderSurfaceSize(int width, int height) override; |
| 108 gvr::Sizei GetWebVRCompositorSurfaceSize() override; | 109 gvr::Sizei GetWebVRCompositorSurfaceSize() override; |
| 109 | 110 |
| 110 void SurfacesChanged(jobject content_surface, jobject ui_surface); | 111 void SurfacesChanged(jobject content_surface, jobject ui_surface); |
| 111 void GvrDelegateReady(); | 112 void GvrDelegateReady(); |
| 112 void AppButtonPressed(); | 113 void AppButtonPressed(); |
| 113 | 114 |
| (...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 167 base::WeakPtrFactory<VrShell> weak_ptr_factory_; | 168 base::WeakPtrFactory<VrShell> weak_ptr_factory_; |
| 168 | 169 |
| 169 DISALLOW_COPY_AND_ASSIGN(VrShell); | 170 DISALLOW_COPY_AND_ASSIGN(VrShell); |
| 170 }; | 171 }; |
| 171 | 172 |
| 172 bool RegisterVrShell(JNIEnv* env); | 173 bool RegisterVrShell(JNIEnv* env); |
| 173 | 174 |
| 174 } // namespace vr_shell | 175 } // namespace vr_shell |
| 175 | 176 |
| 176 #endif // CHROME_BROWSER_ANDROID_VR_SHELL_VR_SHELL_H_ | 177 #endif // CHROME_BROWSER_ANDROID_VR_SHELL_VR_SHELL_H_ |
| OLD | NEW |