summaryrefslogtreecommitdiffstats
path: root/WebCore
diff options
context:
space:
mode:
authorNicolas Roard <nicolas@android.com>2010-05-11 12:20:30 -0700
committerBen Murdoch <benm@google.com>2010-10-18 13:07:05 +0100
commit44b3c7e814ec1151cbbcfb1960b9a1d44d0359ac (patch)
tree62c1fa14312ae204c5e766736d25bcd5017e5a73 /WebCore
parent3d57c253bfa22c17c5f38a70e162a6115a1809b6 (diff)
downloadexternal_webkit-44b3c7e814ec1151cbbcfb1960b9a1d44d0359ac.zip
external_webkit-44b3c7e814ec1151cbbcfb1960b9a1d44d0359ac.tar.gz
external_webkit-44b3c7e814ec1151cbbcfb1960b9a1d44d0359ac.tar.bz2
Fix media element creation
Cherry pick to Gingerbread, DO NOT MERGE! Bug:3101402 Change-Id: I095182351ef49d5931241a50ab0880d6743659a5
Diffstat (limited to 'WebCore')
-rw-r--r--WebCore/html/HTMLMediaElement.cpp2
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();