| Index: trunk/Source/core/css/resolver/StyleResolverState.h
|
| ===================================================================
|
| --- trunk/Source/core/css/resolver/StyleResolverState.h (revision 170003)
|
| +++ trunk/Source/core/css/resolver/StyleResolverState.h (working copy)
|
| @@ -67,9 +67,9 @@
|
|
|
| const CSSToLengthConversionData& cssToLengthConversionData() const { return m_cssToLengthConversionData; }
|
|
|
| - void setAnimationUpdate(PassOwnPtrWillBeRawPtr<CSSAnimationUpdate>);
|
| + void setAnimationUpdate(PassOwnPtr<CSSAnimationUpdate>);
|
| const CSSAnimationUpdate* animationUpdate() { return m_animationUpdate.get(); }
|
| - PassOwnPtrWillBeRawPtr<CSSAnimationUpdate> takeAnimationUpdate();
|
| + PassOwnPtr<CSSAnimationUpdate> takeAnimationUpdate();
|
|
|
| void setParentStyle(PassRefPtr<RenderStyle> parentStyle) { m_parentStyle = parentStyle; }
|
| const RenderStyle* parentStyle() const { return m_parentStyle.get(); }
|
| @@ -153,7 +153,7 @@
|
| // so we keep it separate from m_elementContext.
|
| RefPtr<RenderStyle> m_parentStyle;
|
|
|
| - OwnPtrWillBeMember<CSSAnimationUpdate> m_animationUpdate;
|
| + OwnPtr<CSSAnimationUpdate> m_animationUpdate;
|
|
|
| bool m_applyPropertyToRegularStyle;
|
| bool m_applyPropertyToVisitedLinkStyle;
|
|
|