Remove xxxFloat() and setEndTime() methods from WebMediaPlayer implementations.

BUG=227156
TEST=None. This change just removes dead code.

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

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

6 files changed, 0 insertions, 168 deletions

diff --git a/webkit/media/android/webmediaplayer_android.cc b/webkit/media/android/webmediaplayer_android.cc
index e586d91..728dfcbe 100644
--- a/webkit/media/android/webmediaplayer_android.cc
+++ b/webkit/media/android/webmediaplayer_android.cc
@@ -113,10 +113,6 @@ void WebMediaPlayerAndroid::pause() {
   is_playing_ = false;
 }
 
-void WebMediaPlayerAndroid::seekFloat(float seconds) {
-  seek(seconds);
-}
-
 void WebMediaPlayerAndroid::seek(double seconds) {
   pending_seek_ = seconds;
   seeking_ = true;
@@ -132,27 +128,10 @@ bool WebMediaPlayerAndroid::supportsSave() const {
   return false;
 }
 
-void WebMediaPlayerAndroid::setEndTimeFloat(float seconds) {
-  setEndTime(seconds);
-}
-
-void WebMediaPlayerAndroid::setEndTime(double seconds) {
-  // Deprecated.
-  // TODO(qinmin): Remove this from WebKit::WebMediaPlayer as it is never used.
-}
-
-void WebMediaPlayerAndroid::setRateFloat(float rate) {
-  setRate(rate);
-}
-
 void WebMediaPlayerAndroid::setRate(double rate) {
   NOTIMPLEMENTED();
 }
 
-void WebMediaPlayerAndroid::setVolumeFloat(float volume) {
-  setVolume(volume);
-}
-
 void WebMediaPlayerAndroid::setVolume(double volume) {
   NOTIMPLEMENTED();
 }
@@ -201,18 +180,10 @@ bool WebMediaPlayerAndroid::seeking() const {
   return seeking_;
 }
 
-float WebMediaPlayerAndroid::durationFloat() const {
-  return duration();
-}
-
 double WebMediaPlayerAndroid::duration() const {
   return duration_.InSecondsF();
 }
 
-float WebMediaPlayerAndroid::currentTimeFloat() const {
-  return currentTime();
-}
-
 double WebMediaPlayerAndroid::currentTime() const {
   // If the player is pending for a seek, return the seek time.
   if (seeking())
@@ -243,10 +214,6 @@ const WebTimeRanges& WebMediaPlayerAndroid::buffered() {
   return buffered_;
 }
 
-float WebMediaPlayerAndroid::maxTimeSeekableFloat() const {
-  return maxTimeSeekable();
-}
-
 double WebMediaPlayerAndroid::maxTimeSeekable() const {
   // TODO(hclam): If this stream is not seekable this should return 0.
   return duration();
@@ -319,10 +286,6 @@ WebMediaPlayer::MovieLoadType WebMediaPlayerAndroid::movieLoadType() const {
   return WebMediaPlayer::MovieLoadTypeUnknown;
 }
 
-float WebMediaPlayerAndroid::mediaTimeForTimeValueFloat(float timeValue) const {
-  return mediaTimeForTimeValue(timeValue);
-}
-
 double WebMediaPlayerAndroid::mediaTimeForTimeValue(double timeValue) const {
   return ConvertSecondsToTimestamp(timeValue).InSecondsF();
 }
diff --git a/webkit/media/android/webmediaplayer_android.h b/webkit/media/android/webmediaplayer_android.h
index 90f245b..9d01e60 100644
--- a/webkit/media/android/webmediaplayer_android.h
+++ b/webkit/media/android/webmediaplayer_android.h
@@ -45,20 +45,14 @@ class WebMediaPlayerAndroid
   // Playback controls.
   virtual void play();
   virtual void pause();
-  virtual void seekFloat(float seconds);
   virtual void seek(double seconds);
   virtual bool supportsFullscreen() const;
   virtual bool supportsSave() const;
-  virtual void setEndTimeFloat(float seconds);
-  virtual void setEndTime(double seconds);
-  virtual void setRateFloat(float rate);
   virtual void setRate(double rate);
-  virtual void setVolumeFloat(float volume);
   virtual void setVolume(double volume);
   virtual void setVisible(bool visible);
   virtual bool totalBytesKnown();
   virtual const WebKit::WebTimeRanges& buffered();
-  virtual float maxTimeSeekableFloat() const;
   virtual double maxTimeSeekable() const;
 
   // Methods for painting.
@@ -85,9 +79,7 @@ class WebMediaPlayerAndroid
   // Getters of playback state.
   virtual bool paused() const;
   virtual bool seeking() const;
-  virtual float durationFloat() const;
   virtual double duration() const;
-  virtual float currentTimeFloat() const;
   virtual double currentTime() const;
 
   // Get rate of loading the resource.
@@ -104,7 +96,6 @@ class WebMediaPlayerAndroid
   virtual bool didPassCORSAccessCheck() const;
   virtual WebKit::WebMediaPlayer::MovieLoadType movieLoadType() const;
 
-  virtual float mediaTimeForTimeValueFloat(float timeValue) const;
   virtual double mediaTimeForTimeValue(double timeValue) const;
 
   // Provide statistics.
diff --git a/webkit/media/webmediaplayer_impl.cc b/webkit/media/webmediaplayer_impl.cc
index 3d5722f..39d73cc 100644
--- a/webkit/media/webmediaplayer_impl.cc
+++ b/webkit/media/webmediaplayer_impl.cc
@@ -329,10 +329,6 @@ bool WebMediaPlayerImpl::supportsSave() const {
   return supports_save_;
 }
 
-void WebMediaPlayerImpl::seekFloat(float seconds) {
-  seek(seconds);
-}
-
 void WebMediaPlayerImpl::seek(double seconds) {
   DCHECK(main_loop_->BelongsToCurrentThread());
 
@@ -363,21 +359,6 @@ void WebMediaPlayerImpl::seek(double seconds) {
       BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::OnPipelineSeek));
 }
 
-void WebMediaPlayerImpl::setEndTimeFloat(float seconds) {
-  setEndTime(seconds);
-}
-
-void WebMediaPlayerImpl::setEndTime(double seconds) {
-  DCHECK(main_loop_->BelongsToCurrentThread());
-
-  // TODO(hclam): add method call when it has been implemented.
-  return;
-}
-
-void WebMediaPlayerImpl::setRateFloat(float rate) {
-  setRate(rate);
-}
-
 void WebMediaPlayerImpl::setRate(double rate) {
   DCHECK(main_loop_->BelongsToCurrentThread());
 
@@ -400,10 +381,6 @@ void WebMediaPlayerImpl::setRate(double rate) {
   }
 }
 
-void WebMediaPlayerImpl::setVolumeFloat(float volume) {
-  setVolume(volume);
-}
-
 void WebMediaPlayerImpl::setVolume(double volume) {
   DCHECK(main_loop_->BelongsToCurrentThread());
 
@@ -474,29 +451,6 @@ bool WebMediaPlayerImpl::seeking() const {
   return seeking_;
 }
 
-float WebMediaPlayerImpl::durationFloat() const {
-  if (ready_state_ == WebMediaPlayer::ReadyStateHaveNothing)
-    return std::numeric_limits<float>::quiet_NaN();
-
-  double result = duration();
-
-  // Make sure super small durations don't get truncated to 0 and
-  // large durations don't get converted to infinity by the double -> float
-  // conversion.
-  //
-  // TODO(acolwell): Remove when WebKit is changed to report duration as a
-  // double.
-  if (result > 0.0 && result < std::numeric_limits<double>::infinity()) {
-    result = std::max(result,
-                      static_cast<double>(std::numeric_limits<float>::min()));
-    result = std::min(result,
-                      static_cast<double>(std::numeric_limits<float>::max()));
-  }
-
-  return static_cast<float>(result);
-
-}
-
 double WebMediaPlayerImpl::duration() const {
   DCHECK(main_loop_->BelongsToCurrentThread());
 
@@ -509,10 +463,6 @@ double WebMediaPlayerImpl::duration() const {
   return GetPipelineDuration();
 }
 
-float WebMediaPlayerImpl::currentTimeFloat() const {
-  return static_cast<float>(currentTime());
-}
-
 double WebMediaPlayerImpl::currentTime() const {
   DCHECK(main_loop_->BelongsToCurrentThread());
   return (paused_ ? paused_time_ : pipeline_->GetMediaTime()).InSecondsF();
@@ -543,20 +493,6 @@ const WebKit::WebTimeRanges& WebMediaPlayerImpl::buffered() {
   return buffered_;
 }
 
-float WebMediaPlayerImpl::maxTimeSeekableFloat() const {
-  DCHECK(main_loop_->BelongsToCurrentThread());
-
-  // If we haven't even gotten to ReadyStateHaveMetadata yet then just
-  // return 0 so that the seekable range is empty.
-  if (ready_state_ < WebMediaPlayer::ReadyStateHaveMetadata)
-    return 0.0f;
-
-  // We don't support seeking in streaming media.
-  if (data_source_ && data_source_->IsStreaming())
-    return 0.0f;
-  return durationFloat();
-}
-
 double WebMediaPlayerImpl::maxTimeSeekable() const {
   DCHECK(main_loop_->BelongsToCurrentThread());
 
@@ -635,10 +571,6 @@ WebMediaPlayer::MovieLoadType WebMediaPlayerImpl::movieLoadType() const {
   return WebMediaPlayer::MovieLoadTypeUnknown;
 }
 
-float WebMediaPlayerImpl::mediaTimeForTimeValueFloat(float timeValue) const {
-  return mediaTimeForTimeValue(timeValue);
-}
-
 double WebMediaPlayerImpl::mediaTimeForTimeValue(double timeValue) const {
   return ConvertSecondsToTimestamp(timeValue).InSecondsF();
 }
diff --git a/webkit/media/webmediaplayer_impl.h b/webkit/media/webmediaplayer_impl.h
index 1144c71..85c4dec 100644
--- a/webkit/media/webmediaplayer_impl.h
+++ b/webkit/media/webmediaplayer_impl.h
@@ -96,19 +96,13 @@ class WebMediaPlayerImpl
   virtual void pause();
   virtual bool supportsFullscreen() const;
   virtual bool supportsSave() const;
-  virtual void seekFloat(float seconds);
   virtual void seek(double seconds);
-  virtual void setEndTimeFloat(float seconds);
-  virtual void setEndTime(double seconds);
-  virtual void setRateFloat(float rate);
   virtual void setRate(double rate);
-  virtual void setVolumeFloat(float volume);
   virtual void setVolume(double 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 double maxTimeSeekable() const;
 
   // Methods for painting.
@@ -128,9 +122,7 @@ class WebMediaPlayerImpl
   // Getters of playback state.
   virtual bool paused() const;
   virtual bool seeking() const;
-  virtual float durationFloat() const;
   virtual double duration() const;
-  virtual float currentTimeFloat() const;
   virtual double currentTime() const;
 
   // Get rate of loading the resource.
@@ -149,7 +141,6 @@ class WebMediaPlayerImpl
   virtual bool didPassCORSAccessCheck() const;
   virtual WebKit::WebMediaPlayer::MovieLoadType movieLoadType() const;
 
-  virtual float mediaTimeForTimeValueFloat(float timeValue) const;
   virtual double mediaTimeForTimeValue(double timeValue) const;
 
   virtual unsigned decodedFrameCount() const;
diff --git a/webkit/media/webmediaplayer_ms.cc b/webkit/media/webmediaplayer_ms.cc
index 377bbb7..50b3e9f 100644
--- a/webkit/media/webmediaplayer_ms.cc
+++ b/webkit/media/webmediaplayer_ms.cc
@@ -184,34 +184,14 @@ bool WebMediaPlayerMS::supportsSave() const {
   return false;
 }
 
-void WebMediaPlayerMS::seekFloat(float seconds) {
-  seek(seconds);
-}
-
 void WebMediaPlayerMS::seek(double seconds) {
   DCHECK(thread_checker_.CalledOnValidThread());
 }
 
-void WebMediaPlayerMS::setEndTimeFloat(float seconds) {
-  setEndTime(seconds);
-}
-
-void WebMediaPlayerMS::setEndTime(double seconds) {
-  DCHECK(thread_checker_.CalledOnValidThread());
-}
-
-void WebMediaPlayerMS::setRateFloat(float rate) {
-  setRate(rate);
-}
-
 void WebMediaPlayerMS::setRate(double rate) {
   DCHECK(thread_checker_.CalledOnValidThread());
 }
 
-void WebMediaPlayerMS::setVolumeFloat(float volume) {
-  setVolume(volume);
-}
-
 void WebMediaPlayerMS::setVolume(double volume) {
   DCHECK(thread_checker_.CalledOnValidThread());
   if (!audio_renderer_)
@@ -263,19 +243,11 @@ bool WebMediaPlayerMS::seeking() const {
   return false;
 }
 
-float WebMediaPlayerMS::durationFloat() const {
-  return duration();
-}
-
 double WebMediaPlayerMS::duration() const {
   DCHECK(thread_checker_.CalledOnValidThread());
   return std::numeric_limits<double>::infinity();
 }
 
-float WebMediaPlayerMS::currentTimeFloat() const {
-  return currentTime();
-}
-
 double WebMediaPlayerMS::currentTime() const {
   DCHECK(thread_checker_.CalledOnValidThread());
   if (current_frame_.get()) {
@@ -308,10 +280,6 @@ const WebKit::WebTimeRanges& WebMediaPlayerMS::buffered() {
   return buffered_;
 }
 
-float WebMediaPlayerMS::maxTimeSeekableFloat() const {
-  return maxTimeSeekable();
-}
-
 double WebMediaPlayerMS::maxTimeSeekable() const {
   DCHECK(thread_checker_.CalledOnValidThread());
   return 0.0;
@@ -363,10 +331,6 @@ WebMediaPlayer::MovieLoadType WebMediaPlayerMS::movieLoadType() const {
   return WebMediaPlayer::MovieLoadTypeUnknown;
 }
 
-float WebMediaPlayerMS::mediaTimeForTimeValueFloat(float timeValue) const {
-  return mediaTimeForTimeValue(timeValue);
-}
-
 double WebMediaPlayerMS::mediaTimeForTimeValue(double timeValue) const {
   return ConvertSecondsToTimestamp(timeValue).InSecondsF();
 }
diff --git a/webkit/media/webmediaplayer_ms.h b/webkit/media/webmediaplayer_ms.h
index 5036db1..5213ca9 100644
--- a/webkit/media/webmediaplayer_ms.h
+++ b/webkit/media/webmediaplayer_ms.h
@@ -74,19 +74,13 @@ class WebMediaPlayerMS
   virtual void pause() OVERRIDE;
   virtual bool supportsFullscreen() const OVERRIDE;
   virtual bool supportsSave() const OVERRIDE;
-  virtual void seekFloat(float seconds);
   virtual void seek(double seconds);
-  virtual void setEndTimeFloat(float seconds);
-  virtual void setEndTime(double seconds);
-  virtual void setRateFloat(float rate);
   virtual void setRate(double rate);
-  virtual void setVolumeFloat(float volume);
   virtual void setVolume(double 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 maxTimeSeekableFloat() const;
   virtual double maxTimeSeekable() const;
 
   // Methods for painting.
@@ -106,9 +100,7 @@ class WebMediaPlayerMS
   // Getters of playback state.
   virtual bool paused() const OVERRIDE;
   virtual bool seeking() const OVERRIDE;
-  virtual float durationFloat() const;
   virtual double duration() const;
-  virtual float currentTimeFloat() const;
   virtual double currentTime() const;
 
   // Get rate of loading the resource.
@@ -125,7 +117,6 @@ class WebMediaPlayerMS
   virtual bool didPassCORSAccessCheck() const OVERRIDE;
   virtual WebKit::WebMediaPlayer::MovieLoadType movieLoadType() const OVERRIDE;
 
-  virtual float mediaTimeForTimeValueFloat(float timeValue) const;
   virtual double mediaTimeForTimeValue(double timeValue) const;
 
   virtual unsigned decodedFrameCount() const OVERRIDE;