summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authorscherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-21 22:51:55 +0000
committerscherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-21 22:51:55 +0000
commitba6332442ae92c544eb6629c8604c608d6aeb5cd (patch)
tree5a438aabb24bd91f1e6b1360d546b7e856793544 /chrome
parenta6fb2d6387b558db727f7c3d421cde0e1e092aa7 (diff)
downloadchromium_src-ba6332442ae92c544eb6629c8604c608d6aeb5cd.zip
chromium_src-ba6332442ae92c544eb6629c8604c608d6aeb5cd.tar.gz
chromium_src-ba6332442ae92c544eb6629c8604c608d6aeb5cd.tar.bz2
Fixes bug in WebMediaPlayerDelegateImpl::Seek() where we (wrongly) assumed time was in milliseconds.
TBR=hclam Review URL: http://codereview.chromium.org/90009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@14151 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/renderer/webmediaplayer_delegate_impl.cc6
-rw-r--r--chrome/renderer/webmediaplayer_delegate_impl.h4
2 files changed, 5 insertions, 5 deletions
diff --git a/chrome/renderer/webmediaplayer_delegate_impl.cc b/chrome/renderer/webmediaplayer_delegate_impl.cc
index 5814389..80737fd 100644
--- a/chrome/renderer/webmediaplayer_delegate_impl.cc
+++ b/chrome/renderer/webmediaplayer_delegate_impl.cc
@@ -141,13 +141,13 @@ void WebMediaPlayerDelegateImpl::Stop() {
pipeline_.Stop();
}
-void WebMediaPlayerDelegateImpl::Seek(float time) {
+void WebMediaPlayerDelegateImpl::Seek(float seconds) {
DCHECK(main_loop_ && MessageLoop::current() == main_loop_);
- pipeline_.Seek(base::TimeDelta::FromMilliseconds(static_cast<int64>(time)));
+ pipeline_.Seek(base::TimeDelta::FromSeconds(static_cast<int64>(seconds)));
}
-void WebMediaPlayerDelegateImpl::SetEndTime(float time) {
+void WebMediaPlayerDelegateImpl::SetEndTime(float seconds) {
DCHECK(main_loop_ && MessageLoop::current() == main_loop_);
// TODO(hclam): add method call when it has been implemented.
diff --git a/chrome/renderer/webmediaplayer_delegate_impl.h b/chrome/renderer/webmediaplayer_delegate_impl.h
index 08a108d..7fdba71 100644
--- a/chrome/renderer/webmediaplayer_delegate_impl.h
+++ b/chrome/renderer/webmediaplayer_delegate_impl.h
@@ -81,8 +81,8 @@ class WebMediaPlayerDelegateImpl : public webkit_glue::WebMediaPlayerDelegate,
virtual void Play();
virtual void Pause();
virtual void Stop();
- virtual void Seek(float time);
- virtual void SetEndTime(float time);
+ virtual void Seek(float seconds);
+ virtual void SetEndTime(float seconds);
virtual void SetPlaybackRate(float rate);
virtual void SetVolume(float volume);
virtual void SetVisible(bool visible);