diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-28 22:57:20 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-28 22:57:20 +0000 |
| commit | fd2d4f29cfda088702a0c7cfb03e6ee9027a3509 (patch) | |
| tree | 16f27c1b7c29b2a9fd1ff69169da69eafd9b4761 /cc/CCRenderPass.h | |
| parent | 2e741f8af86de37b5b5c9fefe6a8ea4eb44665b7 (diff) | |
| download | chromium_src-fd2d4f29cfda088702a0c7cfb03e6ee9027a3509.zip chromium_src-fd2d4f29cfda088702a0c7cfb03e6ee9027a3509.tar.gz chromium_src-fd2d4f29cfda088702a0c7cfb03e6ee9027a3509.tar.bz2 | |
cc: Switch it to use DISALLOW_COPY_AND_ASSIGN macro from base/ library.
BUG=144577
R=jamesr@chromium.org
Review URL: https://codereview.chromium.org/10985088
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@159356 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/CCRenderPass.h')
| -rw-r--r-- | cc/CCRenderPass.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/cc/CCRenderPass.h b/cc/CCRenderPass.h index eb509c8..1a9ff59 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 |