summaryrefslogtreecommitdiffstats
path: root/WebKit
diff options
context:
space:
mode:
authorBen Murdoch <benm@google.com>2010-12-22 13:59:17 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2010-12-22 13:59:17 -0800
commit55323ac613cc31553107b68603cb627264d22bb0 (patch)
tree6bd1c33cb7f21c14c2a079a6e137b4c89dbf486f /WebKit
parent9432ba4878ebf79acd4424398b344c154f452db2 (diff)
parent1e5798a41696c2d04b2a28eabf9e5914fb6856e2 (diff)
downloadexternal_webkit-55323ac613cc31553107b68603cb627264d22bb0.zip
external_webkit-55323ac613cc31553107b68603cb627264d22bb0.tar.gz
external_webkit-55323ac613cc31553107b68603cb627264d22bb0.tar.bz2
am 1e5798a4: am d436a8e4: Allow HTML5 video to seek.
* commit '1e5798a41696c2d04b2a28eabf9e5914fb6856e2': Allow HTML5 video to seek.
Diffstat (limited to 'WebKit')
-rw-r--r--WebKit/android/WebCoreSupport/MediaPlayerPrivateAndroid.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/WebKit/android/WebCoreSupport/MediaPlayerPrivateAndroid.cpp b/WebKit/android/WebCoreSupport/MediaPlayerPrivateAndroid.cpp
index d3e9f9a..c670aeb 100644
--- a/WebKit/android/WebCoreSupport/MediaPlayerPrivateAndroid.cpp
+++ b/WebKit/android/WebCoreSupport/MediaPlayerPrivateAndroid.cpp
@@ -312,6 +312,10 @@ public:
env->DeleteLocalRef(clazz);
checkException(env);
}
+
+ float maxTimeSeekable() const {
+ return m_duration;
+ }
};
class MediaPlayerAudioPrivate : public MediaPlayerPrivate {