Index: webkit/media/webmediaplayer_ms.h |
diff --git a/webkit/media/webmediaplayer_ms.h b/webkit/media/webmediaplayer_ms.h |
index a6eea43d3a7e0c39e256e8cacd3c62ff88ca75df..3140a529aab64e6a82816c00ef4abf8c84f93b0d 100644 |
--- a/webkit/media/webmediaplayer_ms.h |
+++ b/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; |