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

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

Issue 468543002: Revert refactoring of CSSProperty .in files (Closed) Base URL: svn://svn.chromium.org/blink/trunk
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 | Annotate | Revision Log
« 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"
14 #include "core/css/resolver/StyleResolver.h" 13 #include "core/css/resolver/StyleResolver.h"
15 #include "core/rendering/style/RenderStyle.h" 14 #include "core/rendering/style/RenderStyle.h"
16 15
17 namespace blink { 16 namespace blink {
18 17
19 StringKeyframe::StringKeyframe(const StringKeyframe& copyFrom) 18 StringKeyframe::StringKeyframe(const StringKeyframe& copyFrom)
20 : Keyframe(copyFrom.m_offset, copyFrom.m_composite, copyFrom.m_easing) 19 : Keyframe(copyFrom.m_offset, copyFrom.m_composite, copyFrom.m_easing)
21 , m_propertySet(copyFrom.m_propertySet->mutableCopy()) 20 , m_propertySet(copyFrom.m_propertySet->mutableCopy())
22 { 21 {
23 } 22 }
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 { 64 {
66 ASSERT(!isNull(m_offset)); 65 ASSERT(!isNull(m_offset));
67 } 66 }
68 67
69 PassRefPtrWillBeRawPtr<Interpolation> StringKeyframe::PropertySpecificKeyframe:: createInterpolation(CSSPropertyID property, Keyframe::PropertySpecificKeyframe* end, Element* element) const 68 PassRefPtrWillBeRawPtr<Interpolation> StringKeyframe::PropertySpecificKeyframe:: createInterpolation(CSSPropertyID property, Keyframe::PropertySpecificKeyframe* end, Element* element) const
70 { 69 {
71 CSSValue* fromCSSValue = m_value.get(); 70 CSSValue* fromCSSValue = m_value.get();
72 CSSValue* toCSSValue = toStringPropertySpecificKeyframe(end)->value(); 71 CSSValue* toCSSValue = toStringPropertySpecificKeyframe(end)->value();
73 ValueRange range = ValueRangeAll; 72 ValueRange range = ValueRangeAll;
74 73
75 if (!CSSPropertyMetadata::isAnimatableProperty(property)) 74 if (!CSSAnimations::isAnimatableProperty(property))
76 return DefaultStyleInterpolation::create(fromCSSValue, toCSSValue, prope rty); 75 return DefaultStyleInterpolation::create(fromCSSValue, toCSSValue, prope rty);
77 76
78 switch (property) { 77 switch (property) {
79 case CSSPropertyBorderBottomWidth: 78 case CSSPropertyBorderBottomWidth:
80 case CSSPropertyBorderLeftWidth: 79 case CSSPropertyBorderLeftWidth:
81 case CSSPropertyBorderRightWidth: 80 case CSSPropertyBorderRightWidth:
82 case CSSPropertyBorderTopWidth: 81 case CSSPropertyBorderTopWidth:
83 case CSSPropertyFontSize: 82 case CSSPropertyFontSize:
84 case CSSPropertyHeight: 83 case CSSPropertyHeight:
85 case CSSPropertyLineHeight: 84 case CSSPropertyLineHeight:
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
144 } 143 }
145 144
146 void StringKeyframe::PropertySpecificKeyframe::trace(Visitor* visitor) 145 void StringKeyframe::PropertySpecificKeyframe::trace(Visitor* visitor)
147 { 146 {
148 visitor->trace(m_value); 147 visitor->trace(m_value);
149 visitor->trace(m_animatableValueCache); 148 visitor->trace(m_animatableValueCache);
150 Keyframe::PropertySpecificKeyframe::trace(visitor); 149 Keyframe::PropertySpecificKeyframe::trace(visitor);
151 } 150 }
152 151
153 } 152 }
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