| 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/ScriptedAnimationController.h" | 11 #include "core/dom/ScriptedAnimationController.h" |
| 12 #include "core/dom/TaskRunnerHelper.h" | 12 #include "core/dom/TaskRunnerHelper.h" |
| 13 #include "core/frame/FrameView.h" | 13 #include "core/frame/FrameView.h" |
| 14 #include "core/frame/ImageBitmap.h" | 14 #include "core/frame/ImageBitmap.h" |
| 15 #include "core/frame/UseCounter.h" | 15 #include "core/frame/UseCounter.h" |
| 16 #include "core/inspector/ConsoleMessage.h" | 16 #include "core/inspector/ConsoleMessage.h" |
| 17 #include "core/layout/LayoutView.h" | 17 #include "core/layout/LayoutView.h" |
| 18 #include "core/layout/compositing/PaintLayerCompositor.h" | 18 #include "core/layout/compositing/PaintLayerCompositor.h" |
| 19 #include "core/loader/DocumentLoader.h" | 19 #include "core/loader/DocumentLoader.h" |
| 20 #include "gpu/command_buffer/client/gles2_interface.h" | 20 #include "gpu/command_buffer/client/gles2_interface.h" |
| 21 #include "gpu/command_buffer/common/mailbox_holder.h" | 21 #include "gpu/command_buffer/common/mailbox_holder.h" |
| 22 #include "modules/EventTargetModules.h" | 22 #include "modules/EventTargetModules.h" |
| 23 #include "modules/vr/NavigatorVR.h" | 23 #include "modules/vr/NavigatorVR.h" |
| 24 #include "modules/vr/VRController.h" | 24 #include "modules/vr/VRController.h" |
| 25 #include "modules/vr/VRDisplayCapabilities.h" | 25 #include "modules/vr/VRDisplayCapabilities.h" |
| 26 #include "modules/vr/VREyeParameters.h" | 26 #include "modules/vr/VREyeParameters.h" |
| 27 #include "modules/vr/VRFrameData.h" | 27 #include "modules/vr/VRFrameData.h" |
| 28 #include "modules/vr/VRLayer.h" | 28 #include "modules/vr/VRLayerInit.h" |
| 29 #include "modules/vr/VRPose.h" | 29 #include "modules/vr/VRPose.h" |
| 30 #include "modules/vr/VRStageParameters.h" | 30 #include "modules/vr/VRStageParameters.h" |
| 31 #include "modules/webgl/WebGLRenderingContextBase.h" | 31 #include "modules/webgl/WebGLRenderingContextBase.h" |
| 32 #include "platform/Histogram.h" | 32 #include "platform/Histogram.h" |
| 33 #include "platform/UserGestureIndicator.h" | 33 #include "platform/UserGestureIndicator.h" |
| 34 #include "platform/instrumentation/tracing/TraceEvent.h" | 34 #include "platform/instrumentation/tracing/TraceEvent.h" |
| 35 #include "public/platform/Platform.h" | 35 #include "public/platform/Platform.h" |
| 36 #include "wtf/AutoReset.h" | 36 #include "wtf/AutoReset.h" |
| 37 #include "wtf/Time.h" | 37 #include "wtf/Time.h" |
| 38 | 38 |
| (...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 192 // one to declare that requestPresent was called, and one for the | 192 // one to declare that requestPresent was called, and one for the |
| 193 // result. | 193 // result. |
| 194 DEFINE_STATIC_LOCAL( | 194 DEFINE_STATIC_LOCAL( |
| 195 EnumerationHistogram, vrPresentationResultHistogram, | 195 EnumerationHistogram, vrPresentationResultHistogram, |
| 196 ("VRDisplayPresentResult", | 196 ("VRDisplayPresentResult", |
| 197 static_cast<int>(PresentationResult::PresentationResultMax))); | 197 static_cast<int>(PresentationResult::PresentationResultMax))); |
| 198 vrPresentationResultHistogram.count(static_cast<int>(result)); | 198 vrPresentationResultHistogram.count(static_cast<int>(result)); |
| 199 } | 199 } |
| 200 | 200 |
| 201 ScriptPromise VRDisplay::requestPresent(ScriptState* scriptState, | 201 ScriptPromise VRDisplay::requestPresent(ScriptState* scriptState, |
| 202 const HeapVector<VRLayer>& layers) { | 202 const HeapVector<VRLayerInit>& layers) { |
| 203 ExecutionContext* executionContext = scriptState->getExecutionContext(); | 203 ExecutionContext* executionContext = scriptState->getExecutionContext(); |
| 204 UseCounter::count(executionContext, UseCounter::VRRequestPresent); | 204 UseCounter::count(executionContext, UseCounter::VRRequestPresent); |
| 205 if (!executionContext->isSecureContext()) { | 205 if (!executionContext->isSecureContext()) { |
| 206 UseCounter::count(executionContext, | 206 UseCounter::count(executionContext, |
| 207 UseCounter::VRRequestPresentInsecureOrigin); | 207 UseCounter::VRRequestPresentInsecureOrigin); |
| 208 } | 208 } |
| 209 | 209 |
| 210 ReportPresentationResult(PresentationResult::Requested); | 210 ReportPresentationResult(PresentationResult::Requested); |
| 211 | 211 |
| 212 ScriptPromiseResolver* resolver = ScriptPromiseResolver::create(scriptState); | 212 ScriptPromiseResolver* resolver = ScriptPromiseResolver::create(scriptState); |
| (...skipping 251 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 464 rightBounds->width = 0.5f; | 464 rightBounds->width = 0.5f; |
| 465 rightBounds->height = 1.0f; | 465 rightBounds->height = 1.0f; |
| 466 m_layer.setRightBounds({0.5f, 0.0f, 0.5f, 1.0f}); | 466 m_layer.setRightBounds({0.5f, 0.0f, 0.5f, 1.0f}); |
| 467 } | 467 } |
| 468 | 468 |
| 469 m_display->UpdateLayerBounds(m_vrFrameId, std::move(leftBounds), | 469 m_display->UpdateLayerBounds(m_vrFrameId, std::move(leftBounds), |
| 470 std::move(rightBounds), m_sourceWidth, | 470 std::move(rightBounds), m_sourceWidth, |
| 471 m_sourceHeight); | 471 m_sourceHeight); |
| 472 } | 472 } |
| 473 | 473 |
| 474 HeapVector<VRLayer> VRDisplay::getLayers() { | 474 HeapVector<VRLayerInit> VRDisplay::getLayers() { |
| 475 HeapVector<VRLayer> layers; | 475 HeapVector<VRLayerInit> layers; |
| 476 | 476 |
| 477 if (m_isPresenting) { | 477 if (m_isPresenting) { |
| 478 layers.push_back(m_layer); | 478 layers.push_back(m_layer); |
| 479 } | 479 } |
| 480 | 480 |
| 481 return layers; | 481 return layers; |
| 482 } | 482 } |
| 483 | 483 |
| 484 void VRDisplay::submitFrame() { | 484 void VRDisplay::submitFrame() { |
| 485 if (!m_display) | 485 if (!m_display) |
| (...skipping 293 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 779 visitor->trace(m_stageParameters); | 779 visitor->trace(m_stageParameters); |
| 780 visitor->trace(m_eyeParametersLeft); | 780 visitor->trace(m_eyeParametersLeft); |
| 781 visitor->trace(m_eyeParametersRight); | 781 visitor->trace(m_eyeParametersRight); |
| 782 visitor->trace(m_layer); | 782 visitor->trace(m_layer); |
| 783 visitor->trace(m_renderingContext); | 783 visitor->trace(m_renderingContext); |
| 784 visitor->trace(m_scriptedAnimationController); | 784 visitor->trace(m_scriptedAnimationController); |
| 785 visitor->trace(m_pendingPresentResolvers); | 785 visitor->trace(m_pendingPresentResolvers); |
| 786 } | 786 } |
| 787 | 787 |
| 788 } // namespace blink | 788 } // namespace blink |
| OLD | NEW |