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

Unified Diff: cc/CCDirectRenderer.h

Issue 10985088: cc: Switch it to use DISALLOW_COPY_AND_ASSIGN macro from base/ library. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: review Created 8 years, 3 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 | « cc/CCDebugRectHistory.h ('k') | cc/CCFontAtlas.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/CCDirectRenderer.h
diff --git a/cc/CCDirectRenderer.h b/cc/CCDirectRenderer.h
index b9db57e749db63c291f79a8758ea0364d95e08ae..dfa34ef05f70366c0d23b22b8887e8b1c0b99054 100644
--- a/cc/CCDirectRenderer.h
+++ b/cc/CCDirectRenderer.h
@@ -5,6 +5,7 @@
#ifndef CCDirectRenderer_h
#define CCDirectRenderer_h
+#include "base/basictypes.h"
#include "CCRenderer.h"
#include "CCResourceProvider.h"
#include "CCScopedTexture.h"
@@ -17,7 +18,6 @@ class CCResourceProvider;
// renderer implementations. "Direct" refers to the fact that it does not
// delegate rendering to another compositor.
class CCDirectRenderer : public CCRenderer {
- WTF_MAKE_NONCOPYABLE(CCDirectRenderer);
public:
virtual ~CCDirectRenderer();
@@ -48,7 +48,6 @@ protected:
};
class CachedTexture : public CCScopedTexture {
- WTF_MAKE_NONCOPYABLE(CachedTexture);
public:
static scoped_ptr<CachedTexture> create(CCResourceProvider* resourceProvider) { return scoped_ptr<CachedTexture>(new CachedTexture(resourceProvider)); }
virtual ~CachedTexture() { }
@@ -65,6 +64,8 @@ protected:
private:
bool m_isComplete;
+
+ DISALLOW_COPY_AND_ASSIGN(CachedTexture);
};
static FloatRect quadVertexRect();
@@ -92,6 +93,9 @@ protected:
ScopedPtrHashMap<CCRenderPass::Id, CachedTexture> m_renderPassTextures;
CCResourceProvider* m_resourceProvider;
+
+private:
+ DISALLOW_COPY_AND_ASSIGN(CCDirectRenderer);
};
}
« no previous file with comments | « cc/CCDebugRectHistory.h ('k') | cc/CCFontAtlas.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698