Adjust the timestamp for VRDisplay.requestAnimationFrame calls

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/css/StylePropertySet.h"
 #include "core/dom/DOMException.h"
 #include "core/dom/DocumentUserGestureToken.h"
 #include "core/dom/FrameRequestCallback.h"
 #include "core/dom/Fullscreen.h"
 #include "core/dom/ScriptedAnimationController.h"
 #include "core/frame/UseCounter.h"
 #include "core/inspector/ConsoleMessage.h"
+#include "core/loader/DocumentLoader.h"
 #include "gpu/command_buffer/client/gles2_interface.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"
@@ skipping 13 matching lines @@
     return VREyeRight;
   return VREyeNone;
 }
 
 class VRDisplayFrameRequestCallback : public FrameRequestCallback {
  public:
   VRDisplayFrameRequestCallback(VRDisplay* vrDisplay)
       : m_vrDisplay(vrDisplay) {}
   ~VRDisplayFrameRequestCallback() override {}
   void handleEvent(double highResTimeMs) override {
-    m_vrDisplay->serviceScriptedAnimations(highResTimeMs);
+    Document* doc = m_vrDisplay->document();
+    if (!doc)
+      return;
+
+    // Need to devide by 1000 here because serviceScriptedAnimations expects

[cjgrant, 2016/11/29 20:02:02]

divide

+    // time to be given in seconds.
+    m_vrDisplay->serviceScriptedAnimations(
+        doc->loader()->timing().pseudoWallTimeToMonotonicTime(highResTimeMs /
+                                                              1000.0));
   }
 
   DEFINE_INLINE_VIRTUAL_TRACE() {
     visitor->trace(m_vrDisplay);
 
     FrameRequestCallback::trace(visitor);
   }
 
   Member<VRDisplay> m_vrDisplay;
 };
@@ skipping 121 matching lines @@
 int VRDisplay::requestAnimationFrame(FrameRequestCallback* callback) {
   Document* doc = m_navigatorVR->document();
   if (!doc)
     return 0;
 
   if (!m_animationCallbackRequested) {
     doc->requestAnimationFrame(new VRDisplayFrameRequestCallback(this));
     m_animationCallbackRequested = true;
   }
 
-  callback->m_useLegacyTimeBase = false;
+  callback->m_useLegacyTimeBase = true;

[klausw, 2016/11/29 20:50:27]

Why are you changing this too? Add a comment?

   return ensureScriptedAnimationController(doc).registerCallback(callback);
 }
 
 void VRDisplay::cancelAnimationFrame(int id) {
   if (!m_scriptedAnimationController)
     return;
   m_scriptedAnimationController->cancelCallback(id);
 }
 
 void VRDisplay::OnBlur() {
@@ skipping 396 matching lines @@
   // Set the GL state back to what was set by the WebVR application.
   m_renderingContext->restoreScissorEnabled();
   m_renderingContext->restoreScissorBox();
   m_renderingContext->restoreColorMask();
   m_renderingContext->restoreClearColor();
 
   m_display->SubmitFrame(m_framePose.Clone());
   m_canUpdateFramePose = true;
 }
 
+Document* VRDisplay::document() {
+  return m_navigatorVR->document();
+}
+
 void VRDisplay::OnPresentChange() {
   m_navigatorVR->enqueueVREvent(VRDisplayEvent::create(
       EventTypeNames::vrdisplaypresentchange, true, false, this, ""));
 }
 
 void VRDisplay::OnChanged(device::mojom::blink::VRDisplayInfoPtr display) {
   update(display);
 }
 
 void VRDisplay::OnExitPresent() {
@@ skipping 54 matching lines @@
   visitor->trace(m_capabilities);
   visitor->trace(m_stageParameters);
   visitor->trace(m_eyeParametersLeft);
   visitor->trace(m_eyeParametersRight);
   visitor->trace(m_layer);
   visitor->trace(m_renderingContext);
   visitor->trace(m_scriptedAnimationController);
 }
 
 }  // namespace blink