Update WebVR interface to match the 1.1 spec

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

 // Copyright 2016 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/VRDisplay.h"
 
 #include "core/dom/DOMException.h"
 #include "core/dom/Fullscreen.h"
 #include "core/inspector/ConsoleMessage.h"
 #include "modules/vr/NavigatorVR.h"
 #include "modules/vr/VRController.h"
 #include "modules/vr/VRDisplayCapabilities.h"
 #include "modules/vr/VREyeParameters.h"
+#include "modules/vr/VRFrameData.h"
 #include "modules/vr/VRLayer.h"
 #include "modules/vr/VRPose.h"
 #include "modules/vr/VRStageParameters.h"
 #include "modules/webgl/WebGLRenderingContextBase.h"
 #include "platform/UserGestureIndicator.h"
 #include "public/platform/Platform.h"
 
 namespace blink {
 
 namespace {
@@ skipping 11 matching lines @@
 
 VRDisplay::VRDisplay(NavigatorVR* navigatorVR)
     : m_navigatorVR(navigatorVR)
     , m_displayId(0)
     , m_isConnected(false)
     , m_isPresenting(false)
     , m_canUpdateFramePose(true)
     , m_capabilities(new VRDisplayCapabilities())
     , m_eyeParametersLeft(new VREyeParameters())
     , m_eyeParametersRight(new VREyeParameters())
+    , m_depthNear(0.01)
+    , m_depthFar(10000.0)
     , m_fullscreenCheckTimer(this, &VRDisplay::onFullscreenCheck)
 {
 }
 
 VRDisplay::~VRDisplay()
 {
 }
 
 VRController* VRDisplay::controller()
 {
@@ skipping 17 matching lines @@
 
     if (!display->stageParameters.is_null()) {
         if (!m_stageParameters)
             m_stageParameters = new VRStageParameters();
         m_stageParameters->update(display->stageParameters);
     } else {
         m_stageParameters = nullptr;
     }
 }
 
+bool VRDisplay::getFrameData(VRFrameData* frameData)
+{
+    updatePose();
+
+    if (!frameData)
+        return false;
+
+    if (m_depthNear == m_depthFar)
+        return false;
+
+    return frameData->update(m_framePose, m_eyeParametersLeft, m_eyeParametersRight, m_depthNear, m_depthFar);
+}
+
 VRPose* VRDisplay::getPose()
 {
-    if (m_canUpdateFramePose) {
-        m_framePose = getImmediatePose();
-        Platform::current()->currentThread()->addTaskObserver(this);
-        m_canUpdateFramePose = false;
-    }
+    updatePose();
 
-    return m_framePose;
+    if (!m_framePose)
+        return nullptr;
+
+    VRPose* pose = VRPose::create();
+    pose->setPose(m_framePose);
+    return pose;
 }
 
-VRPose* VRDisplay::getImmediatePose()
+void VRDisplay::updatePose()
 {
-    VRPose* pose = VRPose::create();
-    pose->setPose(controller()->getPose(m_displayId));
-    return pose;
+    if (m_canUpdateFramePose) {
+        m_framePose = controller()->getPose(m_displayId);
+        if (m_isPresenting)
+            m_canUpdateFramePose = false;
+    }
 }
 
 void VRDisplay::resetPose()
 {
     controller()->resetPose(m_displayId);
 }
 
 VREyeParameters* VRDisplay::getEyeParameters(const String& whichEye)
 {
     switch (stringToVREye(whichEye)) {
@@ skipping 153 matching lines @@
 {
     HeapVector<VRLayer> layers;
 
     if (m_isPresenting) {
         layers.append(m_layer);
     }
 
     return layers;
 }
 
-void VRDisplay::submitFrame(VRPose* pose)
+void VRDisplay::submitFrame()
 {
     controller()->submitFrame(m_displayId);
-}
-
-void VRDisplay::didProcessTask()
-{
-    // Pose should be stable until control is returned to the user agent.
-    if (!m_canUpdateFramePose) {
-        Platform::current()->currentThread()->removeTaskObserver(this);
-        m_canUpdateFramePose = true;
-    }
+    m_canUpdateFramePose = true;
 }
 
 void VRDisplay::onFullscreenCheck(TimerBase*)
 {
     // TODO: This is a temporary measure to track if fullscreen mode has been
     // exited by the UA. If so we need to end VR presentation. Soon we won't
     // depend on the Fullscreen API to fake VR presentation, so this will
     // become unnessecary. Until that point, though, this seems preferable to
     // adding a bunch of notification plumbing to Fullscreen.
     if (!Fullscreen::isCurrentFullScreenElement(*m_layer.source())) {
         m_isPresenting = false;
         m_navigatorVR->fireVRDisplayPresentChange(this);
         m_fullscreenCheckTimer.stop();
         controller()->exitPresent(m_displayId);
     }
 }
 
 DEFINE_TRACE(VRDisplay)
 {
     visitor->trace(m_navigatorVR);
     visitor->trace(m_capabilities);
     visitor->trace(m_stageParameters);
     visitor->trace(m_eyeParametersLeft);
     visitor->trace(m_eyeParametersRight);
-    visitor->trace(m_framePose);
     visitor->trace(m_layer);
 }
 
 } // namespace blink