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

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

Issue 2521103004: Revert of Apply custom property animation (Closed)
Patch Set: Created 4 years 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
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. 3 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc.
4 * All rights reserved. 4 * All rights reserved.
5 * 5 *
6 * This library is free software; you can redistribute it and/or 6 * This library is free software; you can redistribute it and/or
7 * modify it under the terms of the GNU Library General Public 7 * modify it under the terms of the GNU Library General Public
8 * License as published by the Free Software Foundation; either 8 * License as published by the Free Software Foundation; either
9 * version 2 of the License, or (at your option) any later version. 9 * version 2 of the License, or (at your option) any later version.
10 * 10 *
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
93 void setConversionFontSizes( 93 void setConversionFontSizes(
94 const CSSToLengthConversionData::FontSizes& fontSizes) { 94 const CSSToLengthConversionData::FontSizes& fontSizes) {
95 m_cssToLengthConversionData.setFontSizes(fontSizes); 95 m_cssToLengthConversionData.setFontSizes(fontSizes);
96 } 96 }
97 void setConversionZoom(float zoom) { 97 void setConversionZoom(float zoom) {
98 m_cssToLengthConversionData.setZoom(zoom); 98 m_cssToLengthConversionData.setZoom(zoom);
99 } 99 }
100 100
101 CSSAnimationUpdate& animationUpdate() { return m_animationUpdate; } 101 CSSAnimationUpdate& animationUpdate() { return m_animationUpdate; }
102 102
103 bool isAnimatingCustomProperties() const {
104 return m_isAnimatingCustomProperties;
105 }
106 void setIsAnimatingCustomProperties(bool value) {
107 m_isAnimatingCustomProperties = value;
108 }
109
110 void setParentStyle(PassRefPtr<ComputedStyle> parentStyle) { 103 void setParentStyle(PassRefPtr<ComputedStyle> parentStyle) {
111 m_parentStyle = parentStyle; 104 m_parentStyle = parentStyle;
112 } 105 }
113 const ComputedStyle* parentStyle() const { return m_parentStyle.get(); } 106 const ComputedStyle* parentStyle() const { return m_parentStyle.get(); }
114 ComputedStyle* parentStyle() { return m_parentStyle.get(); } 107 ComputedStyle* parentStyle() { return m_parentStyle.get(); }
115 108
116 // FIXME: These are effectively side-channel "out parameters" for the various 109 // FIXME: These are effectively side-channel "out parameters" for the various
117 // map functions. When we map from CSS to style objects we use this state 110 // map functions. When we map from CSS to style objects we use this state
118 // object to track various meta-data about that mapping (e.g. if it's 111 // object to track various meta-data about that mapping (e.g. if it's
119 // cache-able). We need to move this data off of StyleResolverState and 112 // cache-able). We need to move this data off of StyleResolverState and
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
201 // m_style is the primary output for each element's style resolve. 194 // m_style is the primary output for each element's style resolve.
202 RefPtr<ComputedStyle> m_style; 195 RefPtr<ComputedStyle> m_style;
203 196
204 CSSToLengthConversionData m_cssToLengthConversionData; 197 CSSToLengthConversionData m_cssToLengthConversionData;
205 198
206 // m_parentStyle is not always just ElementResolveContext::parentStyle, 199 // m_parentStyle is not always just ElementResolveContext::parentStyle,
207 // so we keep it separate. 200 // so we keep it separate.
208 RefPtr<ComputedStyle> m_parentStyle; 201 RefPtr<ComputedStyle> m_parentStyle;
209 202
210 CSSAnimationUpdate m_animationUpdate; 203 CSSAnimationUpdate m_animationUpdate;
211 bool m_isAnimatingCustomProperties;
212 204
213 bool m_applyPropertyToRegularStyle; 205 bool m_applyPropertyToRegularStyle;
214 bool m_applyPropertyToVisitedLinkStyle; 206 bool m_applyPropertyToVisitedLinkStyle;
215 bool m_hasDirAutoAttribute; 207 bool m_hasDirAutoAttribute;
216 208
217 FontBuilder m_fontBuilder; 209 FontBuilder m_fontBuilder;
218 210
219 std::unique_ptr<CachedUAStyle> m_cachedUAStyle; 211 std::unique_ptr<CachedUAStyle> m_cachedUAStyle;
220 212
221 ElementStyleResources m_elementStyleResources; 213 ElementStyleResources m_elementStyleResources;
222 214
223 HeapHashMap<String, Member<StylePropertySet>> 215 HeapHashMap<String, Member<StylePropertySet>>
224 m_customPropertySetsForApplyAtRule; 216 m_customPropertySetsForApplyAtRule;
225 217
226 mutable HeapHashMap< 218 mutable HeapHashMap<
227 Member<const CSSPendingSubstitutionValue>, 219 Member<const CSSPendingSubstitutionValue>,
228 Member<HeapHashMap<CSSPropertyID, Member<const CSSValue>>>> 220 Member<HeapHashMap<CSSPropertyID, Member<const CSSValue>>>>
229 m_parsedPropertiesForPendingSubstitutionCache; 221 m_parsedPropertiesForPendingSubstitutionCache;
230 }; 222 };
231 223
232 } // namespace blink 224 } // namespace blink
233 225
234 #endif // StyleResolverState_h 226 #endif // StyleResolverState_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698