diff options
author | Shimeng (Simon) Wang <swang@google.com> | 2010-10-18 17:04:33 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-18 17:04:33 -0700 |
commit | 15643db2b790d467b78582c3bad440fb42d35df1 (patch) | |
tree | f52e3f28b05f282363ee985ecdb385fc3fa0bc78 /WebKit | |
parent | 06308c2c073199a5f22f9c2f21cb7108d9a4bd29 (diff) | |
parent | 77ab6dc8b75bf7684366ba6e154ed3f95a125a55 (diff) | |
download | external_webkit-15643db2b790d467b78582c3bad440fb42d35df1.zip external_webkit-15643db2b790d467b78582c3bad440fb42d35df1.tar.gz external_webkit-15643db2b790d467b78582c3bad440fb42d35df1.tar.bz2 |
am 77ab6dc8: Don\'t force video end event when full screen video playing is returned.
Merge commit '77ab6dc8b75bf7684366ba6e154ed3f95a125a55' into gingerbread-plus-aosp
* commit '77ab6dc8b75bf7684366ba6e154ed3f95a125a55':
Don't force video end event when full screen video playing is returned.
Diffstat (limited to 'WebKit')
-rw-r--r-- | WebKit/android/WebCoreSupport/MediaPlayerPrivateAndroid.cpp | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/WebKit/android/WebCoreSupport/MediaPlayerPrivateAndroid.cpp b/WebKit/android/WebCoreSupport/MediaPlayerPrivateAndroid.cpp index f3937bf..3a39730 100644 --- a/WebKit/android/WebCoreSupport/MediaPlayerPrivateAndroid.cpp +++ b/WebKit/android/WebCoreSupport/MediaPlayerPrivateAndroid.cpp @@ -155,6 +155,14 @@ void MediaPlayerPrivate::onEnded() { m_readyState = MediaPlayer::HaveNothing; } +void MediaPlayerPrivate::onPaused() { + m_paused = true; + m_currentTime = 0; + m_hasVideo = false; + m_networkState = MediaPlayer::Idle; + m_readyState = MediaPlayer::HaveNothing; +} + void MediaPlayerPrivate::onTimeupdate(int position) { m_currentTime = position / 1000.0f; m_player->timeChanged(); @@ -436,6 +444,13 @@ static void OnEnded(JNIEnv* env, jobject obj, int pointer) { } } +static void OnPaused(JNIEnv* env, jobject obj, int pointer) { + if (pointer) { + WebCore::MediaPlayerPrivate* player = reinterpret_cast<WebCore::MediaPlayerPrivate*>(pointer); + player->onPaused(); + } +} + static void OnPosterFetched(JNIEnv* env, jobject obj, jobject poster, int pointer) { if (!pointer || !poster) return; @@ -469,6 +484,8 @@ static JNINativeMethod g_MediaPlayerMethods[] = { (void*) OnPrepared }, { "nativeOnEnded", "(I)V", (void*) OnEnded }, + { "nativeOnPaused", "(I)V", + (void*) OnPaused }, { "nativeOnPosterFetched", "(Landroid/graphics/Bitmap;I)V", (void*) OnPosterFetched }, { "nativeOnTimeupdate", "(II)V", |