summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndroid (Google) Code Review <android-gerrit@google.com>2009-10-26 11:26:53 -0400
committerAndroid (Google) Code Review <android-gerrit@google.com>2009-10-26 11:26:53 -0400
commit064849d86c5d90bf7459b0e8bd781de92141499c (patch)
tree2b7c20137e496cd8d57353570c71a14919daa045
parent0845a4594c81421404715b666f5b3c989d9b2c5c (diff)
parent3a8abed5e539483f33e78a8be2e2dbbba3c4f664 (diff)
downloadexternal_webkit-064849d86c5d90bf7459b0e8bd781de92141499c.zip
external_webkit-064849d86c5d90bf7459b0e8bd781de92141499c.tar.gz
external_webkit-064849d86c5d90bf7459b0e8bd781de92141499c.tar.bz2
Merge change I3a8abed5 into eclair-mr2
* changes: Enable the dispatching of the 'ended' media event.
-rw-r--r--WebKit/android/WebCoreSupport/MediaPlayerPrivateAndroid.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/WebKit/android/WebCoreSupport/MediaPlayerPrivateAndroid.cpp b/WebKit/android/WebCoreSupport/MediaPlayerPrivateAndroid.cpp
index 6c9ea49..5860bd2 100644
--- a/WebKit/android/WebCoreSupport/MediaPlayerPrivateAndroid.cpp
+++ b/WebKit/android/WebCoreSupport/MediaPlayerPrivateAndroid.cpp
@@ -357,6 +357,8 @@ void MediaPlayerPrivate::onPrepared(int duration, int width, int height) {
}
void MediaPlayerPrivate::onEnded() {
+ m_currentTime = duration();
+ m_player->timeChanged();
m_paused = true;
m_currentTime = 0;
m_networkState = MediaPlayer::Idle;