Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(321)

Unified Diff: webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc

Issue 8430019: Make LazyInstance managed Locks leaky. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 9 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/gfx/gl/gl_implementation_linux.cc ('k') | webkit/plugins/npapi/webplugin_ime_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc
===================================================================
--- webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc (revision 107977)
+++ webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc (working copy)
@@ -167,7 +167,7 @@
CommandBufferService* GetCommandBufferService();
private:
- GLInProcessContext(GLInProcessContext* parent);
+ explicit GLInProcessContext(GLInProcessContext* parent);
bool Initialize(bool onscreen,
gfx::PluginWindowHandle render_surface,
@@ -209,7 +209,8 @@
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 @@
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::setContextLostCallback(
- WebGraphicsContext3D::WebGraphicsContextLostCallback* cb)
-{
+ WebGraphicsContext3D::WebGraphicsContextLostCallback* cb) {
context_lost_callback_ = cb;
}
« no previous file with comments | « ui/gfx/gl/gl_implementation_linux.cc ('k') | webkit/plugins/npapi/webplugin_ime_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698