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

Unified Diff: third_party/WebKit/Source/modules/vr/VRDisplay.cpp

Issue 2864363005: Prevents exiting presentation if triggering DON while presenting. (Closed)
Patch Set: Changed parameter to underscore case 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 | « device/vr/vr_service.mojom ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/modules/vr/VRDisplay.cpp
diff --git a/third_party/WebKit/Source/modules/vr/VRDisplay.cpp b/third_party/WebKit/Source/modules/vr/VRDisplay.cpp
index 31fbc5f152979223fcafbeaa97bdcbe2648c76b2..0ddc978ed543a5a419e35d2593a8e1f12926e448 100644
--- a/third_party/WebKit/Source/modules/vr/VRDisplay.cpp
+++ b/third_party/WebKit/Source/modules/vr/VRDisplay.cpp
@@ -685,7 +685,7 @@ void VRDisplay::OnActivate(device::mojom::blink::VRDisplayEventReason reason,
AutoReset<bool> activating(&in_display_activate_, true);
navigator_vr_->DispatchVREvent(VRDisplayEvent::Create(
EventTypeNames::vrdisplayactivate, true, false, this, reason));
- on_handled.Run(pending_present_request_);
+ on_handled.Run(!pending_present_request_ && !is_presenting_);
}
void VRDisplay::OnDeactivate(
« no previous file with comments | « device/vr/vr_service.mojom ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698