Change original WebMediaPlayer signatures from float to double.

webkit/media/android/webmediaplayer_android.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "webkit/media/android/webmediaplayer_android.h"
 
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 96 matching lines @@
 
 void WebMediaPlayerAndroid::pause() {
   PauseInternal();
   is_playing_ = false;
 }
 
 void WebMediaPlayerAndroid::seekFloat(float seconds) {
   seek(seconds);
 }
 
-void WebMediaPlayerAndroid::seek(float seconds) {
+void WebMediaPlayerAndroid::seek(double seconds) {
   pending_seek_ = seconds;
   seeking_ = true;
 
   SeekInternal(ConvertSecondsToTimestamp(seconds));
 }
 
 bool WebMediaPlayerAndroid::supportsFullscreen() const {
   return true;
 }
 
 bool WebMediaPlayerAndroid::supportsSave() const {
   return false;
 }
 
 void WebMediaPlayerAndroid::setEndTimeFloat(float seconds) {
   setEndTime(seconds);
 }
 
-void WebMediaPlayerAndroid::setEndTime(float seconds) {
+void WebMediaPlayerAndroid::setEndTime(double seconds) {
   // Deprecated.
   // TODO(qinmin): Remove this from WebKit::WebMediaPlayer as it is never used.

[DaleCurtis, 2013/04/16 01:19:48]

May lead to some unexpected breakage if this isn't true...

[acolwell GONE FROM CHROMIUM, 2013/04/16 16:58:15]

This isn't called. I plan on removing this particular method in a separate CL.

 }
 
 void WebMediaPlayerAndroid::setRateFloat(float rate) {
   setRate(rate);
 }
 
-void WebMediaPlayerAndroid::setRate(float rate) {
+void WebMediaPlayerAndroid::setRate(double rate) {
   NOTIMPLEMENTED();

[DaleCurtis, 2013/04/16 01:19:48]

Ditto.

[acolwell GONE FROM CHROMIUM, 2013/04/16 16:58:15]

Right now I'm just preserving existing behavior. I'm not sure why Android
doesn't support setRate() and setVolume() at this point, but I don't think
changing this is in line w/ this particular CL.

 }
 
 void WebMediaPlayerAndroid::setVolumeFloat(float volume) {
   setVolume(volume);
 }
 
-void WebMediaPlayerAndroid::setVolume(float volume) {
+void WebMediaPlayerAndroid::setVolume(double volume) {
   NOTIMPLEMENTED();

[DaleCurtis, 2013/04/16 01:19:48]

Ditto.

[acolwell GONE FROM CHROMIUM, 2013/04/16 16:58:15]

Just preserving existing behavior here.

 }
 
 void WebMediaPlayerAndroid::setVisible(bool visible) {
   // Deprecated.
   // TODO(qinmin): Remove this from WebKit::WebMediaPlayer as it is never used.
 }
 
 bool WebMediaPlayerAndroid::totalBytesKnown() {
   NOTIMPLEMENTED();
   return false;
@@ skipping 27 matching lines @@
 
 bool WebMediaPlayerAndroid::paused() const {
   return !is_playing_;
 }
 
 bool WebMediaPlayerAndroid::seeking() const {
   return seeking_;
 }
 
 float WebMediaPlayerAndroid::durationFloat() const {
-  return duration();
+  return static_cast<float>(duration());

[DaleCurtis, 2013/04/16 01:19:48]

static cast is unnecessary?

[acolwell GONE FROM CHROMIUM, 2013/04/16 16:58:15]

Done.

 }
 
-float WebMediaPlayerAndroid::duration() const {
-  return static_cast<float>(duration_.InSecondsF());
+double WebMediaPlayerAndroid::duration() const {
+  return duration_.InSecondsF();
 }
 
 float WebMediaPlayerAndroid::currentTimeFloat() const {
   return currentTime();
 }
 
-float WebMediaPlayerAndroid::currentTime() const {
+double WebMediaPlayerAndroid::currentTime() const {
   // If the player is pending for a seek, return the seek time.
   if (seeking())
     return pending_seek_;
 
   return GetCurrentTimeInternal();
 }
 
 int WebMediaPlayerAndroid::dataRate() const {
   // Deprecated.
   // TODO(qinmin): Remove this from WebKit::WebMediaPlayer as it is never used.
@@ skipping 13 matching lines @@
 }
 
 const WebTimeRanges& WebMediaPlayerAndroid::buffered() {
   return buffered_;
 }
 
 float WebMediaPlayerAndroid::maxTimeSeekableFloat() const {
   return maxTimeSeekable();
 }
 
-float WebMediaPlayerAndroid::maxTimeSeekable() const {
+double WebMediaPlayerAndroid::maxTimeSeekable() const {
   // TODO(hclam): If this stream is not seekable this should return 0.
   return duration();
 }
 
 bool WebMediaPlayerAndroid::didLoadingProgress() const {
   bool ret = did_loading_progress_;
   did_loading_progress_ = false;
   return ret;
 }
 
@@ skipping 23 matching lines @@
 WebMediaPlayer::MovieLoadType WebMediaPlayerAndroid::movieLoadType() const {
   // Deprecated.
   // TODO(qinmin): Remove this from WebKit::WebMediaPlayer as it is never used.
   return WebMediaPlayer::MovieLoadTypeUnknown;
 }
 
 float WebMediaPlayerAndroid::mediaTimeForTimeValueFloat(float timeValue) const {
   return mediaTimeForTimeValue(timeValue);
 }
 
-float WebMediaPlayerAndroid::mediaTimeForTimeValue(float timeValue) const {
+double WebMediaPlayerAndroid::mediaTimeForTimeValue(double timeValue) const {
   return ConvertSecondsToTimestamp(timeValue).InSecondsF();

[DaleCurtis, 2013/04/16 01:19:48]

The upconversion to double here could cause a user visible difference, right?

[acolwell GONE FROM CHROMIUM, 2013/04/16 16:58:15]

Only for really large time values that no one is likely to encounter at the
moment. Tiny values are truncated to microsecond resolution so there should be
no difference on the small end of things. I think this should be safe for the
brief period between this patch landing and the followup Blink patch.

 }
 
 unsigned WebMediaPlayerAndroid::decodedFrameCount() const {
   NOTIMPLEMENTED();
   return 0;
 }
 
 unsigned WebMediaPlayerAndroid::droppedFrameCount() const {
   NOTIMPLEMENTED();
   return 0;
@@ skipping 216 matching lines @@
 
 void WebMediaPlayerAndroid::SetNeedsEstablishPeer(bool needs_establish_peer) {
   needs_establish_peer_ = needs_establish_peer;
 }
 
 void WebMediaPlayerAndroid::UpdatePlayingState(bool is_playing) {
   is_playing_ = is_playing;
 }
 
 }  // namespace webkit_media