diff options
| author | Ben Murdoch <benm@google.com> | 2011-06-02 12:07:03 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-06-10 10:47:21 +0100 |
| commit | 2daae5fd11344eaa88a0d92b0f6d65f8d2255c00 (patch) | |
| tree | e4964fbd1cb70599f7718ff03e50ea1dab33890b /Source/WebCore/platform/graphics/MediaPlayer.cpp | |
| parent | 87bdf0060a247bfbe668342b87e0874182e0ffa9 (diff) | |
| download | external_webkit-2daae5fd11344eaa88a0d92b0f6d65f8d2255c00.zip external_webkit-2daae5fd11344eaa88a0d92b0f6d65f8d2255c00.tar.gz external_webkit-2daae5fd11344eaa88a0d92b0f6d65f8d2255c00.tar.bz2 | |
Merge WebKit at r84325: Initial merge by git.
Change-Id: Ic1a909300ecc0a13ddc6b4e784371d2ac6e3d59b
Diffstat (limited to 'Source/WebCore/platform/graphics/MediaPlayer.cpp')
| -rw-r--r-- | Source/WebCore/platform/graphics/MediaPlayer.cpp | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/Source/WebCore/platform/graphics/MediaPlayer.cpp b/Source/WebCore/platform/graphics/MediaPlayer.cpp index 03004b6..a7e4b90 100644 --- a/Source/WebCore/platform/graphics/MediaPlayer.cpp +++ b/Source/WebCore/platform/graphics/MediaPlayer.cpp @@ -792,11 +792,12 @@ void MediaPlayer::networkStateChanged() // If more than one media engine is installed and this one failed before finding metadata, // let the next engine try. if (m_private->networkState() >= FormatError - && m_private->readyState() < HaveMetadata - && installedMediaEngines().size() > 1 - && bestMediaEngineForTypeAndCodecs(m_contentMIMEType, m_contentTypeCodecs, m_currentMediaEngine)) { + && m_private->readyState() < HaveMetadata + && installedMediaEngines().size() > 1) { + if ( m_contentMIMEType.isEmpty() || bestMediaEngineForTypeAndCodecs(m_contentMIMEType, m_contentTypeCodecs, m_currentMediaEngine)) { m_reloadTimer.startOneShot(0); return; + } } if (m_mediaPlayerClient) m_mediaPlayerClient->mediaPlayerNetworkStateChanged(this); @@ -858,6 +859,12 @@ void MediaPlayer::playbackStateChanged() m_mediaPlayerClient->mediaPlayerPlaybackStateChanged(this); } +void MediaPlayer::firstVideoFrameAvailable() +{ + if (m_mediaPlayerClient) + m_mediaPlayerClient->mediaPlayerFirstVideoFrameAvailable(this); +} + } #endif |