| 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 1013 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1024 | 1024 |
| 1025 LocalFrame* frame = document().frame(); | 1025 LocalFrame* frame = document().frame(); |
| 1026 // TODO(srirama.m): Figure out how frame can be null when | 1026 // TODO(srirama.m): Figure out how frame can be null when |
| 1027 // coming from executeDeferredLoad() | 1027 // coming from executeDeferredLoad() |
| 1028 if (!frame) { | 1028 if (!frame) { |
| 1029 mediaLoadingFailed(WebMediaPlayer::NetworkStateFormatError); | 1029 mediaLoadingFailed(WebMediaPlayer::NetworkStateFormatError); |
| 1030 return; | 1030 return; |
| 1031 } | 1031 } |
| 1032 | 1032 |
| 1033 KURL kurl(ParsedURLString, requestURL); | 1033 KURL kurl(ParsedURLString, requestURL); |
| 1034 m_webMediaPlayer = frame->loader().client()->createWebMediaPlayer(this, kurl
); | 1034 m_webMediaPlayer = frame->loader().client()->createWebMediaPlayer(*this, kur
l, this); |
| 1035 if (!m_webMediaPlayer) { | 1035 if (!m_webMediaPlayer) { |
| 1036 mediaLoadingFailed(WebMediaPlayer::NetworkStateFormatError); | 1036 mediaLoadingFailed(WebMediaPlayer::NetworkStateFormatError); |
| 1037 return; | 1037 return; |
| 1038 } | 1038 } |
| 1039 | 1039 |
| 1040 if (layoutObject()) | 1040 if (layoutObject()) |
| 1041 layoutObject()->setShouldDoFullPaintInvalidation(); | 1041 layoutObject()->setShouldDoFullPaintInvalidation(); |
| 1042 #if ENABLE(WEB_AUDIO) | 1042 #if ENABLE(WEB_AUDIO) |
| 1043 // Make sure if we create/re-create the WebMediaPlayer that we update our wr
apper. | 1043 // Make sure if we create/re-create the WebMediaPlayer that we update our wr
apper. |
| 1044 m_audioSourceProvider.wrap(m_webMediaPlayer->audioSourceProvider()); | 1044 m_audioSourceProvider.wrap(m_webMediaPlayer->audioSourceProvider()); |
| (...skipping 2744 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3789 visitor->trace(m_client); | 3789 visitor->trace(m_client); |
| 3790 } | 3790 } |
| 3791 | 3791 |
| 3792 DEFINE_TRACE(HTMLMediaElement::AudioSourceProviderImpl) | 3792 DEFINE_TRACE(HTMLMediaElement::AudioSourceProviderImpl) |
| 3793 { | 3793 { |
| 3794 visitor->trace(m_client); | 3794 visitor->trace(m_client); |
| 3795 } | 3795 } |
| 3796 #endif | 3796 #endif |
| 3797 | 3797 |
| 3798 } | 3798 } |
| OLD | NEW |