summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authorscherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-09 23:24:52 +0000
committerscherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-09 23:24:52 +0000
commite12ee230a5555a8833051ac5a55c8e4a5d2b48ed (patch)
treed7df97e6184d7be23e1710be728332f1d0077f68 /chrome
parent859bcc91dc0cca4984fceecfe406c6042d209fe6 (diff)
downloadchromium_src-e12ee230a5555a8833051ac5a55c8e4a5d2b48ed.zip
chromium_src-e12ee230a5555a8833051ac5a55c8e4a5d2b48ed.tar.gz
chromium_src-e12ee230a5555a8833051ac5a55c8e4a5d2b48ed.tar.bz2
Revert "Made MediaFilter::host_ and MediaFilter::message_loop_ private."
TEST=none BUG=none TBR=evmar Review URL: http://codereview.chromium.org/155333 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20336 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/renderer/media/audio_renderer_impl.cc2
-rw-r--r--chrome/renderer/media/buffered_data_source.cc16
2 files changed, 9 insertions, 9 deletions
diff --git a/chrome/renderer/media/audio_renderer_impl.cc b/chrome/renderer/media/audio_renderer_impl.cc
index cdee03c..73f2320 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_->Error(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 ef987a5..ef92ce1 100644
--- a/chrome/renderer/media/buffered_data_source.cc
+++ b/chrome/renderer/media/buffered_data_source.cc
@@ -538,7 +538,7 @@ bool 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_->Error(media::PIPELINE_ERROR_NETWORK);
return false;
}
@@ -565,12 +565,12 @@ bool BufferedDataSource::Initialize(const std::string& url) {
if (resource_loader) {
if (net::ERR_IO_PENDING != resource_loader->Start(
NewCallback(this, &BufferedDataSource::InitialRequestStarted))) {
- host()->Error(media::PIPELINE_ERROR_NETWORK);
+ host_->Error(media::PIPELINE_ERROR_NETWORK);
return false;
}
return true;
}
- host()->Error(media::PIPELINE_ERROR_NETWORK);
+ host_->Error(media::PIPELINE_ERROR_NETWORK);
return false;
}
@@ -671,7 +671,7 @@ bool BufferedDataSource::IsSeekable() {
void BufferedDataSource::HandleError(media::PipelineError error) {
AutoLock auto_lock(lock_);
if (!stopped_) {
- host()->Error(error);
+ host_->Error(error);
}
}
@@ -695,13 +695,13 @@ void BufferedDataSource::OnInitialRequestStarted(int error) {
if (error == net::OK) {
total_bytes_ = buffered_resource_loader_->content_length();
if (IsSeekable()) {
- host()->SetTotalBytes(total_bytes_);
+ host_->SetTotalBytes(total_bytes_);
// TODO(hclam): report the amount of bytes buffered accurately.
- host()->SetBufferedBytes(total_bytes_);
+ host_->SetBufferedBytes(total_bytes_);
}
- host()->InitializationComplete();
+ host_->InitializationComplete();
} else {
- host()->Error(media::PIPELINE_ERROR_NETWORK);
+ host_->Error(media::PIPELINE_ERROR_NETWORK);
}
}
}