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 /chrome/renderer | |
| 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 'chrome/renderer')
| -rw-r--r-- | chrome/renderer/media/audio_renderer_impl.cc | 2 | ||||
| -rw-r--r-- | chrome/renderer/media/buffered_data_source.cc | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/chrome/renderer/media/audio_renderer_impl.cc b/chrome/renderer/media/audio_renderer_impl.cc index cdee03c..c64c432 100644 --- a/chrome/renderer/media/audio_renderer_impl.cc +++ b/chrome/renderer/media/audio_renderer_impl.cc @@ -194,7 +194,7 @@ void AudioRendererImpl::OnStateChanged(AudioOutputStream::State state, switch (state) { case AudioOutputStream::STATE_ERROR: - host()->Error(media::PIPELINE_ERROR_AUDIO_HARDWARE); + host()->SetError(media::PIPELINE_ERROR_AUDIO_HARDWARE); break; // TODO(hclam): handle these events. case AudioOutputStream::STATE_STARTED: diff --git a/chrome/renderer/media/buffered_data_source.cc b/chrome/renderer/media/buffered_data_source.cc index edec5c1..fab726f 100644 --- a/chrome/renderer/media/buffered_data_source.cc +++ b/chrome/renderer/media/buffered_data_source.cc @@ -542,7 +542,7 @@ void BufferedDataSource::Initialize(const std::string& url, // Make sure we support the scheme of the URL. if (!IsSchemeSupported(url_)) { - host()->Error(media::PIPELINE_ERROR_NETWORK); + host()->SetError(media::PIPELINE_ERROR_NETWORK); initialize_callback_->Run(); initialize_callback_.reset(); return; @@ -569,7 +569,7 @@ void BufferedDataSource::Initialize(const std::string& url, // Use the local reference to start the request. if (!resource_loader) { - host()->Error(media::PIPELINE_ERROR_NETWORK); + host()->SetError(media::PIPELINE_ERROR_NETWORK); initialize_callback_->Run(); initialize_callback_.reset(); return; @@ -577,7 +577,7 @@ void BufferedDataSource::Initialize(const std::string& url, if (net::ERR_IO_PENDING != resource_loader->Start( NewCallback(this, &BufferedDataSource::InitialRequestStarted))) { - host()->Error(media::PIPELINE_ERROR_NETWORK); + host()->SetError(media::PIPELINE_ERROR_NETWORK); initialize_callback_->Run(); initialize_callback_.reset(); } @@ -680,7 +680,7 @@ bool BufferedDataSource::IsSeekable() { void BufferedDataSource::HandleError(media::PipelineError error) { AutoLock auto_lock(lock_); if (!stopped_) { - host()->Error(error); + host()->SetError(error); } } @@ -709,7 +709,7 @@ void BufferedDataSource::OnInitialRequestStarted(int error) { host()->SetBufferedBytes(total_bytes_); } } else { - host()->Error(media::PIPELINE_ERROR_NETWORK); + host()->SetError(media::PIPELINE_ERROR_NETWORK); } } initialize_callback_->Run(); |