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

Side by Side Diff: third_party/WebKit/Source/core/animation/css/CSSTransitionData.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 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CSSTransitionData_h 5 #ifndef CSSTransitionData_h
6 #define CSSTransitionData_h 6 #define CSSTransitionData_h
7 7
8 #include "core/CSSPropertyNames.h" 8 #include "core/CSSPropertyNames.h"
9 #include "core/animation/css/CSSTimingData.h" 9 #include "core/animation/css/CSSTimingData.h"
10 #include "wtf/Vector.h" 10 #include "wtf/Vector.h"
11 11
12 namespace blink { 12 namespace blink {
13 13
14 class CSSTransitionData final : public CSSTimingData { 14 class CSSTransitionData final : public CSSTimingData {
15 public: 15 public:
16 enum TransitionPropertyType { 16 enum TransitionPropertyType {
17 TransitionNone, 17 TransitionNone,
18 TransitionKnownProperty, 18 TransitionKnownProperty,
19 TransitionUnknownProperty, 19 TransitionUnknownProperty,
20 }; 20 };
21 21
22 // FIXME: We shouldn't allow 'none' to be used alongside other properties. 22 // FIXME: We shouldn't allow 'none' to be used alongside other properties.
23 struct TransitionProperty { 23 struct TransitionProperty {
24 ALLOW_ONLY_INLINE_ALLOCATION(); 24 DISALLOW_NEW_EXCEPT_PLACEMENT_NEW();
25 TransitionProperty(CSSPropertyID id) 25 TransitionProperty(CSSPropertyID id)
26 : propertyType(TransitionKnownProperty) 26 : propertyType(TransitionKnownProperty)
27 , unresolvedProperty(id) 27 , unresolvedProperty(id)
28 { 28 {
29 ASSERT(id != CSSPropertyInvalid); 29 ASSERT(id != CSSPropertyInvalid);
30 } 30 }
31 31
32 TransitionProperty(const String& string) 32 TransitionProperty(const String& string)
33 : propertyType(TransitionUnknownProperty) 33 : propertyType(TransitionUnknownProperty)
34 , unresolvedProperty(CSSPropertyInvalid) 34 , unresolvedProperty(CSSPropertyInvalid)
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
72 private: 72 private:
73 CSSTransitionData(); 73 CSSTransitionData();
74 explicit CSSTransitionData(const CSSTransitionData&); 74 explicit CSSTransitionData(const CSSTransitionData&);
75 75
76 Vector<TransitionProperty> m_propertyList; 76 Vector<TransitionProperty> m_propertyList;
77 }; 77 };
78 78
79 } // namespace blink 79 } // namespace blink
80 80
81 #endif // CSSTransitionData_h 81 #endif // CSSTransitionData_h
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/animation/css/CSSAnimations.h ('k') | third_party/WebKit/Source/core/css/CSSCrossfadeValue.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698