Add xxxFloat() methods to WebMediaPlayer implementations.

These methods will be used to transition the corresponding WebMediaPlayer
methods from using floats to using doubles instead.

BUG=227156
TEST=All tests pass. No change in functionality.


Review URL: https://chromiumcodereview.appspot.com/13431009

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@192902 0039d316-1c4b-4281-b951-d872f2087c98

webkit/media/android/webmediaplayer_android.cc

@@ -114,6 +114,10 @@ void WebMediaPlayerAndroid::pause() {
   is_playing_ = false;
 }
 
+void WebMediaPlayerAndroid::seekFloat(float seconds) {
+  seek(seconds);
+}
+
 void WebMediaPlayerAndroid::seek(float seconds) {
   pending_seek_ = seconds;
   seeking_ = true;
@@ -129,15 +133,27 @@ bool WebMediaPlayerAndroid::supportsSave() const {
   return false;
 }
 
+void WebMediaPlayerAndroid::setEndTimeFloat(float seconds) {
+  setEndTime(seconds);
+}
+
 void WebMediaPlayerAndroid::setEndTime(float seconds) {
   // Deprecated.
   // TODO(qinmin): Remove this from WebKit::WebMediaPlayer as it is never used.
 }
 
+void WebMediaPlayerAndroid::setRateFloat(float rate) {
+  setRate(rate);
+}
+
 void WebMediaPlayerAndroid::setRate(float rate) {
   NOTIMPLEMENTED();
 }
 
+void WebMediaPlayerAndroid::setVolumeFloat(float volume) {
+  setVolume(volume);
+}
+
 void WebMediaPlayerAndroid::setVolume(float volume) {
   NOTIMPLEMENTED();
 }
@@ -186,10 +202,18 @@ bool WebMediaPlayerAndroid::seeking() const {
   return seeking_;
 }
 
+float WebMediaPlayerAndroid::durationFloat() const {
+  return duration();
+}
+
 float WebMediaPlayerAndroid::duration() const {
   return static_cast<float>(duration_.InSecondsF());
 }
 
+float WebMediaPlayerAndroid::currentTimeFloat() const {
+  return currentTime();
+}
+
 float WebMediaPlayerAndroid::currentTime() const {
   // If the player is pending for a seek, return the seek time.
   if (seeking())
@@ -220,6 +244,10 @@ const WebTimeRanges& WebMediaPlayerAndroid::buffered() {
   return buffered_;
 }
 
+float WebMediaPlayerAndroid::maxTimeSeekableFloat() const {
+  return maxTimeSeekable();
+}
+
 float WebMediaPlayerAndroid::maxTimeSeekable() const {
   // TODO(hclam): If this stream is not seekable this should return 0.
   return duration();
@@ -260,6 +288,10 @@ WebMediaPlayer::MovieLoadType WebMediaPlayerAndroid::movieLoadType() const {
   return WebMediaPlayer::MovieLoadTypeUnknown;
 }
 
+float WebMediaPlayerAndroid::mediaTimeForTimeValueFloat(float timeValue) const {
+  return mediaTimeForTimeValue(timeValue);
+}
+
 float WebMediaPlayerAndroid::mediaTimeForTimeValue(float timeValue) const {
   return ConvertSecondsToTimestamp(timeValue).InSecondsF();
 }

webkit/media/android/webmediaplayer_android.h

@@ -43,15 +43,20 @@ class WebMediaPlayerAndroid
   // Playback controls.
   virtual void play();
   virtual void pause();
+  virtual void seekFloat(float seconds);
   virtual void seek(float seconds);
   virtual bool supportsFullscreen() const;
   virtual bool supportsSave() const;
+  virtual void setEndTimeFloat(float seconds);
   virtual void setEndTime(float seconds);
+  virtual void setRateFloat(float rate);
   virtual void setRate(float rate);
+  virtual void setVolumeFloat(float volume);
   virtual void setVolume(float volume);
   virtual void setVisible(bool visible);
   virtual bool totalBytesKnown();
   virtual const WebKit::WebTimeRanges& buffered();
+  virtual float maxTimeSeekableFloat() const;
   virtual float maxTimeSeekable() const;
 
   // Methods for painting.
@@ -70,7 +75,9 @@ class WebMediaPlayerAndroid
   // Getters of playback state.
   virtual bool paused() const;
   virtual bool seeking() const;
+  virtual float durationFloat() const;
   virtual float duration() const;
+  virtual float currentTimeFloat() const;
   virtual float currentTime() const;
 
   // Get rate of loading the resource.
@@ -87,6 +94,7 @@ class WebMediaPlayerAndroid
   virtual bool didPassCORSAccessCheck() const;
   virtual WebKit::WebMediaPlayer::MovieLoadType movieLoadType() const;
 
+  virtual float mediaTimeForTimeValueFloat(float timeValue) const;
   virtual float mediaTimeForTimeValue(float timeValue) const;
 
   // Provide statistics.

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();
 }

webkit/media/webmediaplayer_impl.h

@@ -95,14 +95,19 @@ class WebMediaPlayerImpl
   virtual void pause();
   virtual bool supportsFullscreen() const;
   virtual bool supportsSave() const;
+  virtual void seekFloat(float seconds);
   virtual void seek(float seconds);
+  virtual void setEndTimeFloat(float seconds);
   virtual void setEndTime(float seconds);
+  virtual void setRateFloat(float rate);
   virtual void setRate(float rate);
+  virtual void setVolumeFloat(float volume);
   virtual void setVolume(float volume);
   virtual void setVisible(bool visible);
   virtual void setPreload(WebKit::WebMediaPlayer::Preload preload);
   virtual bool totalBytesKnown();
   virtual const WebKit::WebTimeRanges& buffered();
+  virtual float maxTimeSeekableFloat() const;
   virtual float maxTimeSeekable() const;
 
   // Methods for painting.
@@ -122,7 +127,9 @@ class WebMediaPlayerImpl
   // Getters of playback state.
   virtual bool paused() const;
   virtual bool seeking() const;
+  virtual float durationFloat() const;
   virtual float duration() const;
+  virtual float currentTimeFloat() const;
   virtual float currentTime() const;
 
   // Get rate of loading the resource.
@@ -141,6 +148,7 @@ class WebMediaPlayerImpl
   virtual bool didPassCORSAccessCheck() const;
   virtual WebKit::WebMediaPlayer::MovieLoadType movieLoadType() const;
 
+  virtual float mediaTimeForTimeValueFloat(float timeValue) const;
   virtual float mediaTimeForTimeValue(float timeValue) const;
 
   virtual unsigned decodedFrameCount() const;

webkit/media/webmediaplayer_ms.cc

@@ -184,18 +184,34 @@ bool WebMediaPlayerMS::supportsSave() const {
   return false;
 }
 
+void WebMediaPlayerMS::seekFloat(float seconds) {
+  seek(seconds);
+}
+
 void WebMediaPlayerMS::seek(float seconds) {
   DCHECK(thread_checker_.CalledOnValidThread());
 }
 
+void WebMediaPlayerMS::setEndTimeFloat(float seconds) {
+  setEndTime(seconds);
+}
+
 void WebMediaPlayerMS::setEndTime(float seconds) {
   DCHECK(thread_checker_.CalledOnValidThread());
 }
 
+void WebMediaPlayerMS::setRateFloat(float rate) {
+  setRate(rate);
+}
+
 void WebMediaPlayerMS::setRate(float rate) {
   DCHECK(thread_checker_.CalledOnValidThread());
 }
 
+void WebMediaPlayerMS::setVolumeFloat(float volume) {
+  setVolume(volume);
+}
+
 void WebMediaPlayerMS::setVolume(float volume) {
   DCHECK(thread_checker_.CalledOnValidThread());
   if (!audio_renderer_)
@@ -247,11 +263,19 @@ bool WebMediaPlayerMS::seeking() const {
   return false;
 }
 
+float WebMediaPlayerMS::durationFloat() const {
+  return duration();
+}
+
 float WebMediaPlayerMS::duration() const {
   DCHECK(thread_checker_.CalledOnValidThread());
   return std::numeric_limits<float>::infinity();
 }
 
+float WebMediaPlayerMS::currentTimeFloat() const {
+  return currentTime();
+}
+
 float WebMediaPlayerMS::currentTime() const {
   DCHECK(thread_checker_.CalledOnValidThread());
   if (current_frame_.get()) {
@@ -284,6 +308,10 @@ const WebKit::WebTimeRanges& WebMediaPlayerMS::buffered() {
   return buffered_;
 }
 
+float WebMediaPlayerMS::maxTimeSeekableFloat() const {
+  return maxTimeSeekable();
+}
+
 float WebMediaPlayerMS::maxTimeSeekable() const {
   DCHECK(thread_checker_.CalledOnValidThread());
   return 0.0f;
@@ -335,6 +363,10 @@ WebMediaPlayer::MovieLoadType WebMediaPlayerMS::movieLoadType() const {
   return WebMediaPlayer::MovieLoadTypeUnknown;
 }
 
+float WebMediaPlayerMS::mediaTimeForTimeValueFloat(float timeValue) const {
+  return mediaTimeForTimeValue(timeValue);
+}
+
 float WebMediaPlayerMS::mediaTimeForTimeValue(float timeValue) const {
   return ConvertSecondsToTimestamp(timeValue).InSecondsF();
 }

webkit/media/webmediaplayer_ms.h

@@ -74,15 +74,20 @@ class WebMediaPlayerMS
   virtual void pause() OVERRIDE;
   virtual bool supportsFullscreen() const OVERRIDE;
   virtual bool supportsSave() const OVERRIDE;
-  virtual void seek(float seconds) OVERRIDE;
-  virtual void setEndTime(float seconds) OVERRIDE;
-  virtual void setRate(float rate) OVERRIDE;
-  virtual void setVolume(float volume) OVERRIDE;
+  virtual void seekFloat(float seconds);
+  virtual void seek(float seconds);
+  virtual void setEndTimeFloat(float seconds);
+  virtual void setEndTime(float seconds);
+  virtual void setRateFloat(float rate);
+  virtual void setRate(float rate);
+  virtual void setVolumeFloat(float volume);
+  virtual void setVolume(float volume);
   virtual void setVisible(bool visible) OVERRIDE;
   virtual void setPreload(WebKit::WebMediaPlayer::Preload preload) OVERRIDE;
   virtual bool totalBytesKnown() OVERRIDE;
   virtual const WebKit::WebTimeRanges& buffered() OVERRIDE;
-  virtual float maxTimeSeekable() const OVERRIDE;
+  virtual float maxTimeSeekableFloat() const;
+  virtual float maxTimeSeekable() const;
 
   // Methods for painting.
   virtual void setSize(const WebKit::WebSize& size) OVERRIDE;
@@ -101,8 +106,10 @@ class WebMediaPlayerMS
   // Getters of playback state.
   virtual bool paused() const OVERRIDE;
   virtual bool seeking() const OVERRIDE;
-  virtual float duration() const OVERRIDE;
-  virtual float currentTime() const OVERRIDE;
+  virtual float durationFloat() const;
+  virtual float duration() const;
+  virtual float currentTimeFloat() const;
+  virtual float currentTime() const;
 
   // Get rate of loading the resource.
   virtual int32 dataRate() const OVERRIDE;
@@ -118,7 +125,8 @@ class WebMediaPlayerMS
   virtual bool didPassCORSAccessCheck() const OVERRIDE;
   virtual WebKit::WebMediaPlayer::MovieLoadType movieLoadType() const OVERRIDE;
 
-  virtual float mediaTimeForTimeValue(float timeValue) const OVERRIDE;
+  virtual float mediaTimeForTimeValueFloat(float timeValue) const;
+  virtual float mediaTimeForTimeValue(float timeValue) const;
 
   virtual unsigned decodedFrameCount() const OVERRIDE;
   virtual unsigned droppedFrameCount() const OVERRIDE;