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

Unified Diff: chrome/browser/android/vr_shell/vr_shell_gl.cc

Issue 2874103003: Revert of App button click exits WebVR presentation. (Closed)
Patch Set: 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/android/vr_shell/vr_shell_delegate.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/android/vr_shell/vr_shell_gl.cc
diff --git a/chrome/browser/android/vr_shell/vr_shell_gl.cc b/chrome/browser/android/vr_shell/vr_shell_gl.cc
index a666358aa36155ced534943352afdef5f1e9d985..8cc084495e187ba2461f9dcd2d37b6672bf8eb17 100644
--- a/chrome/browser/android/vr_shell/vr_shell_gl.cc
+++ b/chrome/browser/android/vr_shell/vr_shell_gl.cc
@@ -330,7 +330,6 @@
void VrShellGl::SubmitWebVRFrame(int16_t frame_index,
const gpu::MailboxHolder& mailbox) {
- DCHECK(submit_client_.get());
TRACE_EVENT0("gpu", "VrShellGl::SubmitWebVRFrame");
// Swapping twice on a Surface without calling updateTexImage in
@@ -394,9 +393,7 @@
// we move the "rendered" notification after draw, or suppress
// the next vsync until that's done?
- if (submit_client_) {
- submit_client_->OnSubmitFrameRendered();
- }
+ submit_client_->OnSubmitFrameRendered();
DrawFrame(frame_index);
}
@@ -1217,9 +1214,6 @@
void VrShellGl::SetWebVrMode(bool enabled) {
web_vr_mode_ = enabled;
- if (!enabled) {
- submit_client_.reset();
- }
}
void VrShellGl::UpdateWebVRTextureBounds(int16_t frame_index,
« no previous file with comments | « chrome/browser/android/vr_shell/vr_shell_delegate.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698