| 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 123 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 134 | 134 |
| 135 void UpdateController(const gvr::Vec3f& forward_vector); | 135 void UpdateController(const gvr::Vec3f& forward_vector); |
| 136 | 136 |
| 137 void HandleQueuedTasks(); | 137 void HandleQueuedTasks(); |
| 138 | 138 |
| 139 // samplerExternalOES texture data for UI content image. | 139 // samplerExternalOES texture data for UI content image. |
| 140 jint ui_texture_id_ = 0; | 140 jint ui_texture_id_ = 0; |
| 141 // samplerExternalOES texture data for main content image. | 141 // samplerExternalOES texture data for main content image. |
| 142 jint content_texture_id_ = 0; | 142 jint content_texture_id_ = 0; |
| 143 | 143 |
| 144 float desktop_screen_tilt_; | |
| 145 float desktop_height_; | |
| 146 | |
| 147 std::unique_ptr<UiScene> scene_; | 144 std::unique_ptr<UiScene> scene_; |
| 148 std::unique_ptr<UiInterface> html_interface_; | 145 std::unique_ptr<UiInterface> html_interface_; |
| 149 | 146 |
| 150 std::unique_ptr<gvr::GvrApi> gvr_api_; | 147 std::unique_ptr<gvr::GvrApi> gvr_api_; |
| 151 std::unique_ptr<gvr::BufferViewportList> buffer_viewport_list_; | 148 std::unique_ptr<gvr::BufferViewportList> buffer_viewport_list_; |
| 152 std::unique_ptr<gvr::BufferViewport> buffer_viewport_; | 149 std::unique_ptr<gvr::BufferViewport> buffer_viewport_; |
| 153 std::unique_ptr<gvr::SwapChain> swap_chain_; | 150 std::unique_ptr<gvr::SwapChain> swap_chain_; |
| 154 | 151 |
| 155 gvr::Sizei render_size_; | 152 gvr::Sizei render_size_; |
| 156 | 153 |
| (...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 191 base::WeakPtrFactory<VrShell> weak_ptr_factory_; | 188 base::WeakPtrFactory<VrShell> weak_ptr_factory_; |
| 192 | 189 |
| 193 DISALLOW_COPY_AND_ASSIGN(VrShell); | 190 DISALLOW_COPY_AND_ASSIGN(VrShell); |
| 194 }; | 191 }; |
| 195 | 192 |
| 196 bool RegisterVrShell(JNIEnv* env); | 193 bool RegisterVrShell(JNIEnv* env); |
| 197 | 194 |
| 198 } // namespace vr_shell | 195 } // namespace vr_shell |
| 199 | 196 |
| 200 #endif // CHROME_BROWSER_ANDROID_VR_SHELL_VR_SHELL_H_ | 197 #endif // CHROME_BROWSER_ANDROID_VR_SHELL_VR_SHELL_H_ |
| OLD | NEW |