commit 1d57ad40439cd30e43a4b245caaed7f191137b46
author Jamie Madill <jmadill@chromium.org> Mon Feb 02 16:57:06 2015 -0500
committer Jamie Madill <jmadill@chromium.org> Mon Feb 02 22:16:21 2015 +0000
tree 2a3a2b3eb5b867ce7e062552200391047df65353
parent 9236b4185de6d22f9ef51b9a77b55997b6bfb86e

Add some missing disallow macros.

DISALLOW_COPY_AND_ASSIGN was missing from CompilerImpl,
FramebufferImpl and DefaultAttachmentImpl.

BUG=angle:904

Change-Id: I2e57078cd5b40baf6962f19869c2f3b67ad6dc6e
Reviewed-on: https://chromium-review.googlesource.com/245514
Reviewed-by: Geoff Lang <geofflang@chromium.org>
Tested-by: Jamie Madill <jmadill@chromium.org>

src/libANGLE/renderer/CompilerImpl.h

diff --git a/src/libANGLE/renderer/CompilerImpl.h b/src/libANGLE/renderer/CompilerImpl.h
index 50be0e4..8be49c2 100644
--- a/src/libANGLE/renderer/CompilerImpl.h
+++ b/src/libANGLE/renderer/CompilerImpl.h
@@ -7,6 +7,7 @@
 // CompilerImpl.h: Defines the rx::CompilerImpl class, an implementation interface
 //                 for the gl::Compiler object.
 
+#include "common/angleutils.h"
 #include "libANGLE/Error.h"
 
 #ifndef LIBANGLE_RENDERER_COMPILERIMPL_H_
@@ -22,6 +23,9 @@
     virtual ~CompilerImpl() {}
 
     virtual gl::Error release() = 0;
+
+  private:
+    DISALLOW_COPY_AND_ASSIGN(CompilerImpl);
 };
 
 }

src/libANGLE/renderer/FramebufferImpl.h

diff --git a/src/libANGLE/renderer/FramebufferImpl.h b/src/libANGLE/renderer/FramebufferImpl.h
index 8f21323..67682ed 100644
--- a/src/libANGLE/renderer/FramebufferImpl.h
+++ b/src/libANGLE/renderer/FramebufferImpl.h
@@ -9,9 +9,9 @@
 #ifndef LIBANGLE_RENDERER_FRAMBUFFERIMPL_H_
 #define LIBANGLE_RENDERER_FRAMBUFFERIMPL_H_
 
-#include "libANGLE/Error.h"
-
 #include "angle_gl.h"
+#include "common/angleutils.h"
+#include "libANGLE/Error.h"
 
 namespace gl
 {
@@ -27,17 +27,22 @@
 class DefaultAttachmentImpl
 {
   public:
+    DefaultAttachmentImpl() {}
     virtual ~DefaultAttachmentImpl() {};
 
     virtual GLsizei getWidth() const = 0;
     virtual GLsizei getHeight() const = 0;
     virtual GLenum getInternalFormat() const = 0;
     virtual GLsizei getSamples() const = 0;
+
+  private:
+    DISALLOW_COPY_AND_ASSIGN(DefaultAttachmentImpl);
 };
 
 class FramebufferImpl
 {
   public:
+    FramebufferImpl() {}
     virtual ~FramebufferImpl() {};
 
     virtual void setColorAttachment(size_t index, const gl::FramebufferAttachment *attachment) = 0;
@@ -65,6 +70,9 @@
                            GLbitfield mask, GLenum filter, const gl::Framebuffer *sourceFramebuffer) = 0;
 
     virtual GLenum checkStatus() const = 0;
+
+  private:
+    DISALLOW_COPY_AND_ASSIGN(FramebufferImpl);
 };
 
 }

src/libANGLE/renderer/d3d/CompilerD3D.h

diff --git a/src/libANGLE/renderer/d3d/CompilerD3D.h b/src/libANGLE/renderer/d3d/CompilerD3D.h
index 0f83e4f..6d85cd7 100644
--- a/src/libANGLE/renderer/d3d/CompilerD3D.h
+++ b/src/libANGLE/renderer/d3d/CompilerD3D.h
@@ -35,6 +35,8 @@
     ShHandle getCompilerHandle(GLenum type);
 
   private:
+    DISALLOW_COPY_AND_ASSIGN(CompilerD3D);
+
     ShShaderSpec mSpec;
     ShShaderOutput mOutputType;
     ShBuiltInResources mResources;

src/libANGLE/renderer/d3d/FramebufferD3D.h

diff --git a/src/libANGLE/renderer/d3d/FramebufferD3D.h b/src/libANGLE/renderer/d3d/FramebufferD3D.h
index f4dd4d6..1113a77 100644
--- a/src/libANGLE/renderer/d3d/FramebufferD3D.h
+++ b/src/libANGLE/renderer/d3d/FramebufferD3D.h
@@ -42,6 +42,8 @@
     RenderTargetD3D *getRenderTarget() const;
 
   private:
+    DISALLOW_COPY_AND_ASSIGN(DefaultAttachmentD3D);
+
     RenderTargetD3D *mRenderTarget;
 };
 
@@ -86,6 +88,8 @@
     GLenum mReadBuffer;
 
   private:
+    DISALLOW_COPY_AND_ASSIGN(FramebufferD3D);
+
     RendererD3D *const mRenderer;
 
     virtual gl::Error clear(const gl::State &state, const gl::ClearParameters &clearParams) = 0;