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

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

Issue 1024473004: Do not treat '0' as 'none' for font-size-adjust (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebased 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 203 matching lines...) Expand 10 before | Expand all | Expand 10 after
214 214
215 // FIXME: Handle keywords e.g. 'smaller', 'larger'. 215 // FIXME: Handle keywords e.g. 'smaller', 'larger'.
216 if (property == CSSPropertyFontSize) 216 if (property == CSSPropertyFontSize)
217 fallBackToLegacy = true; 217 fallBackToLegacy = true;
218 218
219 // FIXME: Handle keywords e.g. 'baseline', 'sub'. 219 // FIXME: Handle keywords e.g. 'baseline', 'sub'.
220 if (property == CSSPropertyBaselineShift) 220 if (property == CSSPropertyBaselineShift)
221 fallBackToLegacy = true; 221 fallBackToLegacy = true;
222 222
223 break; 223 break;
224 case CSSPropertyFontSizeAdjust:
225 // FIXME: Requires special handing for 0.
226 fallBackToLegacy = true;
227 break;
228 case CSSPropertyOrphans: 224 case CSSPropertyOrphans:
229 case CSSPropertyWidows: 225 case CSSPropertyWidows:
230 case CSSPropertyZIndex: 226 case CSSPropertyZIndex:
231 case CSSPropertyWebkitColumnCount: 227 case CSSPropertyWebkitColumnCount:
232 case CSSPropertyShapeImageThreshold: 228 case CSSPropertyShapeImageThreshold:
233 case CSSPropertyFillOpacity: 229 case CSSPropertyFillOpacity:
234 case CSSPropertyFloodOpacity: 230 case CSSPropertyFloodOpacity:
231 case CSSPropertyFontSizeAdjust:
235 case CSSPropertyOpacity: 232 case CSSPropertyOpacity:
236 case CSSPropertyStopOpacity: 233 case CSSPropertyStopOpacity:
237 case CSSPropertyStrokeOpacity: 234 case CSSPropertyStrokeOpacity:
238 case CSSPropertyStrokeMiterlimit: 235 case CSSPropertyStrokeMiterlimit:
239 if (DoubleStyleInterpolation::canCreateFrom(*fromCSSValue) && DoubleStyl eInterpolation::canCreateFrom(*toCSSValue)) 236 if (DoubleStyleInterpolation::canCreateFrom(*fromCSSValue) && DoubleStyl eInterpolation::canCreateFrom(*toCSSValue))
240 return DoubleStyleInterpolation::create(*fromCSSValue, *toCSSValue, property, toCSSPrimitiveValue(fromCSSValue)->primitiveType(), setRange(property) ); 237 return DoubleStyleInterpolation::create(*fromCSSValue, *toCSSValue, property, toCSSPrimitiveValue(fromCSSValue)->primitiveType(), setRange(property) );
241 break; 238 break;
242 239
243 case CSSPropertyMotionRotation: { 240 case CSSPropertyMotionRotation: {
244 RefPtrWillBeRawPtr<Interpolation> interpolation = DoubleStyleInterpolati on::maybeCreateFromMotionRotation(*fromCSSValue, *toCSSValue, property); 241 RefPtrWillBeRawPtr<Interpolation> interpolation = DoubleStyleInterpolati on::maybeCreateFromMotionRotation(*fromCSSValue, *toCSSValue, property);
(...skipping 164 matching lines...) Expand 10 before | Expand all | Expand 10 after
409 } 406 }
410 407
411 DEFINE_TRACE(StringKeyframe::PropertySpecificKeyframe) 408 DEFINE_TRACE(StringKeyframe::PropertySpecificKeyframe)
412 { 409 {
413 visitor->trace(m_value); 410 visitor->trace(m_value);
414 visitor->trace(m_animatableValueCache); 411 visitor->trace(m_animatableValueCache);
415 Keyframe::PropertySpecificKeyframe::trace(visitor); 412 Keyframe::PropertySpecificKeyframe::trace(visitor);
416 } 413 }
417 414
418 } 415 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698