diff options
| author | Teng-Hui Zhu <ztenghui@google.com> | 2011-04-07 12:05:07 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-04-07 12:05:07 -0700 |
| commit | fdc5159b9efbfd6a12be9c5a0ba81a479b0b0fc0 (patch) | |
| tree | 518175248026d610fec751dddd6655d4ff032c2c /WebCore | |
| parent | a9cf0fdf863ade3ffbeea3ef76a0d540c91a1f07 (diff) | |
| parent | bb69eea599d55bb1958713e8f1614c9e7f38b2f2 (diff) | |
| download | external_webkit-fdc5159b9efbfd6a12be9c5a0ba81a479b0b0fc0.zip external_webkit-fdc5159b9efbfd6a12be9c5a0ba81a479b0b0fc0.tar.gz external_webkit-fdc5159b9efbfd6a12be9c5a0ba81a479b0b0fc0.tar.bz2 | |
am bb69eea5: am e4cbbfc0: Merge "Show the fullscreen button all the time" into honeycomb-mr1
* commit 'bb69eea599d55bb1958713e8f1614c9e7f38b2f2':
Show the fullscreen button all the time
Diffstat (limited to 'WebCore')
| -rw-r--r-- | WebCore/platform/graphics/android/MediaPlayerPrivateAndroid.h | 1 |
1 files changed, 0 insertions, 1 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; |