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

Unified Diff: cc/CCPrioritizedTexture.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/CCOcclusionTracker.h ('k') | cc/CCPrioritizedTextureManager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/CCPrioritizedTexture.h
diff --git a/cc/CCPrioritizedTexture.h b/cc/CCPrioritizedTexture.h
index 9f416e77265e130f9fb1f30f0a88c6986e6d71de..519934f15c523e344186b815d351cbf0d62a6d90 100644
--- a/cc/CCPrioritizedTexture.h
+++ b/cc/CCPrioritizedTexture.h
@@ -5,6 +5,7 @@
#ifndef CCPrioritizedTexture_h
#define CCPrioritizedTexture_h
+#include "base/basictypes.h"
#include "CCPriorityCalculator.h"
#include "CCResourceProvider.h"
#include "CCTexture.h"
@@ -17,7 +18,6 @@ namespace cc {
class CCPrioritizedTextureManager;
class CCPrioritizedTexture {
- WTF_MAKE_NONCOPYABLE(CCPrioritizedTexture);
public:
static PassOwnPtr<CCPrioritizedTexture> create(CCPrioritizedTextureManager* manager, IntSize size, GC3Denum format)
{
@@ -85,7 +85,6 @@ private:
friend class CCPrioritizedTextureTest;
class Backing : public CCTexture {
- WTF_MAKE_NONCOPYABLE(Backing);
public:
Backing(unsigned id, CCResourceProvider*, IntSize, GC3Denum format);
~Backing();
@@ -109,6 +108,8 @@ private:
#ifndef NDEBUG
CCResourceProvider* m_resourceProvider;
#endif
+
+ DISALLOW_COPY_AND_ASSIGN(Backing);
};
CCPrioritizedTexture(CCPrioritizedTextureManager*, IntSize, GC3Denum format);
@@ -131,8 +132,10 @@ private:
Backing* m_backing;
CCPrioritizedTextureManager* m_manager;
+
+ DISALLOW_COPY_AND_ASSIGN(CCPrioritizedTexture);
};
-} // namespace cc
+} // namespace cc
#endif
« no previous file with comments | « cc/CCOcclusionTracker.h ('k') | cc/CCPrioritizedTextureManager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698