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

Unified Diff: cc/CCActiveAnimation.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 | « no previous file | cc/CCDebugRectHistory.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/CCActiveAnimation.h
diff --git a/cc/CCActiveAnimation.h b/cc/CCActiveAnimation.h
index a7d4310535930468be5858fde73c837d2eeaaf13..213b510fceed685a5221bd225ea90bfa65cfc3e7 100644
--- a/cc/CCActiveAnimation.h
+++ b/cc/CCActiveAnimation.h
@@ -5,7 +5,7 @@
#ifndef CCActiveAnimation_h
#define CCActiveAnimation_h
-#include <wtf/Noncopyable.h>
+#include "base/basictypes.h"
#include <wtf/OwnPtr.h>
#include <wtf/PassOwnPtr.h>
@@ -17,7 +17,6 @@ class CCAnimationCurve;
// Specifically, the affected property, the run state (paused, finished, etc.),
// loop count, last pause time, and the total time spent paused.
class CCActiveAnimation {
- WTF_MAKE_NONCOPYABLE(CCActiveAnimation);
public:
// Animations begin in one of the 'waiting' states. Animations waiting for the next tick
// will start the next time the controller animates. Animations waiting for target
@@ -154,6 +153,8 @@ private:
// that ultimately controls the values of the animating layer and so we will refer
// to it as the 'controlling instance'.
bool m_isControllingInstance;
+
+ DISALLOW_COPY_AND_ASSIGN(CCActiveAnimation);
};
} // namespace cc
« no previous file with comments | « no previous file | cc/CCDebugRectHistory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698