diff options
| author | Shimeng (Simon) Wang <swang@google.com> | 2011-01-18 13:19:40 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-01-18 13:19:40 -0800 |
| commit | 441bf4dacdc212d82753d4d52fed6a1bc3096239 (patch) | |
| tree | 5b460f3c24154b43f4e977303d369938fa64f6ae | |
| parent | ed112c8202e0f9900f12776e211bdca9241d22d9 (diff) | |
| parent | 692e879ddcf0edc6bced055555cc101b2046867d (diff) | |
| download | external_webkit-441bf4dacdc212d82753d4d52fed6a1bc3096239.zip external_webkit-441bf4dacdc212d82753d4d52fed6a1bc3096239.tar.gz external_webkit-441bf4dacdc212d82753d4d52fed6a1bc3096239.tar.bz2 | |
Merge "Fake some media player state change in media load time." into honeycomb
| -rw-r--r-- | WebKit/android/WebCoreSupport/MediaPlayerPrivateAndroid.cpp | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/WebKit/android/WebCoreSupport/MediaPlayerPrivateAndroid.cpp b/WebKit/android/WebCoreSupport/MediaPlayerPrivateAndroid.cpp index e9f4f3b..c562bb4 100644 --- a/WebKit/android/WebCoreSupport/MediaPlayerPrivateAndroid.cpp +++ b/WebKit/android/WebCoreSupport/MediaPlayerPrivateAndroid.cpp @@ -171,7 +171,18 @@ void MediaPlayerPrivate::onTimeupdate(int position) { class MediaPlayerVideoPrivate : public MediaPlayerPrivate { public: - void load(const String& url) { m_url = url; } + void load(const String& url) { + m_url = url; + // Cheat a bit here to make sure Window.onLoad event can be triggered + // at the right time instead of real video play time, since only full + // screen video play is supported in Java's VideoView. + // See also comments in prepareToPlay function. + m_networkState = MediaPlayer::Loading; + m_player->networkStateChanged(); + m_readyState = MediaPlayer::HaveCurrentData; + m_player->readyStateChanged(); + } + void play() { JNIEnv* env = JSC::Bindings::getJNIEnv(); if (!env || !m_url.length() || !m_glue->m_javaProxy) |