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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: Source/core/css/CSSProperty.h

Issue 478523003: Fix unprefixed transitions when experimental features flag is off (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 4 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 unified diff | Download patch
« no previous file with comments | « LayoutTests/virtual/stable/animations-unprefixed/transitions-unprefixed.html ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * (C) 1999-2003 Lars Knoll (knoll@kde.org) 2 * (C) 1999-2003 Lars Knoll (knoll@kde.org)
3 * Copyright (C) 2004, 2005, 2006 Apple Computer, Inc. 3 * Copyright (C) 2004, 2005, 2006 Apple Computer, Inc.
4 * 4 *
5 * This library is free software; you can redistribute it and/or 5 * This library is free software; you can redistribute it and/or
6 * modify it under the terms of the GNU Library General Public 6 * modify it under the terms of the GNU Library General Public
7 * License as published by the Free Software Foundation; either 7 * License as published by the Free Software Foundation; either
8 * version 2 of the License, or (at your option) any later version. 8 * version 2 of the License, or (at your option) any later version.
9 * 9 *
10 * This library is distributed in the hope that it will be useful, 10 * This library is distributed in the hope that it will be useful,
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
85 85
86 void trace(Visitor* visitor) { visitor->trace(m_value); } 86 void trace(Visitor* visitor) { visitor->trace(m_value); }
87 87
88 private: 88 private:
89 StylePropertyMetadata m_metadata; 89 StylePropertyMetadata m_metadata;
90 RefPtrWillBeMember<CSSValue> m_value; 90 RefPtrWillBeMember<CSSValue> m_value;
91 }; 91 };
92 92
93 inline CSSPropertyID prefixingVariantForPropertyId(CSSPropertyID propId) 93 inline CSSPropertyID prefixingVariantForPropertyId(CSSPropertyID propId)
94 { 94 {
95 if (!RuntimeEnabledFeatures::cssAnimationUnprefixedEnabled()) 95 if (RuntimeEnabledFeatures::cssAnimationUnprefixedEnabled()) {
96 switch (propId) {
97 case CSSPropertyAnimation:
98 return CSSPropertyWebkitAnimation;
99 case CSSPropertyAnimationDelay:
100 return CSSPropertyWebkitAnimationDelay;
101 case CSSPropertyAnimationDirection:
102 return CSSPropertyWebkitAnimationDirection;
103 case CSSPropertyAnimationDuration:
104 return CSSPropertyWebkitAnimationDuration;
105 case CSSPropertyAnimationFillMode:
106 return CSSPropertyWebkitAnimationFillMode;
107 case CSSPropertyAnimationIterationCount:
108 return CSSPropertyWebkitAnimationIterationCount;
109 case CSSPropertyAnimationName:
110 return CSSPropertyWebkitAnimationName;
111 case CSSPropertyAnimationPlayState:
112 return CSSPropertyWebkitAnimationPlayState;
113 case CSSPropertyAnimationTimingFunction:
114 return CSSPropertyWebkitAnimationTimingFunction;
115 case CSSPropertyWebkitAnimation:
116 return CSSPropertyAnimation;
117 case CSSPropertyWebkitAnimationDelay:
118 return CSSPropertyAnimationDelay;
119 case CSSPropertyWebkitAnimationDirection:
120 return CSSPropertyAnimationDirection;
121 case CSSPropertyWebkitAnimationDuration:
122 return CSSPropertyAnimationDuration;
123 case CSSPropertyWebkitAnimationFillMode:
124 return CSSPropertyAnimationFillMode;
125 case CSSPropertyWebkitAnimationIterationCount:
126 return CSSPropertyAnimationIterationCount;
127 case CSSPropertyWebkitAnimationName:
128 return CSSPropertyAnimationName;
129 case CSSPropertyWebkitAnimationPlayState:
130 return CSSPropertyAnimationPlayState;
131 case CSSPropertyWebkitAnimationTimingFunction:
132 return CSSPropertyAnimationTimingFunction;
133 default:
134 break;
135 }
136 }
137
138 switch (propId) {
139 case CSSPropertyTransitionDelay:
140 return CSSPropertyWebkitTransitionDelay;
141 case CSSPropertyTransitionDuration:
142 return CSSPropertyWebkitTransitionDuration;
143 case CSSPropertyTransitionProperty:
144 return CSSPropertyWebkitTransitionProperty;
145 case CSSPropertyTransitionTimingFunction:
146 return CSSPropertyWebkitTransitionTimingFunction;
147 case CSSPropertyTransition:
148 return CSSPropertyWebkitTransition;
149 case CSSPropertyWebkitTransitionDelay:
150 return CSSPropertyTransitionDelay;
151 case CSSPropertyWebkitTransitionDuration:
152 return CSSPropertyTransitionDuration;
153 case CSSPropertyWebkitTransitionProperty:
154 return CSSPropertyTransitionProperty;
155 case CSSPropertyWebkitTransitionTimingFunction:
156 return CSSPropertyTransitionTimingFunction;
157 case CSSPropertyWebkitTransition:
158 return CSSPropertyTransition;
159 default:
96 return propId; 160 return propId;
97
98 CSSPropertyID propertyId = CSSPropertyInvalid;
99 switch (propId) {
100 case CSSPropertyAnimation:
101 propertyId = CSSPropertyWebkitAnimation;
102 break;
103 case CSSPropertyAnimationDelay:
104 propertyId = CSSPropertyWebkitAnimationDelay;
105 break;
106 case CSSPropertyAnimationDirection:
107 propertyId = CSSPropertyWebkitAnimationDirection;
108 break;
109 case CSSPropertyAnimationDuration:
110 propertyId = CSSPropertyWebkitAnimationDuration;
111 break;
112 case CSSPropertyAnimationFillMode:
113 propertyId = CSSPropertyWebkitAnimationFillMode;
114 break;
115 case CSSPropertyAnimationIterationCount:
116 propertyId = CSSPropertyWebkitAnimationIterationCount;
117 break;
118 case CSSPropertyAnimationName:
119 propertyId = CSSPropertyWebkitAnimationName;
120 break;
121 case CSSPropertyAnimationPlayState:
122 propertyId = CSSPropertyWebkitAnimationPlayState;
123 break;
124 case CSSPropertyAnimationTimingFunction:
125 propertyId = CSSPropertyWebkitAnimationTimingFunction;
126 break;
127 case CSSPropertyTransitionDelay:
128 propertyId = CSSPropertyWebkitTransitionDelay;
129 break;
130 case CSSPropertyTransitionDuration:
131 propertyId = CSSPropertyWebkitTransitionDuration;
132 break;
133 case CSSPropertyTransitionProperty:
134 propertyId = CSSPropertyWebkitTransitionProperty;
135 break;
136 case CSSPropertyTransitionTimingFunction:
137 propertyId = CSSPropertyWebkitTransitionTimingFunction;
138 break;
139 case CSSPropertyTransition:
140 propertyId = CSSPropertyWebkitTransition;
141 break;
142 case CSSPropertyWebkitAnimation:
143 propertyId = CSSPropertyAnimation;
144 break;
145 case CSSPropertyWebkitAnimationDelay:
146 propertyId = CSSPropertyAnimationDelay;
147 break;
148 case CSSPropertyWebkitAnimationDirection:
149 propertyId = CSSPropertyAnimationDirection;
150 break;
151 case CSSPropertyWebkitAnimationDuration:
152 propertyId = CSSPropertyAnimationDuration;
153 break;
154 case CSSPropertyWebkitAnimationFillMode:
155 propertyId = CSSPropertyAnimationFillMode;
156 break;
157 case CSSPropertyWebkitAnimationIterationCount:
158 propertyId = CSSPropertyAnimationIterationCount;
159 break;
160 case CSSPropertyWebkitAnimationName:
161 propertyId = CSSPropertyAnimationName;
162 break;
163 case CSSPropertyWebkitAnimationPlayState:
164 propertyId = CSSPropertyAnimationPlayState;
165 break;
166 case CSSPropertyWebkitAnimationTimingFunction:
167 propertyId = CSSPropertyAnimationTimingFunction;
168 break;
169 case CSSPropertyWebkitTransitionDelay:
170 propertyId = CSSPropertyTransitionDelay;
171 break;
172 case CSSPropertyWebkitTransitionDuration:
173 propertyId = CSSPropertyTransitionDuration;
174 break;
175 case CSSPropertyWebkitTransitionProperty:
176 propertyId = CSSPropertyTransitionProperty;
177 break;
178 case CSSPropertyWebkitTransitionTimingFunction:
179 propertyId = CSSPropertyTransitionTimingFunction;
180 break;
181 case CSSPropertyWebkitTransition:
182 propertyId = CSSPropertyTransition;
183 break;
184 default:
185 propertyId = propId;
186 break;
187 } 161 }
188 ASSERT(propertyId != CSSPropertyInvalid);
189 return propertyId;
190 } 162 }
191 163
192 } // namespace blink 164 } // namespace blink
193 165
194 WTF_ALLOW_MOVE_AND_INIT_WITH_MEM_FUNCTIONS(blink::CSSProperty); 166 WTF_ALLOW_MOVE_AND_INIT_WITH_MEM_FUNCTIONS(blink::CSSProperty);
195 167
196 #endif // CSSProperty_h 168 #endif // CSSProperty_h
OLDNEW
« no previous file with comments | « LayoutTests/virtual/stable/animations-unprefixed/transitions-unprefixed.html ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698