| 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 127 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 138 jint content_texture_id_ = 0; | 138 jint content_texture_id_ = 0; |
| 139 | 139 |
| 140 float desktop_screen_tilt_; | 140 float desktop_screen_tilt_; |
| 141 float desktop_height_; | 141 float desktop_height_; |
| 142 | 142 |
| 143 std::unique_ptr<UiScene> scene_; | 143 std::unique_ptr<UiScene> scene_; |
| 144 | 144 |
| 145 std::unique_ptr<gvr::GvrApi> gvr_api_; | 145 std::unique_ptr<gvr::GvrApi> gvr_api_; |
| 146 std::unique_ptr<gvr::BufferViewportList> buffer_viewport_list_; | 146 std::unique_ptr<gvr::BufferViewportList> buffer_viewport_list_; |
| 147 std::unique_ptr<gvr::BufferViewport> buffer_viewport_; | 147 std::unique_ptr<gvr::BufferViewport> buffer_viewport_; |
| 148 std::unique_ptr<gvr::BufferViewport> overlay_left_viewport_; |
| 149 std::unique_ptr<gvr::BufferViewport> overlay_right_viewport_; |
| 148 std::unique_ptr<gvr::SwapChain> swap_chain_; | 150 std::unique_ptr<gvr::SwapChain> swap_chain_; |
| 149 | 151 |
| 150 gvr::Sizei render_size_; | 152 gvr::Sizei render_size_; |
| 151 | 153 |
| 152 std::queue<base::Callback<void()>> task_queue_; | 154 std::queue<base::Callback<void()>> task_queue_; |
| 153 base::Lock task_queue_lock_; | 155 base::Lock task_queue_lock_; |
| 154 | 156 |
| 155 std::unique_ptr<VrCompositor> content_compositor_; | 157 std::unique_ptr<VrCompositor> content_compositor_; |
| 156 content::WebContents* main_contents_; | 158 content::WebContents* main_contents_; |
| 157 std::unique_ptr<VrCompositor> ui_compositor_; | 159 std::unique_ptr<VrCompositor> ui_compositor_; |
| (...skipping 28 matching lines...) Expand all Loading... |
| 186 base::WeakPtrFactory<VrShell> weak_ptr_factory_; | 188 base::WeakPtrFactory<VrShell> weak_ptr_factory_; |
| 187 | 189 |
| 188 DISALLOW_COPY_AND_ASSIGN(VrShell); | 190 DISALLOW_COPY_AND_ASSIGN(VrShell); |
| 189 }; | 191 }; |
| 190 | 192 |
| 191 bool RegisterVrShell(JNIEnv* env); | 193 bool RegisterVrShell(JNIEnv* env); |
| 192 | 194 |
| 193 } // namespace vr_shell | 195 } // namespace vr_shell |
| 194 | 196 |
| 195 #endif // CHROME_BROWSER_ANDROID_VR_SHELL_VR_SHELL_H_ | 197 #endif // CHROME_BROWSER_ANDROID_VR_SHELL_VR_SHELL_H_ |
| OLD | NEW |