| 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 871 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 882 m_mediaSource = nullptr; | 882 m_mediaSource = nullptr; |
| 883 attemptLoad = false; | 883 attemptLoad = false; |
| 884 } | 884 } |
| 885 } | 885 } |
| 886 } | 886 } |
| 887 } | 887 } |
| 888 | 888 |
| 889 if (attemptLoad && canLoadURL(url, contentType, keySystem)) { | 889 if (attemptLoad && canLoadURL(url, contentType, keySystem)) { |
| 890 ASSERT(!webMediaPlayer()); | 890 ASSERT(!webMediaPlayer()); |
| 891 | 891 |
| 892 if (!autoplay() && m_preload == MediaPlayer::None) | 892 if (!m_havePreparedToPlay && !autoplay() && m_preload == MediaPlayer::No
ne) { |
| 893 WTF_LOG(Media, "HTMLMediaElement::loadResource : Delaying load becau
se preload == 'none'"); |
| 893 m_delayingLoadForPreloadNone = true; | 894 m_delayingLoadForPreloadNone = true; |
| 894 else | 895 } else { |
| 895 startPlayerLoad(); | 896 startPlayerLoad(); |
| 897 } |
| 896 } else { | 898 } else { |
| 897 mediaLoadingFailed(MediaPlayer::FormatError); | 899 mediaLoadingFailed(MediaPlayer::FormatError); |
| 898 } | 900 } |
| 899 | 901 |
| 900 // If there is no poster to display, allow the media engine to render video
frames as soon as | 902 // If there is no poster to display, allow the media engine to render video
frames as soon as |
| 901 // they are available. | 903 // they are available. |
| 902 updateDisplayState(); | 904 updateDisplayState(); |
| 903 | 905 |
| 904 if (renderer()) | 906 if (renderer()) |
| 905 renderer()->updateFromElement(); | 907 renderer()->updateFromElement(); |
| (...skipping 2749 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3655 visitor->trace(m_error); | 3657 visitor->trace(m_error); |
| 3656 visitor->trace(m_currentSourceNode); | 3658 visitor->trace(m_currentSourceNode); |
| 3657 visitor->trace(m_nextChildNodeToConsider); | 3659 visitor->trace(m_nextChildNodeToConsider); |
| 3658 visitor->trace(m_textTracks); | 3660 visitor->trace(m_textTracks); |
| 3659 visitor->trace(m_textTracksWhenResourceSelectionBegan); | 3661 visitor->trace(m_textTracksWhenResourceSelectionBegan); |
| 3660 WillBeHeapSupplementable<HTMLMediaElement>::trace(visitor); | 3662 WillBeHeapSupplementable<HTMLMediaElement>::trace(visitor); |
| 3661 HTMLElement::trace(visitor); | 3663 HTMLElement::trace(visitor); |
| 3662 } | 3664 } |
| 3663 | 3665 |
| 3664 } | 3666 } |
| OLD | NEW |