| Index: Source/core/css/resolver/StyleResolverState.h
|
| diff --git a/Source/core/css/resolver/StyleResolverState.h b/Source/core/css/resolver/StyleResolverState.h
|
| index a3e013d189c7896de9c3e0518fbb0ccd7d8b72ca..4a254ec6a1ecca3c6191c4eb2a7012f39037096a 100644
|
| --- a/Source/core/css/resolver/StyleResolverState.h
|
| +++ b/Source/core/css/resolver/StyleResolverState.h
|
| @@ -79,9 +79,9 @@ public:
|
| void setConversionFontSizes(const CSSToLengthConversionData::FontSizes& fontSizes) { m_cssToLengthConversionData.setFontSizes(fontSizes); }
|
| void setConversionZoom(float zoom) { m_cssToLengthConversionData.setZoom(zoom); }
|
|
|
| - void setAnimationUpdate(PassOwnPtrWillBeRawPtr<CSSAnimationUpdate>);
|
| + void setAnimationUpdate(CSSAnimationUpdate*);
|
| const CSSAnimationUpdate* animationUpdate() { return m_animationUpdate.get(); }
|
| - PassOwnPtrWillBeRawPtr<CSSAnimationUpdate> takeAnimationUpdate();
|
| + CSSAnimationUpdate* takeAnimationUpdate();
|
|
|
| void setParentStyle(PassRefPtr<ComputedStyle> parentStyle) { m_parentStyle = parentStyle; }
|
| const ComputedStyle* parentStyle() const { return m_parentStyle.get(); }
|
| @@ -167,7 +167,7 @@ private:
|
| // so we keep it separate.
|
| RefPtr<ComputedStyle> m_parentStyle;
|
|
|
| - OwnPtrWillBeMember<CSSAnimationUpdate> m_animationUpdate;
|
| + PersistentWillBeMember<CSSAnimationUpdate> m_animationUpdate;
|
|
|
| bool m_applyPropertyToRegularStyle;
|
| bool m_applyPropertyToVisitedLinkStyle;
|
|
|