| 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 27 matching lines...) Expand all Loading... |
| 38 #include "core/dom/Fullscreen.h" | 38 #include "core/dom/Fullscreen.h" |
| 39 #include "core/dom/shadow/ShadowRoot.h" | 39 #include "core/dom/shadow/ShadowRoot.h" |
| 40 #include "core/events/Event.h" | 40 #include "core/events/Event.h" |
| 41 #include "core/frame/LocalFrame.h" | 41 #include "core/frame/LocalFrame.h" |
| 42 #include "core/frame/Settings.h" | 42 #include "core/frame/Settings.h" |
| 43 #include "core/frame/UseCounter.h" | 43 #include "core/frame/UseCounter.h" |
| 44 #include "core/frame/csp/ContentSecurityPolicy.h" | 44 #include "core/frame/csp/ContentSecurityPolicy.h" |
| 45 #include "core/html/HTMLMediaSource.h" | 45 #include "core/html/HTMLMediaSource.h" |
| 46 #include "core/html/HTMLSourceElement.h" | 46 #include "core/html/HTMLSourceElement.h" |
| 47 #include "core/html/HTMLTrackElement.h" | 47 #include "core/html/HTMLTrackElement.h" |
| 48 #include "core/html/HTMLVideoElement.h" |
| 48 #include "core/html/MediaController.h" | 49 #include "core/html/MediaController.h" |
| 49 #include "core/html/MediaError.h" | 50 #include "core/html/MediaError.h" |
| 50 #include "core/html/MediaFragmentURIParser.h" | 51 #include "core/html/MediaFragmentURIParser.h" |
| 51 #include "core/html/TimeRanges.h" | 52 #include "core/html/TimeRanges.h" |
| 52 #include "core/html/shadow/MediaControls.h" | 53 #include "core/html/shadow/MediaControls.h" |
| 53 #include "core/html/track/AudioTrack.h" | 54 #include "core/html/track/AudioTrack.h" |
| 54 #include "core/html/track/AudioTrackList.h" | 55 #include "core/html/track/AudioTrackList.h" |
| 55 #include "core/html/track/AutomaticTrackSelection.h" | 56 #include "core/html/track/AutomaticTrackSelection.h" |
| 56 #include "core/html/track/CueTimeline.h" | 57 #include "core/html/track/CueTimeline.h" |
| 57 #include "core/html/track/InbandTextTrack.h" | 58 #include "core/html/track/InbandTextTrack.h" |
| (...skipping 3163 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3221 | 3222 |
| 3222 assertShadowRootChildren(shadowRoot); | 3223 assertShadowRootChildren(shadowRoot); |
| 3223 | 3224 |
| 3224 return *textTrackContainer; | 3225 return *textTrackContainer; |
| 3225 } | 3226 } |
| 3226 | 3227 |
| 3227 void HTMLMediaElement::updateTextTrackDisplay() | 3228 void HTMLMediaElement::updateTextTrackDisplay() |
| 3228 { | 3229 { |
| 3229 WTF_LOG(Media, "HTMLMediaElement::updateTextTrackDisplay(%p)", this); | 3230 WTF_LOG(Media, "HTMLMediaElement::updateTextTrackDisplay(%p)", this); |
| 3230 | 3231 |
| 3231 ensureTextTrackContainer().updateDisplay(*this); | 3232 // not really, maybe move some things to HTMLVideoElement instead. |
| 3233 ASSERT(isHTMLVideoElement()); |
| 3234 ensureTextTrackContainer().updateDisplay(toHTMLVideoElement(*this)); |
| 3232 } | 3235 } |
| 3233 | 3236 |
| 3234 void HTMLMediaElement::setClosedCaptionsVisible(bool closedCaptionVisible) | 3237 void HTMLMediaElement::setClosedCaptionsVisible(bool closedCaptionVisible) |
| 3235 { | 3238 { |
| 3236 WTF_LOG(Media, "HTMLMediaElement::setClosedCaptionsVisible(%p, %s)", this, b
oolString(closedCaptionVisible)); | 3239 WTF_LOG(Media, "HTMLMediaElement::setClosedCaptionsVisible(%p, %s)", this, b
oolString(closedCaptionVisible)); |
| 3237 | 3240 |
| 3238 if (!m_player || !hasClosedCaptions()) | 3241 if (!m_player || !hasClosedCaptions()) |
| 3239 return; | 3242 return; |
| 3240 | 3243 |
| 3241 m_closedCaptionsVisible = closedCaptionVisible; | 3244 m_closedCaptionsVisible = closedCaptionVisible; |
| (...skipping 400 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3642 | 3645 |
| 3643 #if ENABLE(WEB_AUDIO) | 3646 #if ENABLE(WEB_AUDIO) |
| 3644 void HTMLMediaElement::clearWeakMembers(Visitor* visitor) | 3647 void HTMLMediaElement::clearWeakMembers(Visitor* visitor) |
| 3645 { | 3648 { |
| 3646 if (!visitor->isAlive(m_audioSourceNode) && audioSourceProvider()) | 3649 if (!visitor->isAlive(m_audioSourceNode) && audioSourceProvider()) |
| 3647 audioSourceProvider()->setClient(nullptr); | 3650 audioSourceProvider()->setClient(nullptr); |
| 3648 } | 3651 } |
| 3649 #endif | 3652 #endif |
| 3650 | 3653 |
| 3651 } | 3654 } |
| OLD | NEW |