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

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

Issue 2233333002: Made StylePropertySet::setProperty take a const CSSValue& instead of ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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 | « no previous file | third_party/WebKit/Source/core/css/StylePropertySet.h » ('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 "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 15 matching lines...) Expand all
26 { 26 {
27 ASSERT(property != CSSPropertyInvalid); 27 ASSERT(property != CSSPropertyInvalid);
28 if (CSSAnimations::isAnimatableProperty(property)) 28 if (CSSAnimations::isAnimatableProperty(property))
29 m_cssPropertyMap->setProperty(property, value, false, styleSheetContents ); 29 m_cssPropertyMap->setProperty(property, value, false, styleSheetContents );
30 } 30 }
31 31
32 void StringKeyframe::setCSSPropertyValue(CSSPropertyID property, const CSSValue& value) 32 void StringKeyframe::setCSSPropertyValue(CSSPropertyID property, const CSSValue& value)
33 { 33 {
34 ASSERT(property != CSSPropertyInvalid); 34 ASSERT(property != CSSPropertyInvalid);
35 ASSERT(CSSAnimations::isAnimatableProperty(property)); 35 ASSERT(CSSAnimations::isAnimatableProperty(property));
36 m_cssPropertyMap->setProperty(property, &value, false); 36 m_cssPropertyMap->setProperty(property, value, false);
37 } 37 }
38 38
39 void StringKeyframe::setPresentationAttributeValue(CSSPropertyID property, const String& value, Element* element, StyleSheetContents* styleSheetContents) 39 void StringKeyframe::setPresentationAttributeValue(CSSPropertyID property, const String& value, Element* element, StyleSheetContents* styleSheetContents)
40 { 40 {
41 ASSERT(property != CSSPropertyInvalid); 41 ASSERT(property != CSSPropertyInvalid);
42 if (CSSAnimations::isAnimatableProperty(property)) 42 if (CSSAnimations::isAnimatableProperty(property))
43 m_presentationAttributeMap->setProperty(property, value, false, styleShe etContents); 43 m_presentationAttributeMap->setProperty(property, value, false, styleShe etContents);
44 } 44 }
45 45
46 void StringKeyframe::setSVGAttributeValue(const QualifiedName& attributeName, co nst String& value) 46 void StringKeyframe::setSVGAttributeValue(const QualifiedName& attributeName, co nst String& value)
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
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, easing, String(), EffectModel::CompositeAdd);
116 } 116 }
117 117
118 } // namespace blink 118 } // namespace blink
OLDNEW
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/css/StylePropertySet.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698