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

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 serialization and temporary property value caching. Add some additional tests. Created 4 years, 5 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 HeapHashMap<CSSPropertyID, Member<const CSSValue>>& parsedPropertiesForPendi ngSubstitution(const CSSValue&);
164
163 private: 165 private:
164 ElementResolveContext m_elementContext; 166 ElementResolveContext m_elementContext;
165 Member<Document> m_document; 167 Member<Document> m_document;
166 168
167 // m_style is the primary output for each element's style resolve. 169 // m_style is the primary output for each element's style resolve.
168 RefPtr<ComputedStyle> m_style; 170 RefPtr<ComputedStyle> m_style;
169 171
170 CSSToLengthConversionData m_cssToLengthConversionData; 172 CSSToLengthConversionData m_cssToLengthConversionData;
171 173
172 // m_parentStyle is not always just ElementResolveContext::parentStyle, 174 // m_parentStyle is not always just ElementResolveContext::parentStyle,
173 // so we keep it separate. 175 // so we keep it separate.
174 RefPtr<ComputedStyle> m_parentStyle; 176 RefPtr<ComputedStyle> m_parentStyle;
175 177
176 CSSAnimationUpdate m_animationUpdate; 178 CSSAnimationUpdate m_animationUpdate;
177 179
178 bool m_applyPropertyToRegularStyle; 180 bool m_applyPropertyToRegularStyle;
179 bool m_applyPropertyToVisitedLinkStyle; 181 bool m_applyPropertyToVisitedLinkStyle;
180 bool m_hasDirAutoAttribute; 182 bool m_hasDirAutoAttribute;
181 183
182 FontBuilder m_fontBuilder; 184 FontBuilder m_fontBuilder;
183 185
184 std::unique_ptr<CachedUAStyle> m_cachedUAStyle; 186 std::unique_ptr<CachedUAStyle> m_cachedUAStyle;
185 187
186 ElementStyleResources m_elementStyleResources; 188 ElementStyleResources m_elementStyleResources;
187 189
188 HeapHashMap<String, Member<StylePropertySet>> m_customPropertySetsForApplyAt Rule; 190 HeapHashMap<String, Member<StylePropertySet>> m_customPropertySetsForApplyAt Rule;
191
192 HeapHashMap<Member<const CSSValue>, Member<HeapHashMap<CSSPropertyID, Member <const CSSValue>>>> m_parsedPropertiesForPendingSubstitution;
Timothy Loh 2016/06/27 04:19:10 nicer to key on CSSPendingSubstitutionValue
Andy Mutton 2016/06/28 03:18:51 Yeah... I debated this a little, since really this
193
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