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 25 matching lines...) Expand all Loading... |
36 } | 36 } |
37 | 37 |
38 namespace gpu { | 38 namespace gpu { |
39 struct MailboxHolder; | 39 struct MailboxHolder; |
40 } | 40 } |
41 | 41 |
42 namespace vr_shell { | 42 namespace vr_shell { |
43 | 43 |
44 class FPSMeter; | 44 class FPSMeter; |
45 class MailboxToSurfaceBridge; | 45 class MailboxToSurfaceBridge; |
| 46 class SlidingAverage; |
46 class UiElement; | 47 class UiElement; |
47 class UiScene; | 48 class UiScene; |
48 class VrBrowserInterface; | 49 class VrBrowserInterface; |
49 class VrController; | 50 class VrController; |
50 class VrShell; | 51 class VrShell; |
51 class VrShellRenderer; | 52 class VrShellRenderer; |
52 | 53 |
53 struct WebVrBounds { | 54 struct WebVrBounds { |
54 WebVrBounds(const gfx::RectF& left, | 55 WebVrBounds(const gfx::RectF& left, |
55 const gfx::RectF& right, | 56 const gfx::RectF& right, |
(...skipping 210 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
266 | 267 |
267 uint8_t frame_index_ = 0; | 268 uint8_t frame_index_ = 0; |
268 // Larger than frame_index_ so it can be initialized out-of-band. | 269 // Larger than frame_index_ so it can be initialized out-of-band. |
269 uint16_t last_frame_index_ = -1; | 270 uint16_t last_frame_index_ = -1; |
270 | 271 |
271 // Attributes for gesture detection while holding app button. | 272 // Attributes for gesture detection while holding app button. |
272 gfx::Vector3dF controller_start_direction_; | 273 gfx::Vector3dF controller_start_direction_; |
273 | 274 |
274 std::unique_ptr<FPSMeter> fps_meter_; | 275 std::unique_ptr<FPSMeter> fps_meter_; |
275 | 276 |
| 277 std::unique_ptr<SlidingAverage> webvr_js_time_; |
| 278 std::unique_ptr<SlidingAverage> webvr_render_time_; |
| 279 |
276 gfx::Point3F pointer_start_; | 280 gfx::Point3F pointer_start_; |
277 | 281 |
278 base::WeakPtrFactory<VrShellGl> weak_ptr_factory_; | 282 base::WeakPtrFactory<VrShellGl> weak_ptr_factory_; |
279 | 283 |
280 DISALLOW_COPY_AND_ASSIGN(VrShellGl); | 284 DISALLOW_COPY_AND_ASSIGN(VrShellGl); |
281 }; | 285 }; |
282 | 286 |
283 } // namespace vr_shell | 287 } // namespace vr_shell |
284 | 288 |
285 #endif // CHROME_BROWSER_ANDROID_VR_SHELL_VR_SHELL_GL_H_ | 289 #endif // CHROME_BROWSER_ANDROID_VR_SHELL_VR_SHELL_GL_H_ |
OLD | NEW |