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

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

Issue 2089593002: Add expansion of shorthands with custom properties to longhands using a pending substition value. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix dates and remove unnecessary comments Created 4 years, 6 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
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 142 matching lines...) Expand 10 before | Expand all | Expand 10 after
153 if (m_style->setTextOrientation(textOrientation)) 153 if (m_style->setTextOrientation(textOrientation))
154 m_fontBuilder.didChangeTextOrientation(); 154 m_fontBuilder.didChangeTextOrientation();
155 } 155 }
156 156
157 void setHasDirAutoAttribute(bool value) { m_hasDirAutoAttribute = value; } 157 void setHasDirAutoAttribute(bool value) { m_hasDirAutoAttribute = value; }
158 bool hasDirAutoAttribute() const { return m_hasDirAutoAttribute; } 158 bool hasDirAutoAttribute() const { return m_hasDirAutoAttribute; }
159 159
160 void setCustomPropertySetForApplyAtRule(const String&, StylePropertySet*); 160 void setCustomPropertySetForApplyAtRule(const String&, StylePropertySet*);
161 StylePropertySet* customPropertySetForApplyAtRule(const String&); 161 StylePropertySet* customPropertySetForApplyAtRule(const String&);
162 162
163 void setCssValueForLonghandPropertyId(CSSPropertyID, const CSSValue*);
Timothy Loh 2016/06/22 00:06:12 Css -> CSS
Andy Mutton 2016/06/24 04:53:26 Blurgh! Done.
164 const CSSValue* cssValueForLonghandPropertyId(CSSPropertyID);
165
163 private: 166 private:
164 ElementResolveContext m_elementContext; 167 ElementResolveContext m_elementContext;
165 Member<Document> m_document; 168 Member<Document> m_document;
166 169
167 // m_style is the primary output for each element's style resolve. 170 // m_style is the primary output for each element's style resolve.
168 RefPtr<ComputedStyle> m_style; 171 RefPtr<ComputedStyle> m_style;
169 172
170 CSSToLengthConversionData m_cssToLengthConversionData; 173 CSSToLengthConversionData m_cssToLengthConversionData;
171 174
172 // m_parentStyle is not always just ElementResolveContext::parentStyle, 175 // m_parentStyle is not always just ElementResolveContext::parentStyle,
173 // so we keep it separate. 176 // so we keep it separate.
174 RefPtr<ComputedStyle> m_parentStyle; 177 RefPtr<ComputedStyle> m_parentStyle;
175 178
176 CSSAnimationUpdate m_animationUpdate; 179 CSSAnimationUpdate m_animationUpdate;
177 180
178 bool m_applyPropertyToRegularStyle; 181 bool m_applyPropertyToRegularStyle;
179 bool m_applyPropertyToVisitedLinkStyle; 182 bool m_applyPropertyToVisitedLinkStyle;
180 bool m_hasDirAutoAttribute; 183 bool m_hasDirAutoAttribute;
181 184
182 FontBuilder m_fontBuilder; 185 FontBuilder m_fontBuilder;
183 186
184 std::unique_ptr<CachedUAStyle> m_cachedUAStyle; 187 std::unique_ptr<CachedUAStyle> m_cachedUAStyle;
185 188
186 ElementStyleResources m_elementStyleResources; 189 ElementStyleResources m_elementStyleResources;
187 190
188 HeapHashMap<String, Member<StylePropertySet>> m_customPropertySetsForApplyAt Rule; 191 HeapHashMap<String, Member<StylePropertySet>> m_customPropertySetsForApplyAt Rule;
192
193 HeapHashMap<CSSPropertyID, Member<const CSSValue>> m_parsedLonghandCssValueF orVariableResolver;
Timothy Loh 2016/06/22 00:06:12 I think this is insufficient for cases like: $0.s
Andy Mutton 2016/06/24 04:53:26 Done. Weird, more complicated caching structure ad
189 }; 194 };
190 195
191 } // namespace blink 196 } // namespace blink
192 197
193 #endif // StyleResolverState_h 198 #endif // StyleResolverState_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698