cc: Add DISALLOW_COPY_AND_ASSIGN where appropriate.

Also DISALLOW_IMPLICIT_CONSTRUCTORS in a few places instead.

NOTRY=true
R=jamesr

Review URL: https://chromiumcodereview.appspot.com/13065006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@190989 0039d316-1c4b-4281-b951-d872f2087c98

8 files changed, 63 insertions, 1 deletions

diff --git a/cc/output/compositor_frame.h b/cc/output/compositor_frame.h
index bf3ae3e..e5c8a33 100644
--- a/cc/output/compositor_frame.h
+++ b/cc/output/compositor_frame.h
@@ -25,6 +25,9 @@ class CC_EXPORT CompositorFrame {
   scoped_ptr<SoftwareFrameData> software_frame_data;
 
   void AssignTo(CompositorFrame* target);
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(CompositorFrame);
 };
 
 }  // namespace cc
diff --git a/cc/output/compositor_frame_ack.h b/cc/output/compositor_frame_ack.h
index 73b7b1a..5a63e0d 100644
--- a/cc/output/compositor_frame_ack.h
+++ b/cc/output/compositor_frame_ack.h
@@ -21,6 +21,9 @@ class CC_EXPORT CompositorFrameAck {
   TransferableResourceArray resources;
   scoped_ptr<GLFrameData> gl_frame_data;
   TransportDIB::Handle last_content_dib;
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(CompositorFrameAck);
 };
 
 }  // namespace cc
diff --git a/cc/output/delegated_frame_data.h b/cc/output/delegated_frame_data.h
index 7402da1..f7b89bc 100644
--- a/cc/output/delegated_frame_data.h
+++ b/cc/output/delegated_frame_data.h
@@ -20,6 +20,9 @@ class CC_EXPORT DelegatedFrameData {
 
   TransferableResourceArray resource_list;
   ScopedPtrVector<RenderPass> render_pass_list;
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(DelegatedFrameData);
 };
 
 }  // namespace cc
diff --git a/cc/output/geometry_binding.h b/cc/output/geometry_binding.h
index 74321aa..2318b27 100644
--- a/cc/output/geometry_binding.h
+++ b/cc/output/geometry_binding.h
@@ -5,6 +5,8 @@
 #ifndef CC_OUTPUT_GEOMETRY_BINDING_H_
 #define CC_OUTPUT_GEOMETRY_BINDING_H_
 
+#include "base/basictypes.h"
+
 namespace gfx { class RectF; }
 
 namespace WebKit { class WebGraphicsContext3D; }
@@ -31,6 +33,8 @@ class GeometryBinding {
 
   unsigned quad_vertices_vbo_;
   unsigned quad_elements_vbo_;
+
+  DISALLOW_COPY_AND_ASSIGN(GeometryBinding);
 };
 
 }  // namespace cc
diff --git a/cc/output/program_binding.h b/cc/output/program_binding.h
index 213213e..0e5aa9e 100644
--- a/cc/output/program_binding.h
+++ b/cc/output/program_binding.h
@@ -41,6 +41,9 @@ class ProgramBindingBase {
   unsigned vertex_shader_id_;
   unsigned fragment_shader_id_;
   bool initialized_;
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(ProgramBindingBase);
 };
 
 template <class VertexShader, class FragmentShader>
@@ -83,6 +86,8 @@ class ProgramBinding : public ProgramBindingBase {
  private:
   VertexShader vertex_shader_;
   FragmentShader fragment_shader_;
+
+  DISALLOW_COPY_AND_ASSIGN(ProgramBinding);
 };
 
 }  // namespace cc
diff --git a/cc/output/render_surface_filters.h b/cc/output/render_surface_filters.h
index 62dde8e3..e13c11c 100644
--- a/cc/output/render_surface_filters.h
+++ b/cc/output/render_surface_filters.h
@@ -6,6 +6,7 @@
 #ifndef CC_OUTPUT_RENDER_SURFACE_FILTERS_H_
 #define CC_OUTPUT_RENDER_SURFACE_FILTERS_H_
 
+#include "base/basictypes.h"
 #include "cc/base/cc_export.h"
 
 class GrContext;
@@ -31,7 +32,7 @@ class CC_EXPORT RenderSurfaceFilters {
       const WebKit::WebFilterOperations& filters);
 
  private:
-  RenderSurfaceFilters();
+  DISALLOW_IMPLICIT_CONSTRUCTORS(RenderSurfaceFilters);
 };
 
 }
diff --git a/cc/output/shader.cc b/cc/output/shader.cc
index 428e125..d70352f 100644
--- a/cc/output/shader.cc
+++ b/cc/output/shader.cc
@@ -443,6 +443,9 @@ void FragmentTexOpaqueBinding::Init(WebGraphicsContext3D* context,
   DCHECK(sampler_location_ != -1);
 }
 
+FragmentShaderOESImageExternal::FragmentShaderOESImageExternal()
+    : sampler_location_(-1) {}
+
 bool FragmentShaderOESImageExternal::Init(WebGraphicsContext3D* context,
                                           unsigned program,
                                           bool using_bind_uniform,
diff --git a/cc/output/shader.h b/cc/output/shader.h
index fb8d658..3772a87 100644
--- a/cc/output/shader.h
+++ b/cc/output/shader.h
@@ -6,6 +6,8 @@
 #define CC_OUTPUT_SHADER_H_
 
 #include <string>
+
+#include "base/basictypes.h"
 #include "third_party/skia/include/core/SkColorPriv.h"
 
 namespace WebKit {
@@ -28,6 +30,8 @@ class VertexShaderPosTex {
 
  private:
   int matrix_location_;
+
+  DISALLOW_COPY_AND_ASSIGN(VertexShaderPosTex);
 };
 
 class VertexShaderPosTexYUVStretch {
@@ -46,6 +50,8 @@ class VertexShaderPosTexYUVStretch {
  private:
   int matrix_location_;
   int tex_scale_location_;
+
+  DISALLOW_COPY_AND_ASSIGN(VertexShaderPosTexYUVStretch);
 };
 
 class VertexShaderPos {
@@ -62,6 +68,8 @@ class VertexShaderPos {
 
  private:
   int matrix_location_;
+
+  DISALLOW_COPY_AND_ASSIGN(VertexShaderPos);
 };
 
 class VertexShaderPosTexIdentity {
@@ -91,6 +99,8 @@ class VertexShaderPosTexTransform {
   int matrix_location_;
   int tex_transform_location_;
   int vertex_opacity_location_;
+
+  DISALLOW_COPY_AND_ASSIGN(VertexShaderPosTexTransform);
 };
 
 class VertexShaderPosTexTransformFlip : public VertexShaderPosTexTransform {
@@ -116,6 +126,8 @@ class VertexShaderQuad {
   int matrix_location_;
   int point_location_;
   int tex_scale_location_;
+
+  DISALLOW_COPY_AND_ASSIGN(VertexShaderQuad);
 };
 
 class VertexShaderTile {
@@ -138,6 +150,8 @@ class VertexShaderTile {
   int matrix_location_;
   int point_location_;
   int vertex_tex_transform_location_;
+
+  DISALLOW_COPY_AND_ASSIGN(VertexShaderTile);
 };
 
 class VertexShaderVideoTransform {
@@ -156,6 +170,8 @@ class VertexShaderVideoTransform {
  private:
   int matrix_location_;
   int tex_matrix_location_;
+
+  DISALLOW_COPY_AND_ASSIGN(VertexShaderVideoTransform);
 };
 
 class FragmentTexAlphaBinding {
@@ -174,6 +190,8 @@ class FragmentTexAlphaBinding {
  private:
   int sampler_location_;
   int alpha_location_;
+
+  DISALLOW_COPY_AND_ASSIGN(FragmentTexAlphaBinding);
 };
 
 class FragmentTexOpaqueBinding {
@@ -191,6 +209,8 @@ class FragmentTexOpaqueBinding {
 
  private:
   int sampler_location_;
+
+  DISALLOW_COPY_AND_ASSIGN(FragmentTexOpaqueBinding);
 };
 
 class FragmentShaderRGBATexVaryingAlpha : public FragmentTexOpaqueBinding {
@@ -233,6 +253,8 @@ class FragmentShaderRGBATexSwizzleOpaque : public FragmentTexOpaqueBinding {
 // Fragment shader for external textures.
 class FragmentShaderOESImageExternal : public FragmentTexAlphaBinding {
  public:
+  FragmentShaderOESImageExternal();
+
   std::string GetShaderString() const;
   bool Init(WebKit::WebGraphicsContext3D*,
             unsigned program,
@@ -240,6 +262,8 @@ class FragmentShaderOESImageExternal : public FragmentTexAlphaBinding {
             int* base_uniform_index);
  private:
   int sampler_location_;
+
+  DISALLOW_COPY_AND_ASSIGN(FragmentShaderOESImageExternal);
 };
 
 class FragmentShaderRGBATexAlphaAA {
@@ -260,6 +284,8 @@ class FragmentShaderRGBATexAlphaAA {
   int sampler_location_;
   int alpha_location_;
   int edge_location_;
+
+  DISALLOW_COPY_AND_ASSIGN(FragmentShaderRGBATexAlphaAA);
 };
 
 class FragmentTexClampAlphaAABinding {
@@ -282,6 +308,8 @@ class FragmentTexClampAlphaAABinding {
   int alpha_location_;
   int fragment_tex_transform_location_;
   int edge_location_;
+
+  DISALLOW_COPY_AND_ASSIGN(FragmentTexClampAlphaAABinding);
 };
 
 class FragmentShaderRGBATexClampAlphaAA :
@@ -322,6 +350,8 @@ class FragmentShaderRGBATexAlphaMask {
   int alpha_location_;
   int mask_tex_coord_scale_location_;
   int mask_tex_coord_offset_location_;
+
+  DISALLOW_COPY_AND_ASSIGN(FragmentShaderRGBATexAlphaMask);
 };
 
 class FragmentShaderRGBATexAlphaMaskAA {
@@ -351,6 +381,8 @@ class FragmentShaderRGBATexAlphaMaskAA {
   int edge_location_;
   int mask_tex_coord_scale_location_;
   int mask_tex_coord_offset_location_;
+
+  DISALLOW_COPY_AND_ASSIGN(FragmentShaderRGBATexAlphaMaskAA);
 };
 
 class FragmentShaderYUVVideo {
@@ -376,6 +408,8 @@ class FragmentShaderYUVVideo {
   int alpha_location_;
   int yuv_matrix_location_;
   int yuv_adj_location_;
+
+  DISALLOW_COPY_AND_ASSIGN(FragmentShaderYUVVideo);
 };
 
 class FragmentShaderColor {
@@ -392,6 +426,8 @@ class FragmentShaderColor {
 
  private:
   int color_location_;
+
+  DISALLOW_COPY_AND_ASSIGN(FragmentShaderColor);
 };
 
 class FragmentShaderColorAA {
@@ -409,6 +445,8 @@ class FragmentShaderColorAA {
  private:
   int edge_location_;
   int color_location_;
+
+  DISALLOW_COPY_AND_ASSIGN(FragmentShaderColorAA);
 };
 
 class FragmentShaderCheckerboard {
@@ -430,6 +468,8 @@ class FragmentShaderCheckerboard {
   int tex_transform_location_;
   int frequency_location_;
   int color_location_;
+
+  DISALLOW_COPY_AND_ASSIGN(FragmentShaderCheckerboard);
 };
 
 } // namespace cc