Updated VRService to match the latest Blink WebVR interface.

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/inspector/ConsoleMessage.h"
 #include "modules/vr/NavigatorVR.h"
 #include "modules/vr/VRController.h"
@@ skipping 11 matching lines @@
 
 VREye stringToVREye(const String& whichEye)
 {
     if (whichEye == "left")
         return VREyeLeft;
     if (whichEye == "right")
         return VREyeRight;
     return VREyeNone;
 }
 
-} // namepspace
+} // namespace
 
 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())
 {
 }
 
 VRDisplay::~VRDisplay()
 {
 }
 
 VRController* VRDisplay::controller()
 {
     return m_navigatorVR->controller();
 }
 
-void VRDisplay::update(const mojom::blink::VRDeviceInfoPtr& device)
+void VRDisplay::update(const mojom::blink::VRDisplayPtr& display)
 {
-    m_displayId = device->index;
-    m_displayName = device->deviceName;
+    m_displayId = display->index;
+    m_displayName = display->displayName;
     m_isConnected = true;
 
-    // Defaults until the VR service has been update to query these.
-    m_capabilities->setHasOrientation(true);
-    m_capabilities->setHasPosition(false);
-    m_capabilities->setHasExternalDisplay(false);
-    m_capabilities->setCanPresent(false);
-    m_capabilities->setMaxLayers(0);
+    m_capabilities->setHasOrientation(display->capabilities->hasOrientation);
+    m_capabilities->setHasPosition(display->capabilities->hasPosition);
+    m_capabilities->setHasExternalDisplay(display->capabilities->hasExternalDisplay);
+    m_capabilities->setCanPresent(display->capabilities->canPresent);
+    m_capabilities->setMaxLayers(display->capabilities->canPresent ? 1 : 0);
 
-    if (!device->hmdInfo.is_null()) {
-        m_eyeParametersLeft->update(device->hmdInfo->leftEye);
-        m_eyeParametersRight->update(device->hmdInfo->rightEye);
+    m_eyeParametersLeft->update(display->leftEye);
+    m_eyeParametersRight->update(display->rightEye);
+
+    if (!display->stageParameters.is_null()) {
+        if (!m_stageParameters)
+            m_stageParameters = new VRStageParameters();
+        m_stageParameters->update(display->stageParameters);
+    } else {
+        m_stageParameters = nullptr;
     }
-
-    m_stageParameters = nullptr;
 }
 
 VRPose* VRDisplay::getPose()
 {
     if (m_canUpdateFramePose) {
         m_framePose = getImmediatePose();
         Platform::current()->currentThread()->addTaskObserver(this);
         m_canUpdateFramePose = false;
     }
 
     return m_framePose;
 }
 
 VRPose* VRDisplay::getImmediatePose()
 {
     VRPose* pose = VRPose::create();
-    pose->setPose(controller()->getSensorState(m_displayId));
+    pose->setPose(controller()->getPose(m_displayId));
     return pose;
 }
 
 void VRDisplay::resetPose()
 {
-    controller()->resetSensor(m_displayId);
+    controller()->resetPose(m_displayId);
 }
 
 VREyeParameters* VRDisplay::getEyeParameters(const String& whichEye)
 {
     switch (stringToVREye(whichEye)) {
     case VREyeLeft:
         return m_eyeParametersLeft;
     case VREyeRight:
         return m_eyeParametersRight;
     default:
@@ skipping 80 matching lines @@
 {
     visitor->trace(m_navigatorVR);
     visitor->trace(m_capabilities);
     visitor->trace(m_stageParameters);
     visitor->trace(m_eyeParametersLeft);
     visitor->trace(m_eyeParametersRight);
     visitor->trace(m_framePose);
 }
 
 } // namespace blink