diff options
Diffstat (limited to 'chrome/browser/renderer_host')
6 files changed, 25 insertions, 25 deletions
diff --git a/chrome/browser/renderer_host/accelerated_surface_container_manager_mac.cc b/chrome/browser/renderer_host/accelerated_surface_container_manager_mac.cc index a96782b..ff1f052 100644 --- a/chrome/browser/renderer_host/accelerated_surface_container_manager_mac.cc +++ b/chrome/browser/renderer_host/accelerated_surface_container_manager_mac.cc @@ -18,7 +18,7 @@ AcceleratedSurfaceContainerManagerMac::AcceleratedSurfaceContainerManagerMac() gfx::PluginWindowHandle AcceleratedSurfaceContainerManagerMac::AllocateFakePluginWindowHandle( bool opaque, bool root) { - AutoLock lock(lock_); + base::AutoLock lock(lock_); AcceleratedSurfaceContainerMac* container = new AcceleratedSurfaceContainerMac(this, opaque); @@ -34,7 +34,7 @@ AcceleratedSurfaceContainerManagerMac::AllocateFakePluginWindowHandle( void AcceleratedSurfaceContainerManagerMac::DestroyFakePluginWindowHandle( gfx::PluginWindowHandle id) { - AutoLock lock(lock_); + base::AutoLock lock(lock_); AcceleratedSurfaceContainerMac* container = MapIDToContainer(id); if (container) { @@ -65,7 +65,7 @@ void AcceleratedSurfaceContainerManagerMac::SetSizeAndIOSurface( int32 width, int32 height, uint64 io_surface_identifier) { - AutoLock lock(lock_); + base::AutoLock lock(lock_); AcceleratedSurfaceContainerMac* container = MapIDToContainer(id); if (container) { @@ -78,7 +78,7 @@ void AcceleratedSurfaceContainerManagerMac::SetSizeAndTransportDIB( int32 width, int32 height, TransportDIB::Handle transport_dib) { - AutoLock lock(lock_); + base::AutoLock lock(lock_); AcceleratedSurfaceContainerMac* container = MapIDToContainer(id); if (container) @@ -87,7 +87,7 @@ void AcceleratedSurfaceContainerManagerMac::SetSizeAndTransportDIB( void AcceleratedSurfaceContainerManagerMac::SetPluginContainerGeometry( const webkit::npapi::WebPluginGeometry& move) { - AutoLock lock(lock_); + base::AutoLock lock(lock_); AcceleratedSurfaceContainerMac* container = MapIDToContainer(move.window); if (container) @@ -96,7 +96,7 @@ void AcceleratedSurfaceContainerManagerMac::SetPluginContainerGeometry( void AcceleratedSurfaceContainerManagerMac::Draw(CGLContextObj context, gfx::PluginWindowHandle id) { - AutoLock lock(lock_); + base::AutoLock lock(lock_); glColorMask(true, true, true, true); // Should match the clear color of RenderWidgetHostViewMac. @@ -123,7 +123,7 @@ void AcceleratedSurfaceContainerManagerMac::Draw(CGLContextObj context, } void AcceleratedSurfaceContainerManagerMac::ForceTextureReload() { - AutoLock lock(lock_); + base::AutoLock lock(lock_); for (PluginWindowToContainerMap::const_iterator i = plugin_window_to_container_map_.begin(); @@ -135,7 +135,7 @@ void AcceleratedSurfaceContainerManagerMac::ForceTextureReload() { void AcceleratedSurfaceContainerManagerMac::SetSurfaceWasPaintedTo( gfx::PluginWindowHandle id, uint64 surface_id) { - AutoLock lock(lock_); + base::AutoLock lock(lock_); AcceleratedSurfaceContainerMac* container = MapIDToContainer(id); if (container) @@ -143,14 +143,14 @@ void AcceleratedSurfaceContainerManagerMac::SetSurfaceWasPaintedTo( } void AcceleratedSurfaceContainerManagerMac::SetRootSurfaceInvalid() { - AutoLock lock(lock_); + base::AutoLock lock(lock_); if (root_container_) root_container_->set_surface_invalid(); } bool AcceleratedSurfaceContainerManagerMac::SurfaceShouldBeVisible( gfx::PluginWindowHandle id) const { - AutoLock lock(lock_); + base::AutoLock lock(lock_); if (IsRootContainer(id) && !gpu_rendering_active_) return false; diff --git a/chrome/browser/renderer_host/accelerated_surface_container_manager_mac.h b/chrome/browser/renderer_host/accelerated_surface_container_manager_mac.h index a2855a4..be2806a 100644 --- a/chrome/browser/renderer_host/accelerated_surface_container_manager_mac.h +++ b/chrome/browser/renderer_host/accelerated_surface_container_manager_mac.h @@ -11,7 +11,7 @@ #include "app/surface/transport_dib.h" #include "base/basictypes.h" -#include "base/lock.h" +#include "base/synchronization/lock.h" #include "gfx/native_widget_types.h" namespace webkit { @@ -116,7 +116,7 @@ class AcceleratedSurfaceContainerManagerMac { // Both |plugin_window_to_container_map_| and the // AcceleratedSurfaceContainerMac in it are not threadsafe, but accessed from // multiple threads. All these accesses are guarded by this lock. - mutable Lock lock_; + mutable base::Lock lock_; DISALLOW_COPY_AND_ASSIGN(AcceleratedSurfaceContainerManagerMac); }; diff --git a/chrome/browser/renderer_host/download_resource_handler.cc b/chrome/browser/renderer_host/download_resource_handler.cc index b186c01..a297244 100644 --- a/chrome/browser/renderer_host/download_resource_handler.cc +++ b/chrome/browser/renderer_host/download_resource_handler.cc @@ -186,7 +186,7 @@ bool DownloadResourceHandler::OnReadCompleted(int request_id, int* bytes_read) { if (!*bytes_read) return true; DCHECK(read_buffer_); - AutoLock auto_lock(buffer_->lock); + base::AutoLock auto_lock(buffer_->lock); bool need_update = buffer_->contents.empty(); // We are passing ownership of this buffer to the download file manager. @@ -265,7 +265,7 @@ void DownloadResourceHandler::CheckWriteProgress() { size_t contents_size; { - AutoLock lock(buffer_->lock); + base::AutoLock lock(buffer_->lock); contents_size = buffer_->contents.size(); } diff --git a/chrome/browser/renderer_host/render_message_filter_gtk.cc b/chrome/browser/renderer_host/render_message_filter_gtk.cc index 63c400f..4c77831 100644 --- a/chrome/browser/renderer_host/render_message_filter_gtk.cc +++ b/chrome/browser/renderer_host/render_message_filter_gtk.cc @@ -64,7 +64,7 @@ void RenderMessageFilter::DoOnGetWindowRect(gfx::NativeViewId view, gfx::Rect rect; XID window; - AutoLock lock(GtkNativeViewManager::GetInstance()->unrealize_lock()); + base::AutoLock lock(GtkNativeViewManager::GetInstance()->unrealize_lock()); if (GtkNativeViewManager::GetInstance()->GetXIDForId(&window, view)) { if (window) { int x, y; @@ -100,7 +100,7 @@ void RenderMessageFilter::DoOnGetRootWindowRect(gfx::NativeViewId view, gfx::Rect rect; XID window; - AutoLock lock(GtkNativeViewManager::GetInstance()->unrealize_lock()); + base::AutoLock lock(GtkNativeViewManager::GetInstance()->unrealize_lock()); if (GtkNativeViewManager::GetInstance()->GetXIDForId(&window, view)) { if (window) { const XID toplevel = GetTopLevelWindow(window); diff --git a/chrome/browser/renderer_host/render_widget_helper.cc b/chrome/browser/renderer_host/render_widget_helper.cc index 0ea4f8c..6d13366 100644 --- a/chrome/browser/renderer_host/render_widget_helper.cc +++ b/chrome/browser/renderer_host/render_widget_helper.cc @@ -102,7 +102,7 @@ bool RenderWidgetHelper::WaitForUpdateMsg(int render_widget_id, for (;;) { UpdateMsgProxy* proxy = NULL; { - AutoLock lock(pending_paints_lock_); + base::AutoLock lock(pending_paints_lock_); UpdateMsgProxyMap::iterator it = pending_paints_.find(render_widget_id); if (it != pending_paints_.end()) { @@ -139,7 +139,7 @@ void RenderWidgetHelper::DidReceiveUpdateMsg(const IPC::Message& msg) { UpdateMsgProxy* proxy = NULL; { - AutoLock lock(pending_paints_lock_); + base::AutoLock lock(pending_paints_lock_); UpdateMsgProxyMap::value_type new_value(render_widget_id, NULL); @@ -169,7 +169,7 @@ void RenderWidgetHelper::OnDiscardUpdateMsg(UpdateMsgProxy* proxy) { // Remove the proxy from the map now that we are going to handle it normally. { - AutoLock lock(pending_paints_lock_); + base::AutoLock lock(pending_paints_lock_); UpdateMsgProxyMap::iterator it = pending_paints_.find(msg.routing_id()); DCHECK(it != pending_paints_.end()); @@ -276,7 +276,7 @@ void RenderWidgetHelper::OnCreateFullscreenWidgetOnUI( #if defined(OS_MACOSX) TransportDIB* RenderWidgetHelper::MapTransportDIB(TransportDIB::Id dib_id) { - AutoLock locked(allocated_dibs_lock_); + base::AutoLock locked(allocated_dibs_lock_); const std::map<TransportDIB::Id, int>::iterator i = allocated_dibs_.find(dib_id); @@ -300,13 +300,13 @@ void RenderWidgetHelper::AllocTransportDIB( if (cache_in_browser) { // Keep a copy of the file descriptor around - AutoLock locked(allocated_dibs_lock_); + base::AutoLock locked(allocated_dibs_lock_); allocated_dibs_[shared_memory->id()] = dup(result->fd); } } void RenderWidgetHelper::FreeTransportDIB(TransportDIB::Id dib_id) { - AutoLock locked(allocated_dibs_lock_); + base::AutoLock locked(allocated_dibs_lock_); const std::map<TransportDIB::Id, int>::iterator i = allocated_dibs_.find(dib_id); diff --git a/chrome/browser/renderer_host/render_widget_helper.h b/chrome/browser/renderer_host/render_widget_helper.h index 4eb32ea..982e56c 100644 --- a/chrome/browser/renderer_host/render_widget_helper.h +++ b/chrome/browser/renderer_host/render_widget_helper.h @@ -13,7 +13,7 @@ #include "base/hash_tables.h" #include "base/process.h" #include "base/ref_counted.h" -#include "base/lock.h" +#include "base/synchronization/lock.h" #include "base/synchronization/waitable_event.h" #include "chrome/common/window_container_type.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebPopupType.h" @@ -197,7 +197,7 @@ class RenderWidgetHelper // On OSX we keep file descriptors to all the allocated DIBs around until // the renderer frees them. - Lock allocated_dibs_lock_; + base::Lock allocated_dibs_lock_; std::map<TransportDIB::Id, int> allocated_dibs_; #endif @@ -205,7 +205,7 @@ class RenderWidgetHelper // The UpdateMsgProxy objects are not owned by this map. (See UpdateMsgProxy // for details about how the lifetime of instances are managed.) UpdateMsgProxyMap pending_paints_; - Lock pending_paints_lock_; + base::Lock pending_paints_lock_; int render_process_id_; |