| 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/CSSPropertyMetadata.h" | 9 #include "core/css/CSSPropertyMetadata.h" |
| 10 #include "core/css/resolver/StyleResolver.h" | 10 #include "core/css/resolver/StyleResolver.h" |
| (...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 88 } | 88 } |
| 89 | 89 |
| 90 bool StringKeyframe::CSSPropertySpecificKeyframe::populateAnimatableValue(CSSPro
pertyID property, Element& element, const ComputedStyle& baseStyle, const Comput
edStyle* parentStyle) const | 90 bool StringKeyframe::CSSPropertySpecificKeyframe::populateAnimatableValue(CSSPro
pertyID property, Element& element, const ComputedStyle& baseStyle, const Comput
edStyle* parentStyle) const |
| 91 { | 91 { |
| 92 m_animatableValueCache = StyleResolver::createAnimatableValueSnapshot(elemen
t, baseStyle, parentStyle, property, m_value.get()); | 92 m_animatableValueCache = StyleResolver::createAnimatableValueSnapshot(elemen
t, baseStyle, parentStyle, property, m_value.get()); |
| 93 return true; | 93 return true; |
| 94 } | 94 } |
| 95 | 95 |
| 96 PassRefPtr<Keyframe::PropertySpecificKeyframe> StringKeyframe::CSSPropertySpecif
icKeyframe::neutralKeyframe(double offset, PassRefPtr<TimingFunction> easing) co
nst | 96 PassRefPtr<Keyframe::PropertySpecificKeyframe> StringKeyframe::CSSPropertySpecif
icKeyframe::neutralKeyframe(double offset, PassRefPtr<TimingFunction> easing) co
nst |
| 97 { | 97 { |
| 98 return create(offset, easing, nullptr, EffectModel::CompositeAdd); | 98 return create(offset, std::move(easing), nullptr, EffectModel::CompositeAdd)
; |
| 99 } | 99 } |
| 100 | 100 |
| 101 PassRefPtr<Keyframe::PropertySpecificKeyframe> StringKeyframe::CSSPropertySpecif
icKeyframe::cloneWithOffset(double offset) const | 101 PassRefPtr<Keyframe::PropertySpecificKeyframe> StringKeyframe::CSSPropertySpecif
icKeyframe::cloneWithOffset(double offset) const |
| 102 { | 102 { |
| 103 RefPtr<CSSPropertySpecificKeyframe> clone = create(offset, m_easing, m_value
.get(), m_composite); | 103 RefPtr<CSSPropertySpecificKeyframe> clone = create(offset, m_easing, m_value
.get(), m_composite); |
| 104 clone->m_animatableValueCache = m_animatableValueCache; | 104 clone->m_animatableValueCache = m_animatableValueCache; |
| 105 return clone.release(); | 105 return clone.release(); |
| 106 } | 106 } |
| 107 | 107 |
| 108 PassRefPtr<Keyframe::PropertySpecificKeyframe> SVGPropertySpecificKeyframe::clon
eWithOffset(double offset) const | 108 PassRefPtr<Keyframe::PropertySpecificKeyframe> SVGPropertySpecificKeyframe::clon
eWithOffset(double offset) const |
| 109 { | 109 { |
| 110 return create(offset, m_easing, m_value, m_composite); | 110 return create(offset, m_easing, m_value, m_composite); |
| 111 } | 111 } |
| 112 | 112 |
| 113 PassRefPtr<Keyframe::PropertySpecificKeyframe> SVGPropertySpecificKeyframe::neut
ralKeyframe(double offset, PassRefPtr<TimingFunction> easing) const | 113 PassRefPtr<Keyframe::PropertySpecificKeyframe> SVGPropertySpecificKeyframe::neut
ralKeyframe(double offset, PassRefPtr<TimingFunction> easing) const |
| 114 { | 114 { |
| 115 return create(offset, easing, String(), EffectModel::CompositeAdd); | 115 return create(offset, std::move(easing), String(), EffectModel::CompositeAdd
); |
| 116 } | 116 } |
| 117 | 117 |
| 118 } // namespace blink | 118 } // namespace blink |
| OLD | NEW |