Make CSSAnimationUpdate stack-allocated

Source/core/css/resolver/StyleResolverState.h

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public License
  * along with this library; see the file COPYING.LIB.  If not, write to
  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  *
  */
 
 #ifndef StyleResolverState_h
 #define StyleResolverState_h
 
 #include "core/CSSPropertyNames.h"
 #include "core/CoreExport.h"
+#include "core/animation/css/CSSAnimationUpdate.h"
 #include "core/css/CSSSVGDocumentValue.h"
 #include "core/css/CSSToLengthConversionData.h"
 #include "core/css/resolver/CSSToStyleMap.h"
 #include "core/css/resolver/ElementResolveContext.h"
 #include "core/css/resolver/ElementStyleResources.h"
 #include "core/css/resolver/FontBuilder.h"
 #include "core/dom/Document.h"
 #include "core/dom/Element.h"
 #include "core/style/CachedUAStyle.h"
 #include "core/style/ComputedStyle.h"
 #include "core/style/StyleInheritedData.h"
 
 namespace blink {
 
-class CSSAnimationUpdate;
 class FontDescription;
 
 class CORE_EXPORT StyleResolverState {
     STACK_ALLOCATED();
     WTF_MAKE_NONCOPYABLE(StyleResolverState);
 public:
     StyleResolverState(Document&, const ElementResolveContext&, const ComputedStyle* parentStyle);
     StyleResolverState(Document&, Element*, const ComputedStyle* parentStyle = 0);
     ~StyleResolverState();
 
@@ skipping 20 matching lines @@
     PassRefPtr<ComputedStyle> takeStyle() { return m_style.release(); }
 
     ComputedStyle& mutableStyleRef() const { return *m_style; }
     const ComputedStyle& styleRef() const { return mutableStyleRef(); }
 
     const CSSToLengthConversionData& cssToLengthConversionData() const { return m_cssToLengthConversionData; }
 
     void setConversionFontSizes(const CSSToLengthConversionData::FontSizes& fontSizes) { m_cssToLengthConversionData.setFontSizes(fontSizes); }
     void setConversionZoom(float zoom) { m_cssToLengthConversionData.setZoom(zoom); }
 
-    void setAnimationUpdate(PassOwnPtrWillBeRawPtr<CSSAnimationUpdate>);
-    const CSSAnimationUpdate* animationUpdate() { return m_animationUpdate.get(); }
-    PassOwnPtrWillBeRawPtr<CSSAnimationUpdate> takeAnimationUpdate();
+    CSSAnimationUpdate& animationUpdate() { return m_animationUpdate; }
 
     void setParentStyle(PassRefPtr<ComputedStyle> parentStyle) { m_parentStyle = parentStyle; }
     const ComputedStyle* parentStyle() const { return m_parentStyle.get(); }
     ComputedStyle* parentStyle() { return m_parentStyle.get(); }
 
     // FIXME: These are effectively side-channel "out parameters" for the various
     // map functions. When we map from CSS to style objects we use this state object
     // to track various meta-data about that mapping (e.g. if it's cache-able).
     // We need to move this data off of StyleResolverState and closer to the
     // objects it applies to. Possibly separating (immutable) inputs from (mutable) outputs.
@@ skipping 65 matching lines @@
 
     // m_style is the primary output for each element's style resolve.
     RefPtr<ComputedStyle> m_style;
 
     CSSToLengthConversionData m_cssToLengthConversionData;
 
     // m_parentStyle is not always just ElementResolveContext::parentStyle,
     // so we keep it separate.
     RefPtr<ComputedStyle> m_parentStyle;
 
-    OwnPtrWillBeMember<CSSAnimationUpdate> m_animationUpdate;
+    CSSAnimationUpdate m_animationUpdate;
 
     bool m_applyPropertyToRegularStyle;
     bool m_applyPropertyToVisitedLinkStyle;
     bool m_hasDirAutoAttribute;
 
     FontBuilder m_fontBuilder;
 
     OwnPtr<CachedUAStyle> m_cachedUAStyle;
 
     ElementStyleResources m_elementStyleResources;
 };
 
 } // namespace blink
 
 #endif // StyleResolverState_h