| 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_GL_H_ | 5 #ifndef CHROME_BROWSER_ANDROID_VR_SHELL_VR_SHELL_GL_H_ |
| 6 #define CHROME_BROWSER_ANDROID_VR_SHELL_VR_SHELL_GL_H_ | 6 #define CHROME_BROWSER_ANDROID_VR_SHELL_VR_SHELL_GL_H_ |
| 7 | 7 |
| 8 #include <memory> | 8 #include <memory> |
| 9 #include <queue> | 9 #include <queue> |
| 10 #include <utility> | 10 #include <utility> |
| (...skipping 12 matching lines...) Expand all Loading... |
| 23 #include "ui/gfx/native_widget_types.h" | 23 #include "ui/gfx/native_widget_types.h" |
| 24 | 24 |
| 25 namespace base { | 25 namespace base { |
| 26 class ListValue; | 26 class ListValue; |
| 27 } | 27 } |
| 28 | 28 |
| 29 namespace blink { | 29 namespace blink { |
| 30 class WebInputEvent; | 30 class WebInputEvent; |
| 31 } | 31 } |
| 32 | 32 |
| 33 namespace cc { |
| 34 class FrameRateCounter; |
| 35 } |
| 36 |
| 33 namespace gl { | 37 namespace gl { |
| 34 class GLContext; | 38 class GLContext; |
| 35 class GLSurface; | 39 class GLSurface; |
| 36 class ScopedJavaSurface; | 40 class ScopedJavaSurface; |
| 37 class SurfaceTexture; | 41 class SurfaceTexture; |
| 38 } | 42 } |
| 39 | 43 |
| 40 namespace gpu { | 44 namespace gpu { |
| 41 struct MailboxHolder; | 45 struct MailboxHolder; |
| 42 } | 46 } |
| (...skipping 189 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 232 base::WeakPtr<VrShell> weak_vr_shell_; | 236 base::WeakPtr<VrShell> weak_vr_shell_; |
| 233 scoped_refptr<base::SingleThreadTaskRunner> main_thread_task_runner_; | 237 scoped_refptr<base::SingleThreadTaskRunner> main_thread_task_runner_; |
| 234 | 238 |
| 235 uint8_t frame_index_ = 0; | 239 uint8_t frame_index_ = 0; |
| 236 // Larger than frame_index_ so it can be initialized out-of-band. | 240 // Larger than frame_index_ so it can be initialized out-of-band. |
| 237 uint16_t last_frame_index_ = -1; | 241 uint16_t last_frame_index_ = -1; |
| 238 | 242 |
| 239 // Attributes for gesture detection while holding app button. | 243 // Attributes for gesture detection while holding app button. |
| 240 gvr::Vec3f controller_start_direction_; | 244 gvr::Vec3f controller_start_direction_; |
| 241 | 245 |
| 246 std::unique_ptr<cc::FrameRateCounter> frame_rate_counter_; |
| 247 |
| 242 base::WeakPtrFactory<VrShellGl> weak_ptr_factory_; | 248 base::WeakPtrFactory<VrShellGl> weak_ptr_factory_; |
| 243 | 249 |
| 244 DISALLOW_COPY_AND_ASSIGN(VrShellGl); | 250 DISALLOW_COPY_AND_ASSIGN(VrShellGl); |
| 245 }; | 251 }; |
| 246 | 252 |
| 247 } // namespace vr_shell | 253 } // namespace vr_shell |
| 248 | 254 |
| 249 #endif // CHROME_BROWSER_ANDROID_VR_SHELL_VR_SHELL_GL_H_ | 255 #endif // CHROME_BROWSER_ANDROID_VR_SHELL_VR_SHELL_GL_H_ |
| OLD | NEW |