summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--WebCore/platform/graphics/android/MediaPlayerPrivateAndroid.h1
-rw-r--r--WebKit/android/WebCoreSupport/MediaPlayerPrivateAndroid.cpp17
2 files changed, 18 insertions, 0 deletions
diff --git a/WebCore/platform/graphics/android/MediaPlayerPrivateAndroid.h b/WebCore/platform/graphics/android/MediaPlayerPrivateAndroid.h
index 0f38034..49aafec 100644
--- a/WebCore/platform/graphics/android/MediaPlayerPrivateAndroid.h
+++ b/WebCore/platform/graphics/android/MediaPlayerPrivateAndroid.h
@@ -89,6 +89,7 @@ public:
virtual void onPrepared(int duration, int width, int height) { }
void onEnded();
+ void onPaused();
virtual void onPosterFetched(SkBitmap*) { }
void onBuffering(int percent);
void onTimeupdate(int position);
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",