| 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_;
|
|
|
|
|