Isolate a presenting VR device from pages other than the one presenting.

third_party/WebKit/Source/modules/vr/VRController.cpp

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "modules/vr/VRController.h"
 
 #include "core/dom/DOMException.h"
 #include "core/dom/Document.h"
 #include "core/frame/LocalFrame.h"
 #include "modules/vr/NavigatorVR.h"
@@ skipping 40 matching lines @@
 }
 
 void VRController::resetPose(unsigned index)
 {
     if (!m_service)
         return;
 
     m_service->ResetPose(index);
 }
 
-void VRController::requestPresent(unsigned index)
+void VRController::requestPresent(ScriptPromiseResolver* resolver, unsigned index)
 {
-    if (!m_service)
+    if (!m_service) {
+        DOMException* exception = DOMException::create(InvalidStateError, "The service is no longer active.");
+        resolver->reject(exception);
         return;
+    }
 
-    m_service->RequestPresent(index);
+    m_service->RequestPresent(index, convertToBaseCallback(WTF::bind(&VRController::onPresentComplete, wrapPersistent(this), wrapPersistent(resolver), index)));
 }
 
 void VRController::exitPresent(unsigned index)
 {
     if (!m_service)
         return;
 
     m_service->ExitPresent(index);
 }
 
-void VRController::submitFrame(unsigned index)
+void VRController::submitFrame(unsigned index, device::blink::VRPosePtr pose)
 {
     if (!m_service)
         return;
 
-    m_service->SubmitFrame(index);
+    m_service->SubmitFrame(index, std::move(pose));
 }
 
 void VRController::updateLayerBounds(unsigned index,
     device::blink::VRLayerBoundsPtr leftBounds,
     device::blink::VRLayerBoundsPtr rightBounds)
 {
     if (!m_service)
         return;
 
     m_service->UpdateLayerBounds(index, std::move(leftBounds), std::move(rightBounds));
@@ skipping 40 matching lines @@
 {
     VRDisplayVector outDisplays = updateDisplays(std::move(displays));
 
     std::unique_ptr<VRGetDevicesCallback> callback = m_pendingGetDevicesCallbacks.takeFirst();
     if (!callback)
         return;
 
     callback->onSuccess(outDisplays);
 }
 
+void VRController::onPresentComplete(ScriptPromiseResolver* resolver, unsigned index, bool success)
+{
+    VRDisplay* vrDisplay = getDisplayForIndex(index);
+    if (!vrDisplay) {
+        DOMException* exception = DOMException::create(InvalidStateError, "VRDisplay not found.");
+        resolver->reject(exception);

[haraken, 2016/09/14 00:08:20]

Don't we need to add 'return' here?

[bajones, 2016/09/14 00:30:03]

Yes, we do. Thanks! Fixed.

+    }
+
+    if (success) {
+        vrDisplay->beginPresent(resolver);
+    } else {
+        vrDisplay->forceExitPresent();
+        DOMException* exception = DOMException::create(NotAllowedError, "Presentation request was denied.");
+        resolver->reject(exception);
+    }
+}
+
 void VRController::OnDisplayChanged(device::blink::VRDisplayPtr display)
 {
     VRDisplay* vrDisplay = getDisplayForIndex(display->index);
     if (!vrDisplay)
         return;
 
     vrDisplay->update(display);
 }
 
+void VRController::OnExitPresent(unsigned index)
+{
+    VRDisplay* vrDisplay = getDisplayForIndex(index);
+    if (vrDisplay)
+        vrDisplay->forceExitPresent();
+}
+
 void VRController::contextDestroyed()
 {
     // If the document context was destroyed, shut down the client connection
     // and never call the mojo service again.
     m_binding.Close();
     m_service.reset();
 
     // The context is not automatically cleared, so do it manually.
     ContextLifecycleObserver::clearContext();
 }
 
 DEFINE_TRACE(VRController)
 {
     visitor->trace(m_navigatorVR);
     visitor->trace(m_displays);
 
     ContextLifecycleObserver::trace(visitor);
 }
 
 } // namespace blink