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

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

Issue 454423003: Add animatable flag to CSSProperties.in (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 4 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
« no previous file with comments | « Source/core/BUILD.gn ('k') | Source/core/animation/css/CSSAnimatableValueFactory.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/DefaultStyleInterpolation.h" 8 #include "core/animation/DefaultStyleInterpolation.h"
9 #include "core/animation/DeferredLegacyStyleInterpolation.h" 9 #include "core/animation/DeferredLegacyStyleInterpolation.h"
10 #include "core/animation/LegacyStyleInterpolation.h" 10 #include "core/animation/LegacyStyleInterpolation.h"
11 #include "core/animation/LengthStyleInterpolation.h" 11 #include "core/animation/LengthStyleInterpolation.h"
12 #include "core/animation/css/CSSAnimations.h" 12 #include "core/animation/css/CSSAnimations.h"
13 #include "core/css/CSSPropertyMetadata.h"
13 #include "core/css/resolver/StyleResolver.h" 14 #include "core/css/resolver/StyleResolver.h"
14 #include "core/rendering/style/RenderStyle.h" 15 #include "core/rendering/style/RenderStyle.h"
15 16
16 namespace blink { 17 namespace blink {
17 18
18 StringKeyframe::StringKeyframe(const StringKeyframe& copyFrom) 19 StringKeyframe::StringKeyframe(const StringKeyframe& copyFrom)
19 : Keyframe(copyFrom.m_offset, copyFrom.m_composite, copyFrom.m_easing) 20 : Keyframe(copyFrom.m_offset, copyFrom.m_composite, copyFrom.m_easing)
20 , m_propertySet(copyFrom.m_propertySet->mutableCopy()) 21 , m_propertySet(copyFrom.m_propertySet->mutableCopy())
21 { 22 {
22 } 23 }
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 { 65 {
65 ASSERT(!isNull(m_offset)); 66 ASSERT(!isNull(m_offset));
66 } 67 }
67 68
68 PassRefPtrWillBeRawPtr<Interpolation> StringKeyframe::PropertySpecificKeyframe:: createInterpolation(CSSPropertyID property, Keyframe::PropertySpecificKeyframe* end, Element* element) const 69 PassRefPtrWillBeRawPtr<Interpolation> StringKeyframe::PropertySpecificKeyframe:: createInterpolation(CSSPropertyID property, Keyframe::PropertySpecificKeyframe* end, Element* element) const
69 { 70 {
70 CSSValue* fromCSSValue = m_value.get(); 71 CSSValue* fromCSSValue = m_value.get();
71 CSSValue* toCSSValue = toStringPropertySpecificKeyframe(end)->value(); 72 CSSValue* toCSSValue = toStringPropertySpecificKeyframe(end)->value();
72 ValueRange range = ValueRangeAll; 73 ValueRange range = ValueRangeAll;
73 74
74 if (!CSSAnimations::isAnimatableProperty(property)) 75 if (!CSSPropertyMetadata::isAnimatableProperty(property))
75 return DefaultStyleInterpolation::create(fromCSSValue, toCSSValue, prope rty); 76 return DefaultStyleInterpolation::create(fromCSSValue, toCSSValue, prope rty);
76 77
77 switch (property) { 78 switch (property) {
78 case CSSPropertyBorderBottomWidth: 79 case CSSPropertyBorderBottomWidth:
79 case CSSPropertyBorderLeftWidth: 80 case CSSPropertyBorderLeftWidth:
80 case CSSPropertyBorderRightWidth: 81 case CSSPropertyBorderRightWidth:
81 case CSSPropertyBorderTopWidth: 82 case CSSPropertyBorderTopWidth:
82 case CSSPropertyFontSize: 83 case CSSPropertyFontSize:
83 case CSSPropertyHeight: 84 case CSSPropertyHeight:
84 case CSSPropertyLineHeight: 85 case CSSPropertyLineHeight:
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
143 } 144 }
144 145
145 void StringKeyframe::PropertySpecificKeyframe::trace(Visitor* visitor) 146 void StringKeyframe::PropertySpecificKeyframe::trace(Visitor* visitor)
146 { 147 {
147 visitor->trace(m_value); 148 visitor->trace(m_value);
148 visitor->trace(m_animatableValueCache); 149 visitor->trace(m_animatableValueCache);
149 Keyframe::PropertySpecificKeyframe::trace(visitor); 150 Keyframe::PropertySpecificKeyframe::trace(visitor);
150 } 151 }
151 152
152 } 153 }
OLDNEW
« no previous file with comments | « Source/core/BUILD.gn ('k') | Source/core/animation/css/CSSAnimatableValueFactory.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698