| 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 809 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 820 | 820 |
| 821 // FIXME: Investigate whether these can be moved into m_networkState != NETW
ORK_EMPTY block above | 821 // FIXME: Investigate whether these can be moved into m_networkState != NETW
ORK_EMPTY block above |
| 822 // so they are closer to the relevant spec steps. | 822 // so they are closer to the relevant spec steps. |
| 823 m_lastSeekTime = 0; | 823 m_lastSeekTime = 0; |
| 824 m_duration = std::numeric_limits<double>::quiet_NaN(); | 824 m_duration = std::numeric_limits<double>::quiet_NaN(); |
| 825 | 825 |
| 826 // The spec doesn't say to block the load event until we actually run the as
ynchronous section | 826 // The spec doesn't say to block the load event until we actually run the as
ynchronous section |
| 827 // algorithm, but do it now because we won't start that until after the time
r fires and the | 827 // algorithm, but do it now because we won't start that until after the time
r fires and the |
| 828 // event may have already fired by then. | 828 // event may have already fired by then. |
| 829 setShouldDelayLoadEvent(true); | 829 setShouldDelayLoadEvent(true); |
| 830 | 830 if (hasMediaControls()) |
| 831 configureMediaControls(); | 831 mediaControls()->reset(); |
| 832 } | 832 } |
| 833 | 833 |
| 834 void HTMLMediaElement::loadInternal() | 834 void HTMLMediaElement::loadInternal() |
| 835 { | 835 { |
| 836 // HTMLMediaElement::textTracksAreReady will need "... the text tracks whose
mode was not in the | 836 // HTMLMediaElement::textTracksAreReady will need "... the text tracks whose
mode was not in the |
| 837 // disabled state when the element's resource selection algorithm last start
ed". | 837 // disabled state when the element's resource selection algorithm last start
ed". |
| 838 m_textTracksWhenResourceSelectionBegan.clear(); | 838 m_textTracksWhenResourceSelectionBegan.clear(); |
| 839 if (m_textTracks) { | 839 if (m_textTracks) { |
| 840 for (unsigned i = 0; i < m_textTracks->length(); ++i) { | 840 for (unsigned i = 0; i < m_textTracks->length(); ++i) { |
| 841 TextTrack* track = m_textTracks->item(i); | 841 TextTrack* track = m_textTracks->item(i); |
| (...skipping 3141 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3983 | 3983 |
| 3984 #if ENABLE(WEB_AUDIO) | 3984 #if ENABLE(WEB_AUDIO) |
| 3985 void HTMLMediaElement::clearWeakMembers(Visitor* visitor) | 3985 void HTMLMediaElement::clearWeakMembers(Visitor* visitor) |
| 3986 { | 3986 { |
| 3987 if (!visitor->isAlive(m_audioSourceNode) && audioSourceProvider()) | 3987 if (!visitor->isAlive(m_audioSourceNode) && audioSourceProvider()) |
| 3988 audioSourceProvider()->setClient(0); | 3988 audioSourceProvider()->setClient(0); |
| 3989 } | 3989 } |
| 3990 #endif | 3990 #endif |
| 3991 | 3991 |
| 3992 } | 3992 } |
| OLD | NEW |