| Index: webkit/media/webmediaplayer_impl.cc
|
| diff --git a/webkit/media/webmediaplayer_impl.cc b/webkit/media/webmediaplayer_impl.cc
|
| index a193cc4e394175d70eb61bfef2685a8b365451cb..280aafaedcb78fc5b1168c1edcb8276c7712722a 100644
|
| --- a/webkit/media/webmediaplayer_impl.cc
|
| +++ b/webkit/media/webmediaplayer_impl.cc
|
| @@ -367,6 +367,10 @@ bool WebMediaPlayerImpl::supportsSave() const {
|
| return supports_save_;
|
| }
|
|
|
| +void WebMediaPlayerImpl::seekFloat(float seconds) {
|
| + seek(seconds);
|
| +}
|
| +
|
| void WebMediaPlayerImpl::seek(float seconds) {
|
| DCHECK(main_loop_->BelongsToCurrentThread());
|
|
|
| @@ -397,6 +401,10 @@ void WebMediaPlayerImpl::seek(float seconds) {
|
| BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::OnPipelineSeek));
|
| }
|
|
|
| +void WebMediaPlayerImpl::setEndTimeFloat(float seconds) {
|
| + setEndTime(seconds);
|
| +}
|
| +
|
| void WebMediaPlayerImpl::setEndTime(float seconds) {
|
| DCHECK(main_loop_->BelongsToCurrentThread());
|
|
|
| @@ -404,6 +412,10 @@ void WebMediaPlayerImpl::setEndTime(float seconds) {
|
| return;
|
| }
|
|
|
| +void WebMediaPlayerImpl::setRateFloat(float rate) {
|
| + setRate(rate);
|
| +}
|
| +
|
| void WebMediaPlayerImpl::setRate(float rate) {
|
| DCHECK(main_loop_->BelongsToCurrentThread());
|
|
|
| @@ -426,6 +438,10 @@ void WebMediaPlayerImpl::setRate(float rate) {
|
| }
|
| }
|
|
|
| +void WebMediaPlayerImpl::setVolumeFloat(float volume) {
|
| + setVolume(volume);
|
| +}
|
| +
|
| void WebMediaPlayerImpl::setVolume(float volume) {
|
| DCHECK(main_loop_->BelongsToCurrentThread());
|
|
|
| @@ -496,6 +512,10 @@ bool WebMediaPlayerImpl::seeking() const {
|
| return seeking_;
|
| }
|
|
|
| +float WebMediaPlayerImpl::durationFloat() const {
|
| + return duration();
|
| +}
|
| +
|
| float WebMediaPlayerImpl::duration() const {
|
| DCHECK(main_loop_->BelongsToCurrentThread());
|
|
|
| @@ -525,6 +545,10 @@ float WebMediaPlayerImpl::duration() const {
|
| return static_cast<float>(duration);
|
| }
|
|
|
| +float WebMediaPlayerImpl::currentTimeFloat() const {
|
| + return currentTime();
|
| +}
|
| +
|
| float WebMediaPlayerImpl::currentTime() const {
|
| DCHECK(main_loop_->BelongsToCurrentThread());
|
| if (paused_)
|
| @@ -557,6 +581,10 @@ const WebKit::WebTimeRanges& WebMediaPlayerImpl::buffered() {
|
| return buffered_;
|
| }
|
|
|
| +float WebMediaPlayerImpl::maxTimeSeekableFloat() const {
|
| + return maxTimeSeekable();
|
| +}
|
| +
|
| float WebMediaPlayerImpl::maxTimeSeekable() const {
|
| DCHECK(main_loop_->BelongsToCurrentThread());
|
|
|
| @@ -635,6 +663,10 @@ WebMediaPlayer::MovieLoadType WebMediaPlayerImpl::movieLoadType() const {
|
| return WebMediaPlayer::MovieLoadTypeUnknown;
|
| }
|
|
|
| +float WebMediaPlayerImpl::mediaTimeForTimeValueFloat(float timeValue) const {
|
| + return mediaTimeForTimeValue(timeValue);
|
| +}
|
| +
|
| float WebMediaPlayerImpl::mediaTimeForTimeValue(float timeValue) const {
|
| return ConvertSecondsToTimestamp(timeValue).InSecondsF();
|
| }
|
|
|