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

Unified Diff: third_party/WebKit/Source/core/animation/css/CSSAnimationUpdate.h

Issue 1406923009: Rename DISALLOW_ALLOCATION and ALLOW_ONLY_INLINE_ALLOCATION (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 2 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
Index: third_party/WebKit/Source/core/animation/css/CSSAnimationUpdate.h
diff --git a/third_party/WebKit/Source/core/animation/css/CSSAnimationUpdate.h b/third_party/WebKit/Source/core/animation/css/CSSAnimationUpdate.h
index 5131ac4f74b01c7878261cc1b3b4f64de06b1765..00c2b9cc81da2f2654b9d1107d3c3cca19527d80 100644
--- a/third_party/WebKit/Source/core/animation/css/CSSAnimationUpdate.h
+++ b/third_party/WebKit/Source/core/animation/css/CSSAnimationUpdate.h
@@ -25,11 +25,11 @@ class Animation;
// This class stores the CSS Animations/Transitions information we use during a style recalc.
// This includes updates to animations/transitions as well as the Interpolations to be applied.
class CSSAnimationUpdate final {
- DISALLOW_ALLOCATION();
+ DISALLOW_NEW();
WTF_MAKE_NONCOPYABLE(CSSAnimationUpdate);
public:
class NewAnimation {
- ALLOW_ONLY_INLINE_ALLOCATION();
+ DISALLOW_NEW_EXCEPT_PLACEMENT_NEW();
public:
NewAnimation()
: styleRuleVersion(0)
@@ -61,7 +61,7 @@ public:
};
class UpdatedAnimation {
- ALLOW_ONLY_INLINE_ALLOCATION();
+ DISALLOW_NEW_EXCEPT_PLACEMENT_NEW();
public:
UpdatedAnimation()
: styleRuleVersion(0)
@@ -182,7 +182,7 @@ public:
const HeapVector<Member<Animation>>& updatedCompositorKeyframes() const { return m_updatedCompositorKeyframes; }
struct NewTransition {
- ALLOW_ONLY_INLINE_ALLOCATION();
+ DISALLOW_NEW_EXCEPT_PLACEMENT_NEW();
public:
DEFINE_INLINE_TRACE()
{

Powered by Google App Engine
This is Rietveld 408576698