Index: Source/core/css/resolver/StyleResolver.h |
diff --git a/Source/core/css/resolver/StyleResolver.h b/Source/core/css/resolver/StyleResolver.h |
index 6cb1ba1ec74123717e4789a8ade6057da6af3905..6810ed83aafe9ffe3a3a1b271f575592db1afab7 100644 |
--- a/Source/core/css/resolver/StyleResolver.h |
+++ b/Source/core/css/resolver/StyleResolver.h |
@@ -94,8 +94,8 @@ public: |
PassRefPtr<ComputedStyle> styleForElement(Element*, const ComputedStyle* parentStyle = 0, StyleSharingBehavior = AllowStyleSharing, |
RuleMatchingBehavior = MatchAllRules); |
- 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); |
@@ -218,7 +218,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); |