| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights
reserved. | 2 * Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights
reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions | 5 * modification, are permitted provided that the following conditions |
| 6 * are met: | 6 * are met: |
| 7 * 1. Redistributions of source code must retain the above copyright | 7 * 1. Redistributions of source code must retain the above copyright |
| 8 * notice, this list of conditions and the following disclaimer. | 8 * notice, this list of conditions and the following disclaimer. |
| 9 * 2. Redistributions in binary form must reproduce the above copyright | 9 * 2. Redistributions in binary form must reproduce the above copyright |
| 10 * notice, this list of conditions and the following disclaimer in the | 10 * notice, this list of conditions and the following disclaimer in the |
| (...skipping 3504 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3515 void HTMLMediaElement::exitFullscreen() | 3515 void HTMLMediaElement::exitFullscreen() |
| 3516 { | 3516 { |
| 3517 LOG(Media, "HTMLMediaElement::exitFullscreen"); | 3517 LOG(Media, "HTMLMediaElement::exitFullscreen"); |
| 3518 | 3518 |
| 3519 if (document()->settings() && document()->settings()->fullScreenEnabled() &&
isFullscreen()) | 3519 if (document()->settings() && document()->settings()->fullScreenEnabled() &&
isFullscreen()) |
| 3520 FullscreenElementStack::from(document())->webkitCancelFullScreen(); | 3520 FullscreenElementStack::from(document())->webkitCancelFullScreen(); |
| 3521 } | 3521 } |
| 3522 | 3522 |
| 3523 void HTMLMediaElement::didBecomeFullscreenElement() | 3523 void HTMLMediaElement::didBecomeFullscreenElement() |
| 3524 { | 3524 { |
| 3525 Element::didBecomeFullscreenElement(); |
| 3525 if (hasMediaControls()) | 3526 if (hasMediaControls()) |
| 3526 mediaControls()->enteredFullscreen(); | 3527 mediaControls()->enteredFullscreen(); |
| 3527 } | 3528 } |
| 3528 | 3529 |
| 3529 void HTMLMediaElement::willStopBeingFullscreenElement() | 3530 void HTMLMediaElement::willStopBeingFullscreenElement() |
| 3530 { | 3531 { |
| 3531 if (hasMediaControls()) | 3532 if (hasMediaControls()) |
| 3532 mediaControls()->exitedFullscreen(); | 3533 mediaControls()->exitedFullscreen(); |
| 3534 Element::willStopBeingFullscreenElement(); |
| 3533 } | 3535 } |
| 3534 | 3536 |
| 3535 WebKit::WebLayer* HTMLMediaElement::platformLayer() const | 3537 WebKit::WebLayer* HTMLMediaElement::platformLayer() const |
| 3536 { | 3538 { |
| 3537 return m_player ? m_player->platformLayer() : 0; | 3539 return m_player ? m_player->platformLayer() : 0; |
| 3538 } | 3540 } |
| 3539 | 3541 |
| 3540 bool HTMLMediaElement::hasClosedCaptions() const | 3542 bool HTMLMediaElement::hasClosedCaptions() const |
| 3541 { | 3543 { |
| 3542 if (RuntimeEnabledFeatures::videoTrackEnabled() && m_textTracks) { | 3544 if (RuntimeEnabledFeatures::videoTrackEnabled() && m_textTracks) { |
| (...skipping 407 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3950 { | 3952 { |
| 3951 m_restrictions = NoRestrictions; | 3953 m_restrictions = NoRestrictions; |
| 3952 } | 3954 } |
| 3953 | 3955 |
| 3954 void HTMLMediaElement::mediaPlayerScheduleLayerUpdate() | 3956 void HTMLMediaElement::mediaPlayerScheduleLayerUpdate() |
| 3955 { | 3957 { |
| 3956 scheduleLayerUpdate(); | 3958 scheduleLayerUpdate(); |
| 3957 } | 3959 } |
| 3958 | 3960 |
| 3959 } | 3961 } |
| OLD | NEW |