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/dom/DOMException.h" | 7 #include "core/dom/DOMException.h" |
8 #include "core/dom/FrameRequestCallback.h" | 8 #include "core/dom/FrameRequestCallback.h" |
9 #include "core/dom/Fullscreen.h" | 9 #include "core/dom/Fullscreen.h" |
10 #include "core/dom/ScriptedAnimationController.h" | 10 #include "core/dom/ScriptedAnimationController.h" |
(...skipping 264 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
275 // allowed outside a user gesture so that the presented content may be | 275 // allowed outside a user gesture so that the presented content may be |
276 // updated. | 276 // updated. |
277 if (firstPresent && !UserGestureIndicator::utilizeUserGesture()) { | 277 if (firstPresent && !UserGestureIndicator::utilizeUserGesture()) { |
278 DOMException* exception = DOMException::create( | 278 DOMException* exception = DOMException::create( |
279 InvalidStateError, "API can only be initiated by a user gesture."); | 279 InvalidStateError, "API can only be initiated by a user gesture."); |
280 resolver->reject(exception); | 280 resolver->reject(exception); |
281 ReportPresentationResult(PresentationResult::NotInitiatedByUserGesture); | 281 ReportPresentationResult(PresentationResult::NotInitiatedByUserGesture); |
282 return promise; | 282 return promise; |
283 } | 283 } |
284 | 284 |
285 m_isPresenting = false; | |
286 | |
287 // A valid number of layers must be provided in order to present. | 285 // A valid number of layers must be provided in order to present. |
288 if (layers.size() == 0 || layers.size() > m_capabilities->maxLayers()) { | 286 if (layers.size() == 0 || layers.size() > m_capabilities->maxLayers()) { |
289 forceExitPresent(); | 287 forceExitPresent(); |
290 DOMException* exception = | 288 DOMException* exception = |
291 DOMException::create(InvalidStateError, "Invalid number of layers."); | 289 DOMException::create(InvalidStateError, "Invalid number of layers."); |
292 resolver->reject(exception); | 290 resolver->reject(exception); |
293 ReportPresentationResult(PresentationResult::InvalidNumberOfLayers); | 291 ReportPresentationResult(PresentationResult::InvalidNumberOfLayers); |
294 return promise; | 292 return promise; |
295 } | 293 } |
296 | 294 |
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
342 Fullscreen::UnprefixedRequest); | 340 Fullscreen::UnprefixedRequest); |
343 | 341 |
344 // Check to see if the canvas is still the current fullscreen | 342 // Check to see if the canvas is still the current fullscreen |
345 // element once per second. | 343 // element once per second. |
346 m_fullscreenCheckTimer.startRepeating(1.0, BLINK_FROM_HERE); | 344 m_fullscreenCheckTimer.startRepeating(1.0, BLINK_FROM_HERE); |
347 } | 345 } |
348 | 346 |
349 if (firstPresent) { | 347 if (firstPresent) { |
350 bool secureContext = scriptState->getExecutionContext()->isSecureContext(); | 348 bool secureContext = scriptState->getExecutionContext()->isSecureContext(); |
351 if (!m_display) { | 349 if (!m_display) { |
| 350 forceExitPresent(); |
352 DOMException* exception = DOMException::create( | 351 DOMException* exception = DOMException::create( |
353 InvalidStateError, "The service is no longer active."); | 352 InvalidStateError, "The service is no longer active."); |
354 resolver->reject(exception); | 353 resolver->reject(exception); |
355 return promise; | 354 return promise; |
356 } | 355 } |
357 m_display->RequestPresent( | 356 m_display->RequestPresent( |
358 secureContext, convertToBaseCallback(WTF::bind( | 357 secureContext, convertToBaseCallback(WTF::bind( |
359 &VRDisplay::onPresentComplete, wrapPersistent(this), | 358 &VRDisplay::onPresentComplete, wrapPersistent(this), |
360 wrapPersistent(resolver)))); | 359 wrapPersistent(resolver)))); |
361 } else { | 360 } else { |
(...skipping 249 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
611 visitor->trace(m_capabilities); | 610 visitor->trace(m_capabilities); |
612 visitor->trace(m_stageParameters); | 611 visitor->trace(m_stageParameters); |
613 visitor->trace(m_eyeParametersLeft); | 612 visitor->trace(m_eyeParametersLeft); |
614 visitor->trace(m_eyeParametersRight); | 613 visitor->trace(m_eyeParametersRight); |
615 visitor->trace(m_layer); | 614 visitor->trace(m_layer); |
616 visitor->trace(m_renderingContext); | 615 visitor->trace(m_renderingContext); |
617 visitor->trace(m_scriptedAnimationController); | 616 visitor->trace(m_scriptedAnimationController); |
618 } | 617 } |
619 | 618 |
620 } // namespace blink | 619 } // namespace blink |
OLD | NEW |