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

Unified Diff: cc/CCRenderPass.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/CCProxy.h ('k') | cc/CCRenderPassDrawQuad.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/CCRenderPass.h
diff --git a/cc/CCRenderPass.h b/cc/CCRenderPass.h
index eb509c8be5c1d8a9112fd94a2db8ddab0bb0d052..1a9ff59e0564c11516b70a46aeb98a41ffd463b3 100644
--- a/cc/CCRenderPass.h
+++ b/cc/CCRenderPass.h
@@ -5,14 +5,15 @@
#ifndef CCRenderPass_h
#define CCRenderPass_h
+#include "base/basictypes.h"
+#include "cc/hash_pair.h"
+#include "cc/scoped_ptr_hash_map.h"
+#include "cc/scoped_ptr_vector.h"
#include "CCDrawQuad.h"
#include "CCOcclusionTracker.h"
#include "CCSharedQuadState.h"
#include "FloatRect.h"
#include "SkColor.h"
-#include "cc/hash_pair.h"
-#include "cc/scoped_ptr_hash_map.h"
-#include "cc/scoped_ptr_vector.h"
#include <public/WebFilterOperations.h>
#include <public/WebTransformationMatrix.h>
#include <vector>
@@ -39,7 +40,6 @@ public:
typedef ScopedPtrVector<CCSharedQuadState> CCSharedQuadStateList;
class CCRenderPass {
- WTF_MAKE_NONCOPYABLE(CCRenderPass);
public:
~CCRenderPass();
@@ -105,6 +105,8 @@ protected:
bool m_hasOcclusionFromOutsideTargetSurface;
WebKit::WebFilterOperations m_filters;
WebKit::WebFilterOperations m_backgroundFilters;
+
+ DISALLOW_COPY_AND_ASSIGN(CCRenderPass);
};
} // namespace cc
« no previous file with comments | « cc/CCProxy.h ('k') | cc/CCRenderPassDrawQuad.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698