diff options
| author | Nicolas Roard <nicolas@android.com> | 2010-10-18 10:26:57 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-18 10:26:57 -0700 |
| commit | e4f471f5ba8f8131ef446dc75407155081b22308 (patch) | |
| tree | 10af72fb5f7abe88a5bc299e98ef95e35f229592 | |
| parent | 7fc27f0903bfc72035faff876d0673c9064085ac (diff) | |
| parent | 44b3c7e814ec1151cbbcfb1960b9a1d44d0359ac (diff) | |
| download | external_webkit-e4f471f5ba8f8131ef446dc75407155081b22308.zip external_webkit-e4f471f5ba8f8131ef446dc75407155081b22308.tar.gz external_webkit-e4f471f5ba8f8131ef446dc75407155081b22308.tar.bz2 | |
am 44b3c7e8: Fix media element creation
Merge commit '44b3c7e814ec1151cbbcfb1960b9a1d44d0359ac' into gingerbread-plus-aosp
* commit '44b3c7e814ec1151cbbcfb1960b9a1d44d0359ac':
Fix media element creation
| -rw-r--r-- | WebCore/html/HTMLMediaElement.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/WebCore/html/HTMLMediaElement.cpp b/WebCore/html/HTMLMediaElement.cpp index bee91ae..ee4f3e3 100644 --- a/WebCore/html/HTMLMediaElement.cpp +++ b/WebCore/html/HTMLMediaElement.cpp @@ -590,13 +590,13 @@ void HTMLMediaElement::loadResource(const KURL& initialURL, ContentType& content m_player->setPreservesPitch(m_webkitPreservesPitch); updateVolume(); - m_player->load(m_currentSrc, contentType); #if PLATFORM(ANDROID) if (isVideo()) m_player->setMediaElementType(MediaPlayer::Video); else m_player->setMediaElementType(MediaPlayer::Audio); #endif + m_player->load(m_currentSrc, contentType); if (isVideo() && m_player->canLoadPoster()) { KURL posterUrl = static_cast<HTMLVideoElement*>(this)->poster(); |