| 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" |
| (...skipping 298 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 309 bool secureContext = scriptState->getExecutionContext()->isSecureContext(); | 309 bool secureContext = scriptState->getExecutionContext()->isSecureContext(); |
| 310 if (!m_display) { | 310 if (!m_display) { |
| 311 forceExitPresent(); | 311 forceExitPresent(); |
| 312 DOMException* exception = DOMException::create( | 312 DOMException* exception = DOMException::create( |
| 313 InvalidStateError, "The service is no longer active."); | 313 InvalidStateError, "The service is no longer active."); |
| 314 resolver->reject(exception); | 314 resolver->reject(exception); |
| 315 return promise; | 315 return promise; |
| 316 } | 316 } |
| 317 | 317 |
| 318 m_pendingPresentResolvers.append(resolver); | 318 m_pendingPresentResolvers.append(resolver); |
| 319 m_display->RequestPresent(secureContext, convertToBaseCallback(WTF::bind( | 319 m_display->RequestPresent( |
| 320 &VRDisplay::onPresentComplete, | 320 secureContext, |
| 321 wrapPersistent(this)))); | 321 convertToBaseCallback( |
| 322 WTF::bind(&VRDisplay::onPresentComplete, wrapPersistent(this)))); |
| 322 } else { | 323 } else { |
| 323 updateLayerBounds(); | 324 updateLayerBounds(); |
| 324 resolver->resolve(); | 325 resolver->resolve(); |
| 325 ReportPresentationResult(PresentationResult::SuccessAlreadyPresenting); | 326 ReportPresentationResult(PresentationResult::SuccessAlreadyPresenting); |
| 326 } | 327 } |
| 327 | 328 |
| 328 return promise; | 329 return promise; |
| 329 } | 330 } |
| 330 | 331 |
| 331 void VRDisplay::onPresentComplete(bool success) { | 332 void VRDisplay::onPresentComplete(bool success) { |
| (...skipping 433 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 765 visitor->trace(m_stageParameters); | 766 visitor->trace(m_stageParameters); |
| 766 visitor->trace(m_eyeParametersLeft); | 767 visitor->trace(m_eyeParametersLeft); |
| 767 visitor->trace(m_eyeParametersRight); | 768 visitor->trace(m_eyeParametersRight); |
| 768 visitor->trace(m_layer); | 769 visitor->trace(m_layer); |
| 769 visitor->trace(m_renderingContext); | 770 visitor->trace(m_renderingContext); |
| 770 visitor->trace(m_scriptedAnimationController); | 771 visitor->trace(m_scriptedAnimationController); |
| 771 visitor->trace(m_pendingPresentResolvers); | 772 visitor->trace(m_pendingPresentResolvers); |
| 772 } | 773 } |
| 773 | 774 |
| 774 } // namespace blink | 775 } // namespace blink |
| OLD | NEW |