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 3549 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3560 | 3560 |
3561 void HTMLMediaElement::setClosedCaptionsVisible(bool closedCaptionVisible) | 3561 void HTMLMediaElement::setClosedCaptionsVisible(bool closedCaptionVisible) |
3562 { | 3562 { |
3563 WTF_LOG(Media, "HTMLMediaElement::setClosedCaptionsVisible(%s)", boolString(
closedCaptionVisible)); | 3563 WTF_LOG(Media, "HTMLMediaElement::setClosedCaptionsVisible(%s)", boolString(
closedCaptionVisible)); |
3564 | 3564 |
3565 if (!m_player || !hasClosedCaptions()) | 3565 if (!m_player || !hasClosedCaptions()) |
3566 return; | 3566 return; |
3567 | 3567 |
3568 m_closedCaptionsVisible = closedCaptionVisible; | 3568 m_closedCaptionsVisible = closedCaptionVisible; |
3569 | 3569 |
| 3570 markCaptionAndSubtitleTracksAsUnconfigured(); |
3570 m_processingPreferenceChange = true; | 3571 m_processingPreferenceChange = true; |
3571 markCaptionAndSubtitleTracksAsUnconfigured(); | 3572 configureTextTracks(); |
3572 m_processingPreferenceChange = false; | 3573 m_processingPreferenceChange = false; |
3573 | 3574 |
3574 updateTextTrackDisplay(); | 3575 updateTextTrackDisplay(); |
3575 } | 3576 } |
3576 | 3577 |
3577 unsigned HTMLMediaElement::webkitAudioDecodedByteCount() const | 3578 unsigned HTMLMediaElement::webkitAudioDecodedByteCount() const |
3578 { | 3579 { |
3579 if (!webMediaPlayer()) | 3580 if (!webMediaPlayer()) |
3580 return 0; | 3581 return 0; |
3581 return webMediaPlayer()->audioDecodedByteCount(); | 3582 return webMediaPlayer()->audioDecodedByteCount(); |
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3705 // (e.g. default tracks should not be displayed if the user has turned off | 3706 // (e.g. default tracks should not be displayed if the user has turned off |
3706 // captions and non-default tracks should be displayed based on language | 3707 // captions and non-default tracks should be displayed based on language |
3707 // preferences if the user has turned captions on). | 3708 // preferences if the user has turned captions on). |
3708 for (unsigned i = 0; i < m_textTracks->length(); ++i) { | 3709 for (unsigned i = 0; i < m_textTracks->length(); ++i) { |
3709 RefPtrWillBeRawPtr<TextTrack> textTrack = m_textTracks->item(i); | 3710 RefPtrWillBeRawPtr<TextTrack> textTrack = m_textTracks->item(i); |
3710 String kind = textTrack->kind(); | 3711 String kind = textTrack->kind(); |
3711 | 3712 |
3712 if (kind == TextTrack::subtitlesKeyword() || kind == TextTrack::captions
Keyword()) | 3713 if (kind == TextTrack::subtitlesKeyword() || kind == TextTrack::captions
Keyword()) |
3713 textTrack->setHasBeenConfigured(false); | 3714 textTrack->setHasBeenConfigured(false); |
3714 } | 3715 } |
3715 configureTextTracks(); | |
3716 } | 3716 } |
3717 | 3717 |
3718 void* HTMLMediaElement::preDispatchEventHandler(Event* event) | 3718 void* HTMLMediaElement::preDispatchEventHandler(Event* event) |
3719 { | 3719 { |
3720 if (event && event->type() == EventTypeNames::webkitfullscreenchange) | 3720 if (event && event->type() == EventTypeNames::webkitfullscreenchange) |
3721 configureMediaControls(); | 3721 configureMediaControls(); |
3722 | 3722 |
3723 return 0; | 3723 return 0; |
3724 } | 3724 } |
3725 | 3725 |
(...skipping 263 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3989 | 3989 |
3990 #if ENABLE(WEB_AUDIO) | 3990 #if ENABLE(WEB_AUDIO) |
3991 void HTMLMediaElement::clearWeakMembers(Visitor* visitor) | 3991 void HTMLMediaElement::clearWeakMembers(Visitor* visitor) |
3992 { | 3992 { |
3993 if (!visitor->isAlive(m_audioSourceNode) && audioSourceProvider()) | 3993 if (!visitor->isAlive(m_audioSourceNode) && audioSourceProvider()) |
3994 audioSourceProvider()->setClient(0); | 3994 audioSourceProvider()->setClient(0); |
3995 } | 3995 } |
3996 #endif | 3996 #endif |
3997 | 3997 |
3998 } | 3998 } |
OLD | NEW |