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

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

Issue 1164573002: CSSValue Immediates: Change CSSValue to an object instead of a pointer (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase Created 5 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
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 #ifndef StringKeyframe_h 5 #ifndef StringKeyframe_h
6 #define StringKeyframe_h 6 #define StringKeyframe_h
7 7
8 #include "core/animation/Keyframe.h" 8 #include "core/animation/Keyframe.h"
9 #include "core/css/StylePropertySet.h" 9 #include "core/css/StylePropertySet.h"
10 10
11 #include "wtf/HashMap.h" 11 #include "wtf/HashMap.h"
12 12
13 namespace blink { 13 namespace blink {
14 14
15 class StyleSheetContents; 15 class StyleSheetContents;
16 16
17 class StringKeyframe : public Keyframe { 17 class StringKeyframe : public Keyframe {
18 public: 18 public:
19 static PassRefPtrWillBeRawPtr<StringKeyframe> create() 19 static PassRefPtrWillBeRawPtr<StringKeyframe> create()
20 { 20 {
21 return adoptRefWillBeNoop(new StringKeyframe); 21 return adoptRefWillBeNoop(new StringKeyframe);
22 } 22 }
23 23
24 void setPropertyValue(CSSPropertyID, const String& value, Element*, StyleShe etContents*); 24 void setPropertyValue(CSSPropertyID, const String& value, Element*, StyleShe etContents*);
25 void setPropertyValue(CSSPropertyID, PassRefPtrWillBeRawPtr<CSSValue>); 25 void setPropertyValue(CSSPropertyID, CSSValue);
26 void setPropertyValue(const QualifiedName&, const String& value, Element*); 26 void setPropertyValue(const QualifiedName&, const String& value, Element*);
27 CSSValue* cssPropertyValue(CSSPropertyID property) const 27 CSSValue cssPropertyValue(CSSPropertyID property) const
28 { 28 {
29 int index = m_propertySet->findPropertyIndex(property); 29 int index = m_propertySet->findPropertyIndex(property);
30 RELEASE_ASSERT(index >= 0); 30 RELEASE_ASSERT(index >= 0);
31 return m_propertySet->propertyAt(static_cast<unsigned>(index)).value(); 31 return m_propertySet->propertyAt(static_cast<unsigned>(index)).value();
32 } 32 }
33 String svgPropertyValue(const QualifiedName& attributeName) const 33 String svgPropertyValue(const QualifiedName& attributeName) const
34 { 34 {
35 return m_svgPropertyMap.get(&attributeName); 35 return m_svgPropertyMap.get(&attributeName);
36 } 36 }
37 37
38 virtual PropertyHandleSet properties() const override; 38 virtual PropertyHandleSet properties() const override;
39 39
40 DECLARE_VIRTUAL_TRACE(); 40 DECLARE_VIRTUAL_TRACE();
41 41
42 class CSSPropertySpecificKeyframe : public Keyframe::PropertySpecificKeyfram e { 42 class CSSPropertySpecificKeyframe : public Keyframe::PropertySpecificKeyfram e {
43 public: 43 public:
44 CSSPropertySpecificKeyframe(double offset, PassRefPtr<TimingFunction> ea sing, CSSValue*, EffectModel::CompositeOperation); 44 CSSPropertySpecificKeyframe(double offset, PassRefPtr<TimingFunction> ea sing, NullableCSSValue, EffectModel::CompositeOperation);
45 45
46 CSSValue* value() const { return m_value.get(); } 46 NullableCSSValue value() const { return m_value; }
47 47
48 virtual void populateAnimatableValue(CSSPropertyID, Element&, const Comp utedStyle* baseStyle) const; 48 virtual void populateAnimatableValue(CSSPropertyID, Element&, const Comp utedStyle* baseStyle) const;
49 virtual const PassRefPtrWillBeRawPtr<AnimatableValue> getAnimatableValue () const override final { return m_animatableValueCache.get(); } 49 virtual const PassRefPtrWillBeRawPtr<AnimatableValue> getAnimatableValue () const override final { return m_animatableValueCache.get(); }
50 void setAnimatableValue(PassRefPtrWillBeRawPtr<AnimatableValue> value) { m_animatableValueCache = value; } 50 void setAnimatableValue(PassRefPtrWillBeRawPtr<AnimatableValue> value) { m_animatableValueCache = value; }
51 51
52 virtual PassOwnPtrWillBeRawPtr<Keyframe::PropertySpecificKeyframe> neutr alKeyframe(double offset, PassRefPtr<TimingFunction> easing) const override fina l; 52 virtual PassOwnPtrWillBeRawPtr<Keyframe::PropertySpecificKeyframe> neutr alKeyframe(double offset, PassRefPtr<TimingFunction> easing) const override fina l;
53 virtual PassRefPtrWillBeRawPtr<Interpolation> maybeCreateInterpolation(P ropertyHandle, Keyframe::PropertySpecificKeyframe& end, Element*, const Computed Style* baseStyle) const override final; 53 virtual PassRefPtrWillBeRawPtr<Interpolation> maybeCreateInterpolation(P ropertyHandle, Keyframe::PropertySpecificKeyframe& end, Element*, const Computed Style* baseStyle) const override final;
54 54
55 DECLARE_VIRTUAL_TRACE(); 55 DECLARE_VIRTUAL_TRACE();
56 56
57 private: 57 private:
58 CSSPropertySpecificKeyframe(double offset, PassRefPtr<TimingFunction> ea sing, CSSValue*); 58 CSSPropertySpecificKeyframe(double offset, PassRefPtr<TimingFunction> ea sing, NullableCSSValue);
59 59
60 virtual PassOwnPtrWillBeRawPtr<Keyframe::PropertySpecificKeyframe> clone WithOffset(double offset) const; 60 virtual PassOwnPtrWillBeRawPtr<Keyframe::PropertySpecificKeyframe> clone WithOffset(double offset) const;
61 virtual bool isCSSPropertySpecificKeyframe() const override { return tru e; } 61 virtual bool isCSSPropertySpecificKeyframe() const override { return tru e; }
62 62
63 static bool createInterpolationsFromCSSValues(CSSPropertyID, CSSValue* f romCSSValue, CSSValue* toCSSValue, Element*, OwnPtrWillBeRawPtr<WillBeHeapVector <RefPtrWillBeMember<Interpolation>>>& interpolations); 63 static bool createInterpolationsFromCSSValues(CSSPropertyID, CSSValue fr omCSSValue, CSSValue toCSSValue, Element*, OwnPtrWillBeRawPtr<WillBeHeapVector<R efPtrWillBeMember<Interpolation>>>& interpolations);
64 64
65 void populateAnimatableValueCaches(CSSPropertyID, Keyframe::PropertySpec ificKeyframe&, Element*, CSSValue& fromCSSValue, CSSValue& toCSSValue) const; 65 void populateAnimatableValueCaches(CSSPropertyID, Keyframe::PropertySpec ificKeyframe&, Element*, CSSValue& fromCSSValue, CSSValue& toCSSValue) const;
66 66
67 RefPtrWillBeMember<CSSValue> m_value; 67 NullableCSSValue m_value;
68 mutable RefPtrWillBeMember<AnimatableValue> m_animatableValueCache; 68 mutable RefPtrWillBeMember<AnimatableValue> m_animatableValueCache;
69 }; 69 };
70 70
71 class SVGPropertySpecificKeyframe : public Keyframe::PropertySpecificKeyfram e { 71 class SVGPropertySpecificKeyframe : public Keyframe::PropertySpecificKeyfram e {
72 public: 72 public:
73 SVGPropertySpecificKeyframe(double offset, PassRefPtr<TimingFunction> ea sing, const String&, EffectModel::CompositeOperation); 73 SVGPropertySpecificKeyframe(double offset, PassRefPtr<TimingFunction> ea sing, const String&, EffectModel::CompositeOperation);
74 74
75 const String& value() const { return m_value; } 75 const String& value() const { return m_value; }
76 76
77 virtual PassOwnPtrWillBeRawPtr<PropertySpecificKeyframe> cloneWithOffset (double offset) const override final; 77 virtual PassOwnPtrWillBeRawPtr<PropertySpecificKeyframe> cloneWithOffset (double offset) const override final;
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
110 using CSSPropertySpecificKeyframe = StringKeyframe::CSSPropertySpecificKeyframe; 110 using CSSPropertySpecificKeyframe = StringKeyframe::CSSPropertySpecificKeyframe;
111 using SVGPropertySpecificKeyframe = StringKeyframe::SVGPropertySpecificKeyframe; 111 using SVGPropertySpecificKeyframe = StringKeyframe::SVGPropertySpecificKeyframe;
112 112
113 DEFINE_TYPE_CASTS(StringKeyframe, Keyframe, value, value->isStringKeyframe(), va lue.isStringKeyframe()); 113 DEFINE_TYPE_CASTS(StringKeyframe, Keyframe, value, value->isStringKeyframe(), va lue.isStringKeyframe());
114 DEFINE_TYPE_CASTS(CSSPropertySpecificKeyframe, Keyframe::PropertySpecificKeyfram e, value, value->isCSSPropertySpecificKeyframe(), value.isCSSPropertySpecificKey frame()); 114 DEFINE_TYPE_CASTS(CSSPropertySpecificKeyframe, Keyframe::PropertySpecificKeyfram e, value, value->isCSSPropertySpecificKeyframe(), value.isCSSPropertySpecificKey frame());
115 DEFINE_TYPE_CASTS(SVGPropertySpecificKeyframe, Keyframe::PropertySpecificKeyfram e, value, value->isSVGPropertySpecificKeyframe(), value.isSVGPropertySpecificKey frame()); 115 DEFINE_TYPE_CASTS(SVGPropertySpecificKeyframe, Keyframe::PropertySpecificKeyfram e, value, value->isSVGPropertySpecificKeyframe(), value.isSVGPropertySpecificKey frame());
116 116
117 } 117 }
118 118
119 #endif 119 #endif
OLDNEW
« no previous file with comments | « Source/core/animation/ShadowStyleInterpolationTest.cpp ('k') | Source/core/animation/StringKeyframe.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698