Share shaders between browser compositors.

ui/gfx/compositor/compositor_gl.h

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef UI_GFX_COMPOSITOR_COMPOSITOR_GL_H_
 #define UI_GFX_COMPOSITOR_COMPOSITOR_GL_H_
 #pragma once
 
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 57 matching lines @@
   virtual void SchedulePaint() OVERRIDE;
   virtual void OnWidgetSizeChanged(const gfx::Size& size) OVERRIDE;
 
   // Specific to CompositorGL.
   bool InitShaders();
 
   // The GL context used for compositing.
   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_;
 
   // Keep track of whether compositing has started or not.
   bool started_;
 
   DISALLOW_COPY_AND_ASSIGN(CompositorGL);
 };
 
 }  // namespace ui
 
 #endif  // UI_GFX_COMPOSITOR_COMPOSITOR_GL_H_