diff options
| author | Teng-Hui Zhu <ztenghui@google.com> | 2011-04-07 11:59:42 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-04-07 11:59:42 -0700 |
| commit | e4cbbfc01b360475415d07bc3a4276fc46e828b9 (patch) | |
| tree | 959f60bd0c0b7c108872818d90217006ab8aa01e | |
| parent | 7404fb69c0389c04c5d20d9d2dff7a4aba1db63a (diff) | |
| parent | 084cf95d880fad350fa86149d1ea0e3e192bbee8 (diff) | |
| download | external_webkit-e4cbbfc01b360475415d07bc3a4276fc46e828b9.zip external_webkit-e4cbbfc01b360475415d07bc3a4276fc46e828b9.tar.gz external_webkit-e4cbbfc01b360475415d07bc3a4276fc46e828b9.tar.bz2 | |
Merge "Show the fullscreen button all the time" into honeycomb-mr1
| -rw-r--r-- | WebCore/platform/graphics/android/MediaPlayerPrivateAndroid.h | 1 | ||||
| -rw-r--r-- | WebKit/android/WebCoreSupport/MediaPlayerPrivateAndroid.cpp | 6 |
2 files changed, 1 insertions, 6 deletions
diff --git a/WebCore/platform/graphics/android/MediaPlayerPrivateAndroid.h b/WebCore/platform/graphics/android/MediaPlayerPrivateAndroid.h index 6948799..20a5829 100644 --- a/WebCore/platform/graphics/android/MediaPlayerPrivateAndroid.h +++ b/WebCore/platform/graphics/android/MediaPlayerPrivateAndroid.h @@ -121,7 +121,6 @@ protected: float m_currentTime; bool m_paused; - bool m_hasVideo; MediaPlayer::ReadyState m_readyState; MediaPlayer::NetworkState m_networkState; diff --git a/WebKit/android/WebCoreSupport/MediaPlayerPrivateAndroid.cpp b/WebKit/android/WebCoreSupport/MediaPlayerPrivateAndroid.cpp index d61b0dd..982e384 100644 --- a/WebKit/android/WebCoreSupport/MediaPlayerPrivateAndroid.cpp +++ b/WebKit/android/WebCoreSupport/MediaPlayerPrivateAndroid.cpp @@ -147,7 +147,6 @@ MediaPlayerPrivate::MediaPlayerPrivate(MediaPlayer* player) m_duration(1), // keep this minimal to avoid initial seek problem m_currentTime(0), m_paused(true), - m_hasVideo(false), m_readyState(MediaPlayer::HaveNothing), m_networkState(MediaPlayer::Empty), m_poster(0), @@ -164,7 +163,6 @@ void MediaPlayerPrivate::onEnded() m_player->timeChanged(); m_paused = true; m_player->playbackStateChanged(); - m_hasVideo = false; m_networkState = MediaPlayer::Idle; } @@ -172,7 +170,6 @@ void MediaPlayerPrivate::onPaused() { m_paused = true; m_player->playbackStateChanged(); - m_hasVideo = false; m_networkState = MediaPlayer::Idle; m_player->playbackStateChanged(); } @@ -283,13 +280,12 @@ public: m_duration = duration / 1000.0f; m_naturalSize = IntSize(width, height); m_naturalSizeUnknown = false; - m_hasVideo = true; m_player->durationChanged(); m_player->sizeChanged(); } virtual bool hasAudio() const { return false; } // do not display the audio UI - virtual bool hasVideo() const { return m_hasVideo; } + virtual bool hasVideo() const { return true; } virtual bool supportsFullscreen() const { return true; } MediaPlayerVideoPrivate(MediaPlayer* player) : MediaPlayerPrivate(player) |