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

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: Renames, signature update and master merge 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,
11 * but WITHOUT ANY WARRANTY; without even the implied warranty of 11 * but WITHOUT ANY WARRANTY; without even the implied warranty of
12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
13 * Library General Public License for more details. 13 * Library General Public License for more details.
14 * 14 *
15 * You should have received a copy of the GNU Library General Public License 15 * You should have received a copy of the GNU Library General Public License
16 * along with this library; see the file COPYING.LIB. If not, write to 16 * along with this library; see the file COPYING.LIB. If not, write to
17 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 17 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
18 * Boston, MA 02110-1301, USA. 18 * Boston, MA 02110-1301, USA.
19 * 19 *
20 */ 20 */
21 21
22 #ifndef StyleResolverState_h 22 #ifndef StyleResolverState_h
23 #define StyleResolverState_h 23 #define StyleResolverState_h
24 24
25 #include "core/CSSPropertyNames.h" 25 #include "core/CSSPropertyNames.h"
26 #include "core/CoreExport.h" 26 #include "core/CoreExport.h"
27 #include "core/animation/css/CSSAnimationUpdate.h" 27 #include "core/animation/css/CSSAnimationUpdate.h"
28 #include "core/css/CSSPendingSubstitutionValue.h"
28 #include "core/css/CSSSVGDocumentValue.h" 29 #include "core/css/CSSSVGDocumentValue.h"
29 #include "core/css/CSSToLengthConversionData.h" 30 #include "core/css/CSSToLengthConversionData.h"
30 #include "core/css/resolver/CSSToStyleMap.h" 31 #include "core/css/resolver/CSSToStyleMap.h"
31 #include "core/css/resolver/ElementResolveContext.h" 32 #include "core/css/resolver/ElementResolveContext.h"
32 #include "core/css/resolver/ElementStyleResources.h" 33 #include "core/css/resolver/ElementStyleResources.h"
33 #include "core/css/resolver/FontBuilder.h" 34 #include "core/css/resolver/FontBuilder.h"
34 #include "core/dom/Document.h" 35 #include "core/dom/Document.h"
35 #include "core/dom/Element.h" 36 #include "core/dom/Element.h"
36 #include "core/style/CachedUAStyle.h" 37 #include "core/style/CachedUAStyle.h"
37 #include "core/style/ComputedStyle.h" 38 #include "core/style/ComputedStyle.h"
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after
153 if (m_style->setTextOrientation(textOrientation)) 154 if (m_style->setTextOrientation(textOrientation))
154 m_fontBuilder.didChangeTextOrientation(); 155 m_fontBuilder.didChangeTextOrientation();
155 } 156 }
156 157
157 void setHasDirAutoAttribute(bool value) { m_hasDirAutoAttribute = value; } 158 void setHasDirAutoAttribute(bool value) { m_hasDirAutoAttribute = value; }
158 bool hasDirAutoAttribute() const { return m_hasDirAutoAttribute; } 159 bool hasDirAutoAttribute() const { return m_hasDirAutoAttribute; }
159 160
160 void setCustomPropertySetForApplyAtRule(const String&, StylePropertySet*); 161 void setCustomPropertySetForApplyAtRule(const String&, StylePropertySet*);
161 StylePropertySet* customPropertySetForApplyAtRule(const String&); 162 StylePropertySet* customPropertySetForApplyAtRule(const String&);
162 163
164 HeapHashMap<CSSPropertyID, Member<const CSSValue>>& parsedPropertiesForPendi ngSubstitution(const CSSPendingSubstitutionValue&);
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<Member<const CSSPendingSubstitutionValue>, Member<HeapHashMap<CS SPropertyID, Member<const CSSValue>>>> m_parsedPropertiesForPendingSubstitution;
194
189 }; 195 };
190 196
191 } // namespace blink 197 } // namespace blink
192 198
193 #endif // StyleResolverState_h 199 #endif // StyleResolverState_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698