diff options
| -rw-r--r-- | base/mime_util_xdg.cc | 5 | ||||
| -rw-r--r-- | chrome/browser/internal_auth.cc | 6 | ||||
| -rw-r--r-- | content/renderer/gpu/webgraphicscontext3d_command_buffer_impl.cc | 6 | ||||
| -rw-r--r-- | remoting/host/local_input_monitor_mac.mm | 4 | ||||
| -rw-r--r-- | remoting/host/local_input_monitor_thread_win.cc | 4 | ||||
| -rw-r--r-- | ui/gfx/gl/gl_implementation_linux.cc | 4 | ||||
| -rw-r--r-- | webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc | 11 | ||||
| -rw-r--r-- | webkit/plugins/npapi/webplugin_ime_win.cc | 4 |
8 files changed, 26 insertions, 18 deletions
diff --git a/base/mime_util_xdg.cc b/base/mime_util_xdg.cc index 2de5028..4e9e61a 100644 --- a/base/mime_util_xdg.cc +++ b/base/mime_util_xdg.cc @@ -29,8 +29,9 @@ namespace { // None of the XDG stuff is thread-safe, so serialize all access under // this lock. -static base::LazyInstance<base::Lock> - g_mime_util_xdg_lock(base::LINKER_INITIALIZED); +static base::LazyInstance<base::Lock, + base::LeakyLazyInstanceTraits<base::Lock> > + g_mime_util_xdg_lock(base::LINKER_INITIALIZED); class IconTheme; diff --git a/chrome/browser/internal_auth.cc b/chrome/browser/internal_auth.cc index 16448df..0730661 100644 --- a/chrome/browser/internal_auth.cc +++ b/chrome/browser/internal_auth.cc @@ -326,8 +326,9 @@ namespace { static base::LazyInstance<browser::InternalAuthVerificationService> g_verification_service(base::LINKER_INITIALIZED); -static base::LazyInstance<base::Lock> g_verification_service_lock( - base::LINKER_INITIALIZED); +static base::LazyInstance<base::Lock, + base::LeakyLazyInstanceTraits<base::Lock> > + g_verification_service_lock(base::LINKER_INITIALIZED); } // namespace @@ -477,4 +478,3 @@ void InternalAuthGeneration::GenerateNewKey() { } } // namespace browser - diff --git a/content/renderer/gpu/webgraphicscontext3d_command_buffer_impl.cc b/content/renderer/gpu/webgraphicscontext3d_command_buffer_impl.cc index 4f1833b..1217392 100644 --- a/content/renderer/gpu/webgraphicscontext3d_command_buffer_impl.cc +++ b/content/renderer/gpu/webgraphicscontext3d_command_buffer_impl.cc @@ -35,7 +35,8 @@ #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" #include "webkit/glue/gl_bindings_skia_cmd_buffer.h" -static base::LazyInstance<base::Lock> +static base::LazyInstance<base::Lock, + base::LeakyLazyInstanceTraits<base::Lock> > g_all_shared_contexts_lock(base::LINKER_INITIALIZED); static base::LazyInstance<std::set<WebGraphicsContext3DCommandBufferImpl*> > g_all_shared_contexts(base::LINKER_INITIALIZED); @@ -347,8 +348,7 @@ bool WebGraphicsContext3DCommandBufferImpl::readBackFramebuffer( if (mustRestoreFBO) { gl_->BindFramebuffer(GL_FRAMEBUFFER, buffer); } - gl_->ReadPixels(0, 0, width, height, - GL_RGBA, GL_UNSIGNED_BYTE, pixels); + gl_->ReadPixels(0, 0, width, height, GL_RGBA, GL_UNSIGNED_BYTE, pixels); // Swizzle red and blue channels // TODO(kbr): expose GL_BGRA as extension diff --git a/remoting/host/local_input_monitor_mac.mm b/remoting/host/local_input_monitor_mac.mm index c35a9b6..c6d9484 100644 --- a/remoting/host/local_input_monitor_mac.mm +++ b/remoting/host/local_input_monitor_mac.mm @@ -152,7 +152,9 @@ class LocalInputMonitorMac : public remoting::LocalInputMonitor { DISALLOW_COPY_AND_ASSIGN(LocalInputMonitorMac); }; -base::LazyInstance<base::Lock> monitor_lock(base::LINKER_INITIALIZED); +base::LazyInstance<base::Lock, + base::LeakyLazyInstanceTraits<base::Lock> > + monitor_lock(base::LINKER_INITIALIZED); LocalInputMonitorImpl* local_input_monitor = NULL; } // namespace diff --git a/remoting/host/local_input_monitor_thread_win.cc b/remoting/host/local_input_monitor_thread_win.cc index abd0ae6..8f9164c 100644 --- a/remoting/host/local_input_monitor_thread_win.cc +++ b/remoting/host/local_input_monitor_thread_win.cc @@ -13,7 +13,9 @@ using namespace remoting; namespace { LocalInputMonitorThread* g_local_input_monitor_thread = NULL; -base::LazyInstance<base::Lock> g_thread_lock(base::LINKER_INITIALIZED); +base::LazyInstance<base::Lock, + base::LeakyLazyInstanceTraits<base::Lock> > + g_thread_lock(base::LINKER_INITIALIZED); } // namespace diff --git a/ui/gfx/gl/gl_implementation_linux.cc b/ui/gfx/gl/gl_implementation_linux.cc index 952e62e..1085fc4 100644 --- a/ui/gfx/gl/gl_implementation_linux.cc +++ b/ui/gfx/gl/gl_implementation_linux.cc @@ -49,7 +49,9 @@ base::NativeLibrary LoadLibrary(const char* filename) { // TODO(backer): Find a more principled (less heavy handed) way to prevent a // race in the bindings initialization. #if (defined(TOOLKIT_VIEWS) && !defined(OS_CHROMEOS)) || defined(TOUCH_UI) -base::LazyInstance<base::Lock> g_lock(base::LINKER_INITIALIZED); +base::LazyInstance<base::Lock, + base::LeakyLazyInstanceTraits<base::Lock> > + g_lock(base::LINKER_INITIALIZED); #endif } // namespace anonymous diff --git a/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc b/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc index d59e7ee..b9a5b00 100644 --- a/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc +++ b/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc @@ -167,7 +167,7 @@ class GLInProcessContext : public base::SupportsWeakPtr<GLInProcessContext> { CommandBufferService* GetCommandBufferService(); private: - GLInProcessContext(GLInProcessContext* parent); + explicit GLInProcessContext(GLInProcessContext* parent); bool Initialize(bool onscreen, gfx::PluginWindowHandle render_surface, @@ -209,7 +209,8 @@ const int32 kTransferBufferSize = 1024 * 1024; static base::LazyInstance< std::set<WebGraphicsContext3DInProcessCommandBufferImpl*> > g_all_shared_contexts(base::LINKER_INITIALIZED); -static base::LazyInstance<base::Lock> +static base::LazyInstance<base::Lock, + base::LeakyLazyInstanceTraits<base::Lock> > g_all_shared_contexts_lock(base::LINKER_INITIALIZED); // Singleton used to initialize and terminate the gles2 library. @@ -837,8 +838,7 @@ bool WebGraphicsContext3DInProcessCommandBufferImpl::readBackFramebuffer( if (mustRestoreFBO) { gl_->BindFramebuffer(GL_FRAMEBUFFER, framebuffer); } - gl_->ReadPixels(0, 0, width, height, - GL_RGBA, GL_UNSIGNED_BYTE, pixels); + gl_->ReadPixels(0, 0, width, height, GL_RGBA, GL_UNSIGNED_BYTE, pixels); // Swizzle red and blue channels // TODO(kbr): expose GL_BGRA as extension @@ -1637,8 +1637,7 @@ void WebGraphicsContext3DInProcessCommandBufferImpl::OnSwapBuffersComplete() { } void WebGraphicsContext3DInProcessCommandBufferImpl::setContextLostCallback( - WebGraphicsContext3D::WebGraphicsContextLostCallback* cb) -{ + WebGraphicsContext3D::WebGraphicsContextLostCallback* cb) { context_lost_callback_ = cb; } diff --git a/webkit/plugins/npapi/webplugin_ime_win.cc b/webkit/plugins/npapi/webplugin_ime_win.cc index 3c9f7a8..e06a57f 100644 --- a/webkit/plugins/npapi/webplugin_ime_win.cc +++ b/webkit/plugins/npapi/webplugin_ime_win.cc @@ -25,7 +25,9 @@ namespace npapi { // A critical section that prevents two or more plug-ins from accessing a // WebPluginIMEWin instance through our patch function. -base::LazyInstance<base::Lock> g_webplugin_ime_lock(base::LINKER_INITIALIZED); +base::LazyInstance<base::Lock, + base::LeakyLazyInstanceTraits<base::Lock> > + g_webplugin_ime_lock(base::LINKER_INITIALIZED); WebPluginIMEWin* WebPluginIMEWin::instance_ = NULL; |