diff options
| author | Shimeng (Simon) Wang <swang@google.com> | 2010-10-19 10:43:57 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-19 10:43:57 -0700 |
| commit | 443003a60e3ef626b9600b66c6212d8843151841 (patch) | |
| tree | 738dfa6cc4a4a09469638ea719ed6749a8d8de33 /WebCore | |
| parent | 4f402dad5494b7887490b93f21ed5ffe94955a6b (diff) | |
| parent | 15643db2b790d467b78582c3bad440fb42d35df1 (diff) | |
| download | external_webkit-443003a60e3ef626b9600b66c6212d8843151841.zip external_webkit-443003a60e3ef626b9600b66c6212d8843151841.tar.gz external_webkit-443003a60e3ef626b9600b66c6212d8843151841.tar.bz2 | |
am 15643db2: am 77ab6dc8: Don\'t force video end event when full screen video playing is returned.
Merge commit '15643db2b790d467b78582c3bad440fb42d35df1'
* commit '15643db2b790d467b78582c3bad440fb42d35df1':
Don't force video end event when full screen video playing is returned.
Diffstat (limited to 'WebCore')
| -rw-r--r-- | WebCore/platform/graphics/android/MediaPlayerPrivateAndroid.h | 1 |
1 files changed, 1 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); |