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

Side by Side Diff: third_party/WebKit/Source/core/animation/css/CSSAnimations.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, 1 month 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2013 Google Inc. All rights reserved. 2 * Copyright (C) 2013 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 45
46 namespace blink { 46 namespace blink {
47 47
48 class CSSTransitionData; 48 class CSSTransitionData;
49 class Element; 49 class Element;
50 class StylePropertyShorthand; 50 class StylePropertyShorthand;
51 class StyleResolver; 51 class StyleResolver;
52 52
53 class CSSAnimations final { 53 class CSSAnimations final {
54 WTF_MAKE_NONCOPYABLE(CSSAnimations); 54 WTF_MAKE_NONCOPYABLE(CSSAnimations);
55 DISALLOW_ALLOCATION(); 55 DISALLOW_NEW();
56 public: 56 public:
57 CSSAnimations(); 57 CSSAnimations();
58 58
59 bool isAnimationForInspector(const Animation&); 59 bool isAnimationForInspector(const Animation&);
60 bool isTransitionAnimationForInspector(const Animation&) const; 60 bool isTransitionAnimationForInspector(const Animation&) const;
61 61
62 static const StylePropertyShorthand& propertiesForTransitionAll(); 62 static const StylePropertyShorthand& propertiesForTransitionAll();
63 static bool isAnimatableProperty(CSSPropertyID); 63 static bool isAnimatableProperty(CSSPropertyID);
64 static void calculateUpdate(const Element* animatingElement, Element&, const ComputedStyle&, ComputedStyle* parentStyle, CSSAnimationUpdate&, StyleResolver* ); 64 static void calculateUpdate(const Element* animatingElement, Element&, const ComputedStyle&, ComputedStyle* parentStyle, CSSAnimationUpdate&, StyleResolver* );
65 65
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
107 107
108 Member<Animation> animation; 108 Member<Animation> animation;
109 AtomicString name; 109 AtomicString name;
110 size_t nameIndex; 110 size_t nameIndex;
111 Timing specifiedTiming; 111 Timing specifiedTiming;
112 RefPtrWillBeMember<StyleRuleKeyframes> styleRule; 112 RefPtrWillBeMember<StyleRuleKeyframes> styleRule;
113 unsigned styleRuleVersion; 113 unsigned styleRuleVersion;
114 }; 114 };
115 115
116 struct RunningTransition { 116 struct RunningTransition {
117 ALLOW_ONLY_INLINE_ALLOCATION(); 117 DISALLOW_NEW_EXCEPT_PLACEMENT_NEW();
118 public: 118 public:
119 DEFINE_INLINE_TRACE() 119 DEFINE_INLINE_TRACE()
120 { 120 {
121 visitor->trace(animation); 121 visitor->trace(animation);
122 } 122 }
123 123
124 Member<Animation> animation; 124 Member<Animation> animation;
125 const AnimatableValue* from; 125 const AnimatableValue* from;
126 const AnimatableValue* to; 126 const AnimatableValue* to;
127 }; 127 };
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
188 188
189 RawPtrWillBeMember<Element> m_transitionTarget; 189 RawPtrWillBeMember<Element> m_transitionTarget;
190 const CSSPropertyID m_property; 190 const CSSPropertyID m_property;
191 AnimationEffect::Phase m_previousPhase; 191 AnimationEffect::Phase m_previousPhase;
192 }; 192 };
193 }; 193 };
194 194
195 } // namespace blink 195 } // namespace blink
196 196
197 #endif 197 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698