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 #include "chrome/browser/android/vr_shell/vr_gl_thread.h" | 5 #include "chrome/browser/android/vr_shell/vr_gl_thread.h" |
6 | 6 |
7 #include <utility> | 7 #include <utility> |
8 | 8 |
9 #include "chrome/browser/android/vr_shell/ui_scene.h" | 9 #include "chrome/browser/android/vr_shell/ui_scene.h" |
10 #include "chrome/browser/android/vr_shell/ui_scene_manager.h" | 10 #include "chrome/browser/android/vr_shell/ui_scene_manager.h" |
(...skipping 26 matching lines...) Expand all Loading... |
37 vr_shell_gl_ = base::MakeUnique<VrShellGl>( | 37 vr_shell_gl_ = base::MakeUnique<VrShellGl>( |
38 std::move(weak_vr_shell_), std::move(main_thread_task_runner_), gvr_api_, | 38 std::move(weak_vr_shell_), std::move(main_thread_task_runner_), gvr_api_, |
39 initially_web_vr_, reprojected_rendering_, scene_.get()); | 39 initially_web_vr_, reprojected_rendering_, scene_.get()); |
40 weak_vr_shell_gl_ = vr_shell_gl_->GetWeakPtr(); | 40 weak_vr_shell_gl_ = vr_shell_gl_->GetWeakPtr(); |
41 weak_scene_manager_ = scene_manager_->GetWeakPtr(); | 41 weak_scene_manager_ = scene_manager_->GetWeakPtr(); |
42 vr_shell_gl_->Initialize(); | 42 vr_shell_gl_->Initialize(); |
43 } | 43 } |
44 | 44 |
45 void VrGLThread::CleanUp() { | 45 void VrGLThread::CleanUp() { |
46 vr_shell_gl_.reset(); | 46 vr_shell_gl_.reset(); |
| 47 scene_manager_.reset(); |
| 48 scene_.reset(); |
47 } | 49 } |
48 | 50 |
49 } // namespace vr_shell | 51 } // namespace vr_shell |
OLD | NEW |