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

Side by Side Diff: Source/core/animation/StringKeyframe.cpp

Issue 955863002: Support keywords in LengthStyleInterpolation (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: transitions test with interpolated perspective Created 5 years, 9 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
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 #include "config.h" 5 #include "config.h"
6 #include "core/animation/StringKeyframe.h" 6 #include "core/animation/StringKeyframe.h"
7 7
8 #include "core/animation/ColorStyleInterpolation.h" 8 #include "core/animation/ColorStyleInterpolation.h"
9 #include "core/animation/CompositorAnimations.h" 9 #include "core/animation/CompositorAnimations.h"
10 #include "core/animation/ConstantStyleInterpolation.h" 10 #include "core/animation/ConstantStyleInterpolation.h"
(...skipping 176 matching lines...) Expand 10 before | Expand all | Expand 10 after
187 case CSSPropertyMarginLeft: 187 case CSSPropertyMarginLeft:
188 case CSSPropertyMarginRight: 188 case CSSPropertyMarginRight:
189 case CSSPropertyMarginTop: 189 case CSSPropertyMarginTop:
190 case CSSPropertyOutlineOffset: 190 case CSSPropertyOutlineOffset:
191 case CSSPropertyRight: 191 case CSSPropertyRight:
192 case CSSPropertyStrokeDashoffset: 192 case CSSPropertyStrokeDashoffset:
193 case CSSPropertyTop: 193 case CSSPropertyTop:
194 case CSSPropertyVerticalAlign: 194 case CSSPropertyVerticalAlign:
195 case CSSPropertyWordSpacing: 195 case CSSPropertyWordSpacing:
196 case CSSPropertyWebkitColumnRuleWidth: 196 case CSSPropertyWebkitColumnRuleWidth:
197 if (LengthStyleInterpolation::canCreateFrom(*fromCSSValue) && LengthStyl eInterpolation::canCreateFrom(*toCSSValue)) 197 if (LengthStyleInterpolation::canCreateFrom(*fromCSSValue, property) && LengthStyleInterpolation::canCreateFrom(*toCSSValue, property))
198 return LengthStyleInterpolation::create(*fromCSSValue, *toCSSValue, property, range); 198 return LengthStyleInterpolation::create(*fromCSSValue, *toCSSValue, property, range);
199 199
200 // FIXME: Handle keywords e.g. 'none'.
201 if (property == CSSPropertyPerspective)
202 fallBackToLegacy = true;
203 // FIXME: Handle keywords e.g. 'smaller', 'larger'. 200 // FIXME: Handle keywords e.g. 'smaller', 'larger'.
204 if (property == CSSPropertyFontSize) 201 if (property == CSSPropertyFontSize)
205 fallBackToLegacy = true; 202 fallBackToLegacy = true;
206 203
207 // FIXME: Handle keywords e.g. 'baseline', 'sub'. 204 // FIXME: Handle keywords e.g. 'baseline', 'sub'.
208 if (property == CSSPropertyBaselineShift) 205 if (property == CSSPropertyBaselineShift)
209 fallBackToLegacy = true; 206 fallBackToLegacy = true;
210 207
211 // FIXME: Handle keywords e.g. 'normal'
212 if (property == CSSPropertyLetterSpacing)
213 fallBackToLegacy = true;
214
215 // FIXME: Handle keywords e.g. 'thick'
216 if (property == CSSPropertyOutlineWidth || property == CSSPropertyWebkit ColumnRuleWidth)
217 fallBackToLegacy = true;
218 break; 208 break;
219 case CSSPropertyOrphans: 209 case CSSPropertyOrphans:
220 case CSSPropertyWidows: 210 case CSSPropertyWidows:
221 case CSSPropertyZIndex: 211 case CSSPropertyZIndex:
222 case CSSPropertyWebkitColumnCount: 212 case CSSPropertyWebkitColumnCount:
223 case CSSPropertyShapeImageThreshold: 213 case CSSPropertyShapeImageThreshold:
224 case CSSPropertyFillOpacity: 214 case CSSPropertyFillOpacity:
225 case CSSPropertyFloodOpacity: 215 case CSSPropertyFloodOpacity:
226 case CSSPropertyOpacity: 216 case CSSPropertyOpacity:
227 case CSSPropertyStopOpacity: 217 case CSSPropertyStopOpacity:
(...skipping 167 matching lines...) Expand 10 before | Expand all | Expand 10 after
395 } 385 }
396 386
397 DEFINE_TRACE(StringKeyframe::PropertySpecificKeyframe) 387 DEFINE_TRACE(StringKeyframe::PropertySpecificKeyframe)
398 { 388 {
399 visitor->trace(m_value); 389 visitor->trace(m_value);
400 visitor->trace(m_animatableValueCache); 390 visitor->trace(m_animatableValueCache);
401 Keyframe::PropertySpecificKeyframe::trace(visitor); 391 Keyframe::PropertySpecificKeyframe::trace(visitor);
402 } 392 }
403 393
404 } 394 }
OLDNEW
« no previous file with comments | « Source/core/animation/LengthStyleInterpolation.cpp ('k') | Source/core/animation/css/CSSAnimatableValueFactory.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698