| Index: Source/core/css/resolver/StyleResolver.h
|
| diff --git a/Source/core/css/resolver/StyleResolver.h b/Source/core/css/resolver/StyleResolver.h
|
| index 9cbbca2138e75ab935e3d26be5c58cf94e2736ee..2b779d23b8d7e08562dfd28989f2f83eb7d5750a 100644
|
| --- a/Source/core/css/resolver/StyleResolver.h
|
| +++ b/Source/core/css/resolver/StyleResolver.h
|
| @@ -98,8 +98,8 @@ public:
|
| RuleMatchingBehavior = MatchAllRules);
|
|
|
| PassRefPtr<ComputedStyle> styleForKeyframe(Element&, const ComputedStyle&, const ComputedStyle* parentStyle, const StyleRuleKeyframe*, const AtomicString& animationName);
|
| - static PassRefPtrWillBeRawPtr<AnimatableValue> createAnimatableValueSnapshot(Element&, const ComputedStyle* baseStyle, CSSPropertyID, CSSValue*);
|
| - static PassRefPtrWillBeRawPtr<AnimatableValue> createAnimatableValueSnapshot(StyleResolverState&, CSSPropertyID, CSSValue*);
|
| + static AnimatableValue* createAnimatableValueSnapshot(Element&, const ComputedStyle* baseStyle, CSSPropertyID, CSSValue*);
|
| + static AnimatableValue* createAnimatableValueSnapshot(StyleResolverState&, CSSPropertyID, CSSValue*);
|
|
|
| PassRefPtr<ComputedStyle> pseudoStyleForElement(Element*, const PseudoStyleRequest&, const ComputedStyle* parentStyle);
|
|
|
| @@ -222,7 +222,7 @@ private:
|
| template <CSSPropertyPriority priority>
|
| void applyProperties(StyleResolverState&, const StylePropertySet* properties, bool isImportant, bool inheritedOnly, PropertyWhitelistType = PropertyWhitelistNone);
|
| template <CSSPropertyPriority priority>
|
| - void applyAnimatedProperties(StyleResolverState&, const WillBeHeapHashMap<PropertyHandle, RefPtrWillBeMember<Interpolation>>&);
|
| + void applyAnimatedProperties(StyleResolverState&, const HeapHashMap<PropertyHandle, Member<Interpolation>>&);
|
| template <CSSPropertyPriority priority>
|
| void applyAllProperty(StyleResolverState&, CSSValue*, bool inheritedOnly);
|
|
|
|
|