Chromium Code Reviews| 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 "WebMediaPlayerClientImpl.h" | 6 #include "WebMediaPlayerClientImpl.h" |
| 7 | 7 |
| 8 #if ENABLE(VIDEO) | 8 #if ENABLE(VIDEO) |
| 9 | 9 |
| 10 #include "AudioBus.h" | 10 #include "AudioBus.h" |
| 11 #include "AudioSourceProvider.h" | 11 #include "AudioSourceProvider.h" |
| 12 #include "AudioSourceProviderClient.h" | 12 #include "AudioSourceProviderClient.h" |
| 13 #include "Frame.h" | 13 #include "Frame.h" |
| 14 #include "GraphicsContext.h" | 14 #include "GraphicsContext.h" |
| 15 #include "GraphicsContext3DPrivate.h" | 15 #include "GraphicsContext3DPrivate.h" |
| 16 #include "GraphicsLayerChromium.h" | 16 #include "GraphicsLayerChromium.h" |
| 17 #include "HTMLMediaElement.h" | 17 #include "HTMLMediaElement.h" |
| 18 #include "InbandTextTrackPrivateImpl.h" | |
| 18 #include "IntSize.h" | 19 #include "IntSize.h" |
| 19 #include "KURL.h" | 20 #include "KURL.h" |
| 20 #include "MediaPlayer.h" | 21 #include "MediaPlayer.h" |
| 21 #include "NotImplemented.h" | 22 #include "NotImplemented.h" |
| 22 #include "PlatformContextSkia.h" | 23 #include "PlatformContextSkia.h" |
| 23 #include "RenderLayerCompositor.h" | 24 #include "RenderLayerCompositor.h" |
| 24 #include "RenderView.h" | 25 #include "RenderView.h" |
| 25 #include "TimeRanges.h" | 26 #include "TimeRanges.h" |
| 26 #include "WebAudioSourceProvider.h" | 27 #include "WebAudioSourceProvider.h" |
| 27 #include "WebDocument.h" | 28 #include "WebDocument.h" |
| (...skipping 263 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 291 | 292 |
| 292 if (m_videoLayer) | 293 if (m_videoLayer) |
| 293 GraphicsLayerChromium::unregisterContentsLayer(m_videoLayer); | 294 GraphicsLayerChromium::unregisterContentsLayer(m_videoLayer); |
| 294 m_videoLayer = layer; | 295 m_videoLayer = layer; |
| 295 if (m_videoLayer) { | 296 if (m_videoLayer) { |
| 296 m_videoLayer->setOpaque(m_opaque); | 297 m_videoLayer->setOpaque(m_opaque); |
| 297 GraphicsLayerChromium::registerContentsLayer(m_videoLayer); | 298 GraphicsLayerChromium::registerContentsLayer(m_videoLayer); |
| 298 } | 299 } |
| 299 } | 300 } |
| 300 | 301 |
| 302 void WebMediaPlayerClientImpl::addTextTrack(WebInbandTextTrack* text_track) | |
| 303 { | |
| 304 // TODO(matthewjheaney): resolve parameter type and lifetime issues | |
|
acolwell GONE FROM CHROMIUM
2013/04/17 00:13:56
Remove comment since I believe InbandTextTrackPriv
Matthew Heaney (Chromium)
2013/04/18 23:15:42
Done.
| |
| 305 m_mediaPlayer->addTextTrack( | |
| 306 WTF::adoptRef(new InbandTextTrackPrivateImpl(text_track))); | |
| 307 } | |
| 308 | |
| 301 // MediaPlayerPrivateInterface ------------------------------------------------- | 309 // MediaPlayerPrivateInterface ------------------------------------------------- |
| 302 | 310 |
| 303 void WebMediaPlayerClientImpl::load(const String& url) | 311 void WebMediaPlayerClientImpl::load(const String& url) |
| 304 { | 312 { |
| 305 m_url = KURL(ParsedURLString, url); | 313 m_url = KURL(ParsedURLString, url); |
| 306 m_mediaSource = 0; | 314 m_mediaSource = 0; |
| 307 loadRequested(); | 315 loadRequested(); |
| 308 } | 316 } |
| 309 | 317 |
| 310 void WebMediaPlayerClientImpl::load(const String& url, PassRefPtr<WebCore::Media Source> mediaSource) | 318 void WebMediaPlayerClientImpl::load(const String& url, PassRefPtr<WebCore::Media Source> mediaSource) |
| (...skipping 577 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 888 { | 896 { |
| 889 if (m_client) | 897 if (m_client) |
| 890 m_client->setFormat(numberOfChannels, sampleRate); | 898 m_client->setFormat(numberOfChannels, sampleRate); |
| 891 } | 899 } |
| 892 | 900 |
| 893 #endif | 901 #endif |
| 894 | 902 |
| 895 } // namespace WebKit | 903 } // namespace WebKit |
| 896 | 904 |
| 897 #endif // ENABLE(VIDEO) | 905 #endif // ENABLE(VIDEO) |
| OLD | NEW |