Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1253)

Side by Side Diff: chrome/browser/android/vr_shell/vr_shell.h

Issue 2894903002: VR: Fix invalidation race viewing native pages. (Closed)
Patch Set: Address comments Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 204 matching lines...) Expand 10 before | Expand all | Expand 10 after
215 std::unique_ptr<AndroidUiGestureTarget> android_ui_gesture_target_; 215 std::unique_ptr<AndroidUiGestureTarget> android_ui_gesture_target_;
216 std::unique_ptr<VrMetricsHelper> metrics_helper_; 216 std::unique_ptr<VrMetricsHelper> metrics_helper_;
217 217
218 scoped_refptr<base::SingleThreadTaskRunner> main_thread_task_runner_; 218 scoped_refptr<base::SingleThreadTaskRunner> main_thread_task_runner_;
219 std::unique_ptr<VrGLThread> gl_thread_; 219 std::unique_ptr<VrGLThread> gl_thread_;
220 bool thread_started_ = false; 220 bool thread_started_ = false;
221 UiInterface* ui_; 221 UiInterface* ui_;
222 bool reprojected_rendering_; 222 bool reprojected_rendering_;
223 223
224 jobject content_surface_ = nullptr; 224 jobject content_surface_ = nullptr;
225 bool taken_surface_ = false;
225 base::CancelableClosure poll_capturing_media_task_; 226 base::CancelableClosure poll_capturing_media_task_;
226 bool is_capturing_audio_ = false; 227 bool is_capturing_audio_ = false;
227 bool is_capturing_video_ = false; 228 bool is_capturing_video_ = false;
228 bool is_capturing_screen_ = false; 229 bool is_capturing_screen_ = false;
229 230
230 // TODO(mthiesse): Remove the need for this to be stored here. 231 // TODO(mthiesse): Remove the need for this to be stored here.
231 // crbug.com/674594 232 // crbug.com/674594
232 gvr_context* gvr_api_; 233 gvr_context* gvr_api_;
233 234
234 // Are we currently providing a gamepad factory to the gamepad manager? 235 // Are we currently providing a gamepad factory to the gamepad manager?
235 bool gamepad_source_active_ = false; 236 bool gamepad_source_active_ = false;
236 // Registered fetcher, must remain alive for UpdateGamepadData calls. 237 // Registered fetcher, must remain alive for UpdateGamepadData calls.
237 // That's ok since the fetcher is only destroyed from VrShell's destructor. 238 // That's ok since the fetcher is only destroyed from VrShell's destructor.
238 device::GvrGamepadDataFetcher* gamepad_data_fetcher_ = nullptr; 239 device::GvrGamepadDataFetcher* gamepad_data_fetcher_ = nullptr;
239 240
240 base::WeakPtrFactory<VrShell> weak_ptr_factory_; 241 base::WeakPtrFactory<VrShell> weak_ptr_factory_;
241 242
242 DISALLOW_COPY_AND_ASSIGN(VrShell); 243 DISALLOW_COPY_AND_ASSIGN(VrShell);
243 }; 244 };
244 245
245 bool RegisterVrShell(JNIEnv* env); 246 bool RegisterVrShell(JNIEnv* env);
246 247
247 } // namespace vr_shell 248 } // namespace vr_shell
248 249
249 #endif // CHROME_BROWSER_ANDROID_VR_SHELL_VR_SHELL_H_ 250 #endif // CHROME_BROWSER_ANDROID_VR_SHELL_VR_SHELL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698