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

Unified Diff: ui/gfx/compositor/compositor_gl.h

Issue 7327001: Share shaders between browser compositors. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Don't create an extra context. Created 9 years, 5 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 | « no previous file | ui/gfx/compositor/compositor_gl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gfx/compositor/compositor_gl.h
diff --git a/ui/gfx/compositor/compositor_gl.h b/ui/gfx/compositor/compositor_gl.h
index 7ea0b12f46a52c4bf4a654b8a9eef97d079dc6c0..697e8305a434868e8929201ac05b5c03dd809577 100644
--- a/ui/gfx/compositor/compositor_gl.h
+++ b/ui/gfx/compositor/compositor_gl.h
@@ -75,10 +75,8 @@ class CompositorGL : public Compositor {
scoped_refptr<gfx::GLSurface> gl_surface_;
scoped_refptr<gfx::GLContext> gl_context_;
- // TODO(wjmaclean): Make these static so they ca be shared in a single
- // context.
- scoped_ptr<TextureProgramGL> program_swizzle_;
- scoped_ptr<TextureProgramGL> program_no_swizzle_;
+ static TextureProgramGL* program_swizzle_;
+ static TextureProgramGL* program_no_swizzle_;
gfx::Size size_;
« no previous file with comments | « no previous file | ui/gfx/compositor/compositor_gl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698