diff options
Diffstat (limited to 'chrome/renderer')
-rw-r--r-- | chrome/renderer/media/audio_renderer_impl.cc | 28 | ||||
-rw-r--r-- | chrome/renderer/media/audio_renderer_impl.h | 4 | ||||
-rw-r--r-- | chrome/renderer/renderer_webkitclient_impl.cc | 6 |
3 files changed, 19 insertions, 19 deletions
diff --git a/chrome/renderer/media/audio_renderer_impl.cc b/chrome/renderer/media/audio_renderer_impl.cc index 0021656..77f82b2 100644 --- a/chrome/renderer/media/audio_renderer_impl.cc +++ b/chrome/renderer/media/audio_renderer_impl.cc @@ -71,7 +71,7 @@ bool AudioRendererImpl::OnInitialize(const media::MediaFormat& media_format) { } void AudioRendererImpl::OnStop() { - AutoLock auto_lock(lock_); + base::AutoLock auto_lock(lock_); if (stopped_) return; stopped_ = true; @@ -84,7 +84,7 @@ void AudioRendererImpl::OnStop() { void AudioRendererImpl::ConsumeAudioSamples( scoped_refptr<media::Buffer> buffer_in) { - AutoLock auto_lock(lock_); + base::AutoLock auto_lock(lock_); if (stopped_) return; @@ -101,7 +101,7 @@ void AudioRendererImpl::ConsumeAudioSamples( void AudioRendererImpl::SetPlaybackRate(float rate) { DCHECK(rate >= 0.0f); - AutoLock auto_lock(lock_); + base::AutoLock auto_lock(lock_); // Handle the case where we stopped due to |io_loop_| dying. if (stopped_) { AudioRendererBase::SetPlaybackRate(rate); @@ -132,7 +132,7 @@ void AudioRendererImpl::SetPlaybackRate(float rate) { void AudioRendererImpl::Pause(media::FilterCallback* callback) { AudioRendererBase::Pause(callback); - AutoLock auto_lock(lock_); + base::AutoLock auto_lock(lock_); if (stopped_) return; @@ -143,7 +143,7 @@ void AudioRendererImpl::Pause(media::FilterCallback* callback) { void AudioRendererImpl::Seek(base::TimeDelta time, media::FilterCallback* callback) { AudioRendererBase::Seek(time, callback); - AutoLock auto_lock(lock_); + base::AutoLock auto_lock(lock_); if (stopped_) return; @@ -154,7 +154,7 @@ void AudioRendererImpl::Seek(base::TimeDelta time, void AudioRendererImpl::Play(media::FilterCallback* callback) { AudioRendererBase::Play(callback); - AutoLock auto_lock(lock_); + base::AutoLock auto_lock(lock_); if (stopped_) return; @@ -168,7 +168,7 @@ void AudioRendererImpl::Play(media::FilterCallback* callback) { } void AudioRendererImpl::SetVolume(float volume) { - AutoLock auto_lock(lock_); + base::AutoLock auto_lock(lock_); if (stopped_) return; io_loop_->PostTask(FROM_HERE, @@ -180,7 +180,7 @@ void AudioRendererImpl::OnCreated(base::SharedMemoryHandle handle, uint32 length) { DCHECK(MessageLoop::current() == io_loop_); - AutoLock auto_lock(lock_); + base::AutoLock auto_lock(lock_); if (stopped_) return; @@ -199,7 +199,7 @@ void AudioRendererImpl::OnRequestPacket(AudioBuffersState buffers_state) { DCHECK(MessageLoop::current() == io_loop_); { - AutoLock auto_lock(lock_); + base::AutoLock auto_lock(lock_); DCHECK(!pending_request_); pending_request_ = true; request_buffers_state_ = buffers_state; @@ -213,7 +213,7 @@ void AudioRendererImpl::OnStateChanged( const ViewMsg_AudioStreamState_Params& state) { DCHECK(MessageLoop::current() == io_loop_); - AutoLock auto_lock(lock_); + base::AutoLock auto_lock(lock_); if (stopped_) return; @@ -244,7 +244,7 @@ void AudioRendererImpl::OnVolume(double volume) { void AudioRendererImpl::CreateStreamTask(AudioParameters audio_params) { DCHECK(MessageLoop::current() == io_loop_); - AutoLock auto_lock(lock_); + base::AutoLock auto_lock(lock_); if (stopped_) return; @@ -297,7 +297,7 @@ void AudioRendererImpl::DestroyTask() { void AudioRendererImpl::SetVolumeTask(double volume) { DCHECK(MessageLoop::current() == io_loop_); - AutoLock auto_lock(lock_); + base::AutoLock auto_lock(lock_); if (stopped_) return; filter_->Send(new ViewHostMsg_SetAudioVolume(0, stream_id_, volume)); @@ -306,7 +306,7 @@ void AudioRendererImpl::SetVolumeTask(double volume) { void AudioRendererImpl::NotifyPacketReadyTask() { DCHECK(MessageLoop::current() == io_loop_); - AutoLock auto_lock(lock_); + base::AutoLock auto_lock(lock_); if (stopped_) return; if (pending_request_ && GetPlaybackRate() > 0.0f) { @@ -352,7 +352,7 @@ void AudioRendererImpl::WillDestroyCurrentMessageLoop() { DCHECK(MessageLoop::current() == io_loop_); // We treat the IO loop going away the same as stopping. - AutoLock auto_lock(lock_); + base::AutoLock auto_lock(lock_); if (stopped_) return; diff --git a/chrome/renderer/media/audio_renderer_impl.h b/chrome/renderer/media/audio_renderer_impl.h index 6463b27..7ea3dd5 100644 --- a/chrome/renderer/media/audio_renderer_impl.h +++ b/chrome/renderer/media/audio_renderer_impl.h @@ -41,8 +41,8 @@ #include "base/gtest_prod_util.h" #include "base/message_loop.h" #include "base/scoped_ptr.h" -#include "base/lock.h" #include "base/shared_memory.h" +#include "base/synchronization/lock.h" #include "chrome/renderer/audio_message_filter.h" #include "media/audio/audio_io.h" #include "media/audio/audio_manager.h" @@ -134,7 +134,7 @@ class AudioRendererImpl : public media::AudioRendererBase, // - |stopped_| // - |pending_request_| // - |request_buffers_state_| - Lock lock_; + base::Lock lock_; // A flag that indicates this filter is called to stop. bool stopped_; diff --git a/chrome/renderer/renderer_webkitclient_impl.cc b/chrome/renderer/renderer_webkitclient_impl.cc index cebbfd2..ab51c01 100644 --- a/chrome/renderer/renderer_webkitclient_impl.cc +++ b/chrome/renderer/renderer_webkitclient_impl.cc @@ -59,7 +59,7 @@ #include <string> #include <map> -#include "base/lock.h" +#include "base/synchronization/lock.h" #include "chrome/renderer/renderer_sandbox_support_linux.h" #include "third_party/WebKit/Source/WebKit/chromium/public/linux/WebSandboxSupport.h" #endif @@ -124,7 +124,7 @@ class RendererWebKitClientImpl::SandboxSupport // unicode code points. It needs this information frequently so we cache it // here. The key in this map is an array of 16-bit UTF16 values from WebKit. // The value is a string containing the correct font family. - Lock unicode_font_families_mutex_; + base::Lock unicode_font_families_mutex_; std::map<std::string, std::string> unicode_font_families_; #endif }; @@ -423,7 +423,7 @@ bool RendererWebKitClientImpl::SandboxSupport::ensureFontLoaded(HFONT font) { WebString RendererWebKitClientImpl::SandboxSupport::getFontFamilyForCharacters( const WebKit::WebUChar* characters, size_t num_characters) { - AutoLock lock(unicode_font_families_mutex_); + base::AutoLock lock(unicode_font_families_mutex_); const std::string key(reinterpret_cast<const char*>(characters), num_characters * sizeof(characters[0])); const std::map<std::string, std::string>::const_iterator iter = |