| OLD | NEW |
| 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 "core/animation/StringKeyframe.h" | 5 #include "core/animation/StringKeyframe.h" |
| 6 | 6 |
| 7 #include "core/StylePropertyShorthand.h" | 7 #include "core/StylePropertyShorthand.h" |
| 8 #include "core/animation/css/CSSAnimations.h" | 8 #include "core/animation/css/CSSAnimations.h" |
| 9 #include "core/css/CSSCustomPropertyDeclaration.h" | 9 #include "core/css/CSSCustomPropertyDeclaration.h" |
| 10 #include "core/css/CSSPropertyMetadata.h" | 10 #include "core/css/CSSPropertyMetadata.h" |
| (...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 93 properties.add(PropertyHandle(*key)); | 93 properties.add(PropertyHandle(*key)); |
| 94 | 94 |
| 95 return properties; | 95 return properties; |
| 96 } | 96 } |
| 97 | 97 |
| 98 PassRefPtr<Keyframe> StringKeyframe::clone() const { | 98 PassRefPtr<Keyframe> StringKeyframe::clone() const { |
| 99 return adoptRef(new StringKeyframe(*this)); | 99 return adoptRef(new StringKeyframe(*this)); |
| 100 } | 100 } |
| 101 | 101 |
| 102 PassRefPtr<Keyframe::PropertySpecificKeyframe> | 102 PassRefPtr<Keyframe::PropertySpecificKeyframe> |
| 103 StringKeyframe::createPropertySpecificKeyframe(PropertyHandle property) const { | 103 StringKeyframe::createPropertySpecificKeyframe( |
| 104 const PropertyHandle& property) const { |
| 104 if (property.isCSSProperty()) | 105 if (property.isCSSProperty()) |
| 105 return CSSPropertySpecificKeyframe::create( | 106 return CSSPropertySpecificKeyframe::create( |
| 106 offset(), &easing(), &cssPropertyValue(property), composite()); | 107 offset(), &easing(), &cssPropertyValue(property), composite()); |
| 107 | 108 |
| 108 if (property.isPresentationAttribute()) | 109 if (property.isPresentationAttribute()) |
| 109 return CSSPropertySpecificKeyframe::create( | 110 return CSSPropertySpecificKeyframe::create( |
| 110 offset(), &easing(), | 111 offset(), &easing(), |
| 111 &presentationAttributeValue(property.presentationAttribute()), | 112 &presentationAttributeValue(property.presentationAttribute()), |
| 112 composite()); | 113 composite()); |
| 113 | 114 |
| (...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 149 } | 150 } |
| 150 | 151 |
| 151 PassRefPtr<Keyframe::PropertySpecificKeyframe> | 152 PassRefPtr<Keyframe::PropertySpecificKeyframe> |
| 152 SVGPropertySpecificKeyframe::neutralKeyframe( | 153 SVGPropertySpecificKeyframe::neutralKeyframe( |
| 153 double offset, | 154 double offset, |
| 154 PassRefPtr<TimingFunction> easing) const { | 155 PassRefPtr<TimingFunction> easing) const { |
| 155 return create(offset, std::move(easing), String(), EffectModel::CompositeAdd); | 156 return create(offset, std::move(easing), String(), EffectModel::CompositeAdd); |
| 156 } | 157 } |
| 157 | 158 |
| 158 } // namespace blink | 159 } // namespace blink |
| OLD | NEW |