diff options
| author | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-17 22:09:28 +0000 |
|---|---|---|
| committer | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-17 22:09:28 +0000 |
| commit | 128740bbcd5abb0c75254e6eb57b46192c1f47d1 (patch) | |
| tree | 635b88468f502fdf65828766735de711e86170e2 /webkit/glue | |
| parent | 6973e1cbd7434f30ed00c49a23838a82f90e8a0f (diff) | |
| download | chromium_src-128740bbcd5abb0c75254e6eb57b46192c1f47d1.zip chromium_src-128740bbcd5abb0c75254e6eb57b46192c1f47d1.tar.gz chromium_src-128740bbcd5abb0c75254e6eb57b46192c1f47d1.tar.bz2 | |
Renamed FilterHost::Error() and Pipeline::GetTime() to more appropriate names.
BUG=17107
TEST=none
Review URL: http://codereview.chromium.org/155711
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21013 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue')
| -rw-r--r-- | webkit/glue/media/simple_data_source.cc | 4 | ||||
| -rw-r--r-- | webkit/glue/webmediaplayer_impl.cc | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/webkit/glue/media/simple_data_source.cc b/webkit/glue/media/simple_data_source.cc index afa27ff..f426a14 100644 --- a/webkit/glue/media/simple_data_source.cc +++ b/webkit/glue/media/simple_data_source.cc @@ -66,7 +66,7 @@ void SimpleDataSource::Initialize(const std::string& url, // Validate the URL. SetURL(GURL(url)); if (!url_.is_valid() || !IsSchemeSupported(url_)) { - host()->Error(media::PIPELINE_ERROR_NETWORK); + host()->SetError(media::PIPELINE_ERROR_NETWORK); initialize_callback_->Run(); initialize_callback_.reset(); return; @@ -155,7 +155,7 @@ void SimpleDataSource::OnCompletedRequest(const URLRequestStatus& status, host()->SetTotalBytes(size_); host()->SetBufferedBytes(size_); } else { - host()->Error(media::PIPELINE_ERROR_NETWORK); + host()->SetError(media::PIPELINE_ERROR_NETWORK); } initialize_callback_->Run(); initialize_callback_.reset(); diff --git a/webkit/glue/webmediaplayer_impl.cc b/webkit/glue/webmediaplayer_impl.cc index b817239..fad8825 100644 --- a/webkit/glue/webmediaplayer_impl.cc +++ b/webkit/glue/webmediaplayer_impl.cc @@ -298,7 +298,7 @@ float WebMediaPlayerImpl::duration() const { float WebMediaPlayerImpl::currentTime() const { DCHECK(MessageLoop::current() == main_loop_); - return static_cast<float>(pipeline_->GetTime().InSecondsF()); + return static_cast<float>(pipeline_->GetCurrentTime().InSecondsF()); } int WebMediaPlayerImpl::dataRate() const { |