Index: chrome/browser/renderer_host/accelerated_surface_container_manager_mac.cc |
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 a96782bb1b6b0207bc6dbaef1a7cf4c1657bdcad..ff1f0525f27677c80323936b9ee74249d5fd1878 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; |