diff options
| -rw-r--r-- | WebCore/html/HTMLMediaElement.cpp | 2 | ||||
| -rw-r--r-- | WebKit/android/WebCoreSupport/MediaPlayerPrivateAndroid.cpp | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/WebCore/html/HTMLMediaElement.cpp b/WebCore/html/HTMLMediaElement.cpp index 20fa7f8..e8ab4e6 100644 --- a/WebCore/html/HTMLMediaElement.cpp +++ b/WebCore/html/HTMLMediaElement.cpp @@ -628,13 +628,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 = poster(); diff --git a/WebKit/android/WebCoreSupport/MediaPlayerPrivateAndroid.cpp b/WebKit/android/WebCoreSupport/MediaPlayerPrivateAndroid.cpp index 7c0bb24..6224707 100644 --- a/WebKit/android/WebCoreSupport/MediaPlayerPrivateAndroid.cpp +++ b/WebKit/android/WebCoreSupport/MediaPlayerPrivateAndroid.cpp @@ -325,6 +325,7 @@ public: if (!m_glue->m_javaProxy) return; + m_paused = false; env->CallVoidMethod(m_glue->m_javaProxy, m_glue->m_play); checkException(env); } |