OLD | NEW |
1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "modules/vr/VRDisplay.h" | 5 #include "modules/vr/VRDisplay.h" |
6 | 6 |
7 #include "core/css/StylePropertySet.h" | 7 #include "core/css/StylePropertySet.h" |
8 #include "core/dom/DOMException.h" | 8 #include "core/dom/DOMException.h" |
9 #include "core/dom/DocumentUserGestureToken.h" | 9 #include "core/dom/DocumentUserGestureToken.h" |
10 #include "core/dom/FrameRequestCallback.h" | 10 #include "core/dom/FrameRequestCallback.h" |
11 #include "core/dom/Fullscreen.h" | 11 #include "core/dom/Fullscreen.h" |
12 #include "core/dom/ScriptedAnimationController.h" | 12 #include "core/dom/ScriptedAnimationController.h" |
13 #include "core/frame/UseCounter.h" | 13 #include "core/frame/UseCounter.h" |
14 #include "core/inspector/ConsoleMessage.h" | 14 #include "core/inspector/ConsoleMessage.h" |
| 15 #include "core/loader/DocumentLoader.h" |
15 #include "gpu/command_buffer/client/gles2_interface.h" | 16 #include "gpu/command_buffer/client/gles2_interface.h" |
16 #include "modules/vr/NavigatorVR.h" | 17 #include "modules/vr/NavigatorVR.h" |
17 #include "modules/vr/VRController.h" | 18 #include "modules/vr/VRController.h" |
18 #include "modules/vr/VRDisplayCapabilities.h" | 19 #include "modules/vr/VRDisplayCapabilities.h" |
19 #include "modules/vr/VREyeParameters.h" | 20 #include "modules/vr/VREyeParameters.h" |
20 #include "modules/vr/VRFrameData.h" | 21 #include "modules/vr/VRFrameData.h" |
21 #include "modules/vr/VRLayer.h" | 22 #include "modules/vr/VRLayer.h" |
22 #include "modules/vr/VRPose.h" | 23 #include "modules/vr/VRPose.h" |
23 #include "modules/vr/VRStageParameters.h" | 24 #include "modules/vr/VRStageParameters.h" |
24 #include "modules/webgl/WebGLRenderingContextBase.h" | 25 #include "modules/webgl/WebGLRenderingContextBase.h" |
25 #include "platform/Histogram.h" | 26 #include "platform/Histogram.h" |
26 #include "platform/UserGestureIndicator.h" | 27 #include "platform/UserGestureIndicator.h" |
27 #include "public/platform/Platform.h" | 28 #include "public/platform/Platform.h" |
28 #include "wtf/AutoReset.h" | 29 #include "wtf/AutoReset.h" |
29 | 30 |
30 namespace blink { | 31 namespace blink { |
31 | 32 |
32 namespace { | 33 namespace { |
33 | 34 |
34 VREye stringToVREye(const String& whichEye) { | 35 VREye stringToVREye(const String& whichEye) { |
35 if (whichEye == "left") | 36 if (whichEye == "left") |
36 return VREyeLeft; | 37 return VREyeLeft; |
37 if (whichEye == "right") | 38 if (whichEye == "right") |
38 return VREyeRight; | 39 return VREyeRight; |
39 return VREyeNone; | 40 return VREyeNone; |
40 } | 41 } |
41 | 42 |
42 class VRDisplayFrameRequestCallback : public FrameRequestCallback { | 43 class VRDisplayFrameRequestCallback : public FrameRequestCallback { |
43 public: | 44 public: |
44 VRDisplayFrameRequestCallback(VRDisplay* vrDisplay) | 45 VRDisplayFrameRequestCallback(VRDisplay* vrDisplay) : m_vrDisplay(vrDisplay) { |
45 : m_vrDisplay(vrDisplay) {} | 46 m_useLegacyTimeBase = true; |
| 47 } |
46 ~VRDisplayFrameRequestCallback() override {} | 48 ~VRDisplayFrameRequestCallback() override {} |
47 void handleEvent(double highResTimeMs) override { | 49 void handleEvent(double highResTimeMs) override { |
48 m_vrDisplay->serviceScriptedAnimations(highResTimeMs); | 50 Document* doc = m_vrDisplay->document(); |
| 51 if (!doc) |
| 52 return; |
| 53 |
| 54 // Need to divide by 1000 here because serviceScriptedAnimations expects |
| 55 // time to be given in seconds. |
| 56 m_vrDisplay->serviceScriptedAnimations( |
| 57 doc->loader()->timing().pseudoWallTimeToMonotonicTime(highResTimeMs / |
| 58 1000.0)); |
49 } | 59 } |
50 | 60 |
51 DEFINE_INLINE_VIRTUAL_TRACE() { | 61 DEFINE_INLINE_VIRTUAL_TRACE() { |
52 visitor->trace(m_vrDisplay); | 62 visitor->trace(m_vrDisplay); |
53 | 63 |
54 FrameRequestCallback::trace(visitor); | 64 FrameRequestCallback::trace(visitor); |
55 } | 65 } |
56 | 66 |
57 Member<VRDisplay> m_vrDisplay; | 67 Member<VRDisplay> m_vrDisplay; |
58 }; | 68 }; |
(...skipping 538 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
597 // Set the GL state back to what was set by the WebVR application. | 607 // Set the GL state back to what was set by the WebVR application. |
598 m_renderingContext->restoreScissorEnabled(); | 608 m_renderingContext->restoreScissorEnabled(); |
599 m_renderingContext->restoreScissorBox(); | 609 m_renderingContext->restoreScissorBox(); |
600 m_renderingContext->restoreColorMask(); | 610 m_renderingContext->restoreColorMask(); |
601 m_renderingContext->restoreClearColor(); | 611 m_renderingContext->restoreClearColor(); |
602 | 612 |
603 m_display->SubmitFrame(m_framePose.Clone()); | 613 m_display->SubmitFrame(m_framePose.Clone()); |
604 m_canUpdateFramePose = true; | 614 m_canUpdateFramePose = true; |
605 } | 615 } |
606 | 616 |
| 617 Document* VRDisplay::document() { |
| 618 return m_navigatorVR->document(); |
| 619 } |
| 620 |
607 void VRDisplay::OnPresentChange() { | 621 void VRDisplay::OnPresentChange() { |
608 m_navigatorVR->enqueueVREvent(VRDisplayEvent::create( | 622 m_navigatorVR->enqueueVREvent(VRDisplayEvent::create( |
609 EventTypeNames::vrdisplaypresentchange, true, false, this, "")); | 623 EventTypeNames::vrdisplaypresentchange, true, false, this, "")); |
610 } | 624 } |
611 | 625 |
612 void VRDisplay::OnChanged(device::mojom::blink::VRDisplayInfoPtr display) { | 626 void VRDisplay::OnChanged(device::mojom::blink::VRDisplayInfoPtr display) { |
613 update(display); | 627 update(display); |
614 } | 628 } |
615 | 629 |
616 void VRDisplay::OnExitPresent() { | 630 void VRDisplay::OnExitPresent() { |
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
671 visitor->trace(m_capabilities); | 685 visitor->trace(m_capabilities); |
672 visitor->trace(m_stageParameters); | 686 visitor->trace(m_stageParameters); |
673 visitor->trace(m_eyeParametersLeft); | 687 visitor->trace(m_eyeParametersLeft); |
674 visitor->trace(m_eyeParametersRight); | 688 visitor->trace(m_eyeParametersRight); |
675 visitor->trace(m_layer); | 689 visitor->trace(m_layer); |
676 visitor->trace(m_renderingContext); | 690 visitor->trace(m_renderingContext); |
677 visitor->trace(m_scriptedAnimationController); | 691 visitor->trace(m_scriptedAnimationController); |
678 } | 692 } |
679 | 693 |
680 } // namespace blink | 694 } // namespace blink |
OLD | NEW |