| 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 1039 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1050 | 1050 |
| 1051 LocalFrame* frame = document().frame(); | 1051 LocalFrame* frame = document().frame(); |
| 1052 // TODO(srirama.m): Figure out how frame can be null when | 1052 // TODO(srirama.m): Figure out how frame can be null when |
| 1053 // coming from executeDeferredLoad() | 1053 // coming from executeDeferredLoad() |
| 1054 if (!frame) { | 1054 if (!frame) { |
| 1055 mediaLoadingFailed(WebMediaPlayer::NetworkStateFormatError); | 1055 mediaLoadingFailed(WebMediaPlayer::NetworkStateFormatError); |
| 1056 return; | 1056 return; |
| 1057 } | 1057 } |
| 1058 | 1058 |
| 1059 KURL kurl(ParsedURLString, requestURL); | 1059 KURL kurl(ParsedURLString, requestURL); |
| 1060 m_webMediaPlayer = frame->loader().client()->createWebMediaPlayer(*this, loa
dType(), kurl, this); | 1060 m_webMediaPlayer = frame->loader().client()->createWebMediaPlayer(*this, kur
l, this); |
| 1061 if (!m_webMediaPlayer) { | 1061 if (!m_webMediaPlayer) { |
| 1062 mediaLoadingFailed(WebMediaPlayer::NetworkStateFormatError); | 1062 mediaLoadingFailed(WebMediaPlayer::NetworkStateFormatError); |
| 1063 return; | 1063 return; |
| 1064 } | 1064 } |
| 1065 | 1065 |
| 1066 if (layoutObject()) | 1066 if (layoutObject()) |
| 1067 layoutObject()->setShouldDoFullPaintInvalidation(); | 1067 layoutObject()->setShouldDoFullPaintInvalidation(); |
| 1068 // Make sure if we create/re-create the WebMediaPlayer that we update our wr
apper. | 1068 // Make sure if we create/re-create the WebMediaPlayer that we update our wr
apper. |
| 1069 m_audioSourceProvider.wrap(m_webMediaPlayer->getAudioSourceProvider()); | 1069 m_audioSourceProvider.wrap(m_webMediaPlayer->getAudioSourceProvider()); |
| 1070 m_webMediaPlayer->setVolume(effectiveMediaVolume()); | 1070 m_webMediaPlayer->setVolume(effectiveMediaVolume()); |
| (...skipping 2752 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3823 { | 3823 { |
| 3824 visitor->trace(m_client); | 3824 visitor->trace(m_client); |
| 3825 } | 3825 } |
| 3826 | 3826 |
| 3827 DEFINE_TRACE(HTMLMediaElement::AudioSourceProviderImpl) | 3827 DEFINE_TRACE(HTMLMediaElement::AudioSourceProviderImpl) |
| 3828 { | 3828 { |
| 3829 visitor->trace(m_client); | 3829 visitor->trace(m_client); |
| 3830 } | 3830 } |
| 3831 | 3831 |
| 3832 } // namespace blink | 3832 } // namespace blink |
| OLD | NEW |