Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(224)

Side by Side Diff: Source/core/css/resolver/StyleResolverState.h

Issue 212143002: Oilpan: Move CSSAnimations, CSSAnimationUpdate and ActiveAnimations to oilpan's heap (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved. 3 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
4 * 4 *
5 * This library is free software; you can redistribute it and/or 5 * This library is free software; you can redistribute it and/or
6 * modify it under the terms of the GNU Library General Public 6 * modify it under the terms of the GNU Library General Public
7 * License as published by the Free Software Foundation; either 7 * License as published by the Free Software Foundation; either
8 * version 2 of the License, or (at your option) any later version. 8 * version 2 of the License, or (at your option) any later version.
9 * 9 *
10 * This library is distributed in the hope that it will be useful, 10 * This library is distributed in the hope that it will be useful,
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
60 60
61 const ElementResolveContext& elementContext() const { return m_elementContex t; } 61 const ElementResolveContext& elementContext() const { return m_elementContex t; }
62 62
63 void setStyle(PassRefPtr<RenderStyle> style) { m_style = style; m_cssToLengt hConversionData.setStyle(m_style.get()); } 63 void setStyle(PassRefPtr<RenderStyle> style) { m_style = style; m_cssToLengt hConversionData.setStyle(m_style.get()); }
64 const RenderStyle* style() const { return m_style.get(); } 64 const RenderStyle* style() const { return m_style.get(); }
65 RenderStyle* style() { return m_style.get(); } 65 RenderStyle* style() { return m_style.get(); }
66 PassRefPtr<RenderStyle> takeStyle() { return m_style.release(); } 66 PassRefPtr<RenderStyle> takeStyle() { return m_style.release(); }
67 67
68 const CSSToLengthConversionData& cssToLengthConversionData() const { return m_cssToLengthConversionData; } 68 const CSSToLengthConversionData& cssToLengthConversionData() const { return m_cssToLengthConversionData; }
69 69
70 void setAnimationUpdate(PassOwnPtr<CSSAnimationUpdate>); 70 void setAnimationUpdate(PassOwnPtrWillBeRawPtr<CSSAnimationUpdate>);
71 const CSSAnimationUpdate* animationUpdate() { return m_animationUpdate.get() ; } 71 const CSSAnimationUpdate* animationUpdate() { return m_animationUpdate.get() ; }
72 PassOwnPtr<CSSAnimationUpdate> takeAnimationUpdate(); 72 PassOwnPtrWillBeRawPtr<CSSAnimationUpdate> takeAnimationUpdate();
73 73
74 void setParentStyle(PassRefPtr<RenderStyle> parentStyle) { m_parentStyle = p arentStyle; } 74 void setParentStyle(PassRefPtr<RenderStyle> parentStyle) { m_parentStyle = p arentStyle; }
75 const RenderStyle* parentStyle() const { return m_parentStyle.get(); } 75 const RenderStyle* parentStyle() const { return m_parentStyle.get(); }
76 RenderStyle* parentStyle() { return m_parentStyle.get(); } 76 RenderStyle* parentStyle() { return m_parentStyle.get(); }
77 77
78 void setCurrentRule(StyleRule* currentRule) { m_currentRule = currentRule; } 78 void setCurrentRule(StyleRule* currentRule) { m_currentRule = currentRule; }
79 const StyleRule* currentRule() const { return m_currentRule; } 79 const StyleRule* currentRule() const { return m_currentRule; }
80 80
81 // FIXME: These are effectively side-channel "out parameters" for the variou s 81 // FIXME: These are effectively side-channel "out parameters" for the variou s
82 // map functions. When we map from CSS to style objects we use this state ob ject 82 // map functions. When we map from CSS to style objects we use this state ob ject
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
146 146
147 // m_style is the primary output for each element's style resolve. 147 // m_style is the primary output for each element's style resolve.
148 RefPtr<RenderStyle> m_style; 148 RefPtr<RenderStyle> m_style;
149 149
150 CSSToLengthConversionData m_cssToLengthConversionData; 150 CSSToLengthConversionData m_cssToLengthConversionData;
151 151
152 // m_parentStyle is not always just element->parentNode()->style() 152 // m_parentStyle is not always just element->parentNode()->style()
153 // so we keep it separate from m_elementContext. 153 // so we keep it separate from m_elementContext.
154 RefPtr<RenderStyle> m_parentStyle; 154 RefPtr<RenderStyle> m_parentStyle;
155 155
156 OwnPtr<CSSAnimationUpdate> m_animationUpdate; 156 OwnPtrWillBeMember<CSSAnimationUpdate> m_animationUpdate;
157 157
158 bool m_applyPropertyToRegularStyle; 158 bool m_applyPropertyToRegularStyle;
159 bool m_applyPropertyToVisitedLinkStyle; 159 bool m_applyPropertyToVisitedLinkStyle;
160 160
161 RawPtrWillBeMember<CSSValue> m_lineHeightValue; 161 RawPtrWillBeMember<CSSValue> m_lineHeightValue;
162 162
163 FontBuilder m_fontBuilder; 163 FontBuilder m_fontBuilder;
164 164
165 CachedUAStyle m_cachedUAStyle; 165 CachedUAStyle m_cachedUAStyle;
166 166
167 ElementStyleResources m_elementStyleResources; 167 ElementStyleResources m_elementStyleResources;
168 // CSSToStyleMap is a pure-logic class and only contains 168 // CSSToStyleMap is a pure-logic class and only contains
169 // a back-pointer to this object. 169 // a back-pointer to this object.
170 CSSToStyleMap m_styleMap; 170 CSSToStyleMap m_styleMap;
171 Vector<AtomicString> m_contentAttrValues; 171 Vector<AtomicString> m_contentAttrValues;
172 172
173 RawPtrWillBeMember<StyleRule> m_currentRule; 173 RawPtrWillBeMember<StyleRule> m_currentRule;
174 }; 174 };
175 175
176 } // namespace WebCore 176 } // namespace WebCore
177 177
178 #endif // StyleResolverState_h 178 #endif // StyleResolverState_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698