| OLD | NEW |
| 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "config.h" | 5 #include "config.h" |
| 6 #include "web/WebMediaPlayerClientImpl.h" | 6 #include "web/WebMediaPlayerClientImpl.h" |
| 7 | 7 |
| 8 #include "core/frame/LocalFrame.h" | 8 #include "core/frame/LocalFrame.h" |
| 9 #include "core/html/HTMLMediaElement.h" | 9 #include "core/html/HTMLMediaElement.h" |
| 10 #include "core/html/TimeRanges.h" | 10 #include "core/html/TimeRanges.h" |
| (...skipping 199 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 210 #if ENABLE(WEB_AUDIO) | 210 #if ENABLE(WEB_AUDIO) |
| 211 // Make sure if we create/re-create the WebMediaPlayer that we update our wr
apper. | 211 // Make sure if we create/re-create the WebMediaPlayer that we update our wr
apper. |
| 212 m_audioSourceProvider.wrap(m_webMediaPlayer->audioSourceProvider()); | 212 m_audioSourceProvider.wrap(m_webMediaPlayer->audioSourceProvider()); |
| 213 #endif | 213 #endif |
| 214 | 214 |
| 215 m_webMediaPlayer->setVolume(mediaElement().playerVolume()); | 215 m_webMediaPlayer->setVolume(mediaElement().playerVolume()); |
| 216 | 216 |
| 217 m_webMediaPlayer->setPoster(poster); | 217 m_webMediaPlayer->setPoster(poster); |
| 218 | 218 |
| 219 // Tell WebMediaPlayer about any connected CDM (may be null). | 219 // Tell WebMediaPlayer about any connected CDM (may be null). |
| 220 m_webMediaPlayer->setContentDecryptionModule(HTMLMediaElementEncryptedMedia:
:contentDecryptionModule(mediaElement())); | 220 m_webMediaPlayer->setContentDecryptionModuleSync(HTMLMediaElementEncryptedMe
dia::contentDecryptionModule(mediaElement())); |
| 221 m_webMediaPlayer->load(loadType, kurl, corsMode); | 221 m_webMediaPlayer->load(loadType, kurl, corsMode); |
| 222 } | 222 } |
| 223 | 223 |
| 224 void WebMediaPlayerClientImpl::setPreload(MediaPlayer::Preload preload) | 224 void WebMediaPlayerClientImpl::setPreload(MediaPlayer::Preload preload) |
| 225 { | 225 { |
| 226 m_preload = preload; | 226 m_preload = preload; |
| 227 | 227 |
| 228 if (m_webMediaPlayer) | 228 if (m_webMediaPlayer) |
| 229 m_webMediaPlayer->setPreload(static_cast<WebMediaPlayer::Preload>(preloa
d)); | 229 m_webMediaPlayer->setPreload(static_cast<WebMediaPlayer::Preload>(preloa
d)); |
| 230 } | 230 } |
| (...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 307 } | 307 } |
| 308 | 308 |
| 309 void WebMediaPlayerClientImpl::AudioClientImpl::trace(Visitor* visitor) | 309 void WebMediaPlayerClientImpl::AudioClientImpl::trace(Visitor* visitor) |
| 310 { | 310 { |
| 311 visitor->trace(m_client); | 311 visitor->trace(m_client); |
| 312 } | 312 } |
| 313 | 313 |
| 314 #endif | 314 #endif |
| 315 | 315 |
| 316 } // namespace blink | 316 } // namespace blink |
| OLD | NEW |