OLD | NEW |
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 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
48 PassRefPtr<AnimatableValue> AnimatableImage::interpolateTo( | 48 PassRefPtr<AnimatableValue> AnimatableImage::interpolateTo( |
49 const AnimatableValue* value, | 49 const AnimatableValue* value, |
50 double fraction) const { | 50 double fraction) const { |
51 if (fraction <= 0 || fraction >= 1 || usesDefaultInterpolationWith(value)) | 51 if (fraction <= 0 || fraction >= 1 || usesDefaultInterpolationWith(value)) |
52 return defaultInterpolateTo(this, value, fraction); | 52 return defaultInterpolateTo(this, value, fraction); |
53 | 53 |
54 CSSValue* fromValue = toCSSValue(); | 54 CSSValue* fromValue = toCSSValue(); |
55 CSSValue* toValue = toAnimatableImage(value)->toCSSValue(); | 55 CSSValue* toValue = toAnimatableImage(value)->toCSSValue(); |
56 | 56 |
57 return create(CSSCrossfadeValue::create( | 57 return create(CSSCrossfadeValue::create( |
58 fromValue, toValue, CSSPrimitiveValue::create( | 58 fromValue, toValue, |
59 fraction, CSSPrimitiveValue::UnitType::Number))); | 59 CSSPrimitiveValue::create(fraction, |
| 60 CSSPrimitiveValue::UnitType::Number))); |
60 } | 61 } |
61 | 62 |
62 bool AnimatableImage::equalTo(const AnimatableValue* value) const { | 63 bool AnimatableImage::equalTo(const AnimatableValue* value) const { |
63 return m_value->equals(*toAnimatableImage(value)->m_value.get()); | 64 return m_value->equals(*toAnimatableImage(value)->m_value.get()); |
64 } | 65 } |
65 | 66 |
66 } // namespace blink | 67 } // namespace blink |
OLD | NEW |