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

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

Issue 1251523003: Delete AuthorStyleInfo and move its data into ComputedStyle.RareNonInheritedData. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Use html expectation instead Created 5 years, 4 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 18 matching lines...) Expand all
29 #include "core/css/RuleFeature.h" 29 #include "core/css/RuleFeature.h"
30 #include "core/css/RuleSet.h" 30 #include "core/css/RuleSet.h"
31 #include "core/css/SelectorChecker.h" 31 #include "core/css/SelectorChecker.h"
32 #include "core/css/SelectorFilter.h" 32 #include "core/css/SelectorFilter.h"
33 #include "core/css/resolver/CSSPropertyPriority.h" 33 #include "core/css/resolver/CSSPropertyPriority.h"
34 #include "core/css/resolver/MatchedPropertiesCache.h" 34 #include "core/css/resolver/MatchedPropertiesCache.h"
35 #include "core/css/resolver/StyleBuilder.h" 35 #include "core/css/resolver/StyleBuilder.h"
36 #include "core/css/resolver/StyleResolverStats.h" 36 #include "core/css/resolver/StyleResolverStats.h"
37 #include "core/css/resolver/StyleResourceLoader.h" 37 #include "core/css/resolver/StyleResourceLoader.h"
38 #include "core/dom/DocumentOrderedList.h" 38 #include "core/dom/DocumentOrderedList.h"
39 #include "core/style/AuthorStyleInfo.h"
40 #include "core/style/CachedUAStyle.h" 39 #include "core/style/CachedUAStyle.h"
41 #include "platform/heap/Handle.h" 40 #include "platform/heap/Handle.h"
42 #include "wtf/Deque.h" 41 #include "wtf/Deque.h"
43 #include "wtf/HashMap.h" 42 #include "wtf/HashMap.h"
44 #include "wtf/HashSet.h" 43 #include "wtf/HashSet.h"
45 #include "wtf/ListHashSet.h" 44 #include "wtf/ListHashSet.h"
46 #include "wtf/RefPtr.h" 45 #include "wtf/RefPtr.h"
47 #include "wtf/Vector.h" 46 #include "wtf/Vector.h"
48 47
49 namespace blink { 48 namespace blink {
(...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after
184 void addTreeBoundaryCrossingScope(ContainerNode& scope); 183 void addTreeBoundaryCrossingScope(ContainerNode& scope);
185 184
186 private: 185 private:
187 PassRefPtr<ComputedStyle> initialStyleForElement(); 186 PassRefPtr<ComputedStyle> initialStyleForElement();
188 187
189 void initWatchedSelectorRules(); 188 void initWatchedSelectorRules();
190 189
191 // FIXME: This should probably go away, folded into FontBuilder. 190 // FIXME: This should probably go away, folded into FontBuilder.
192 void updateFont(StyleResolverState&); 191 void updateFont(StyleResolverState&);
193 192
194 static AuthorStyleInfo authorStyleInfo(StyleResolverState&);
195
196 void loadPendingResources(StyleResolverState&); 193 void loadPendingResources(StyleResolverState&);
197 void adjustComputedStyle(StyleResolverState&, Element*); 194 void adjustComputedStyle(StyleResolverState&, Element*);
198 195
199 void appendCSSStyleSheet(CSSStyleSheet&); 196 void appendCSSStyleSheet(CSSStyleSheet&);
200 197
201 void collectPseudoRulesForElement(Element*, ElementRuleCollector&, PseudoId, unsigned rulesToInclude); 198 void collectPseudoRulesForElement(Element*, ElementRuleCollector&, PseudoId, unsigned rulesToInclude);
202 void matchRuleSet(ElementRuleCollector&, RuleSet*); 199 void matchRuleSet(ElementRuleCollector&, RuleSet*);
203 void matchUARules(ElementRuleCollector&); 200 void matchUARules(ElementRuleCollector&);
204 void matchAuthorRules(const Element&, ElementRuleCollector&, bool includeEmp tyRules); 201 void matchAuthorRules(const Element&, ElementRuleCollector&, bool includeEmp tyRules);
205 void matchHostRules(const Element&, ElementRuleCollector&, bool includeEmpty Rules); 202 void matchHostRules(const Element&, ElementRuleCollector&, bool includeEmpty Rules);
(...skipping 10 matching lines...) Expand all
216 template <CSSPropertyPriority priority> 213 template <CSSPropertyPriority priority>
217 void applyMatchedProperties(StyleResolverState&, const MatchedPropertiesRang e&, bool important, bool inheritedOnly); 214 void applyMatchedProperties(StyleResolverState&, const MatchedPropertiesRang e&, bool important, bool inheritedOnly);
218 template <CSSPropertyPriority priority> 215 template <CSSPropertyPriority priority>
219 void applyProperties(StyleResolverState&, const StylePropertySet* properties , bool isImportant, bool inheritedOnly, PropertyWhitelistType = PropertyWhitelis tNone); 216 void applyProperties(StyleResolverState&, const StylePropertySet* properties , bool isImportant, bool inheritedOnly, PropertyWhitelistType = PropertyWhitelis tNone);
220 template <CSSPropertyPriority priority> 217 template <CSSPropertyPriority priority>
221 void applyAnimatedProperties(StyleResolverState&, const WillBeHeapHashMap<Pr opertyHandle, RefPtrWillBeMember<Interpolation>>&); 218 void applyAnimatedProperties(StyleResolverState&, const WillBeHeapHashMap<Pr opertyHandle, RefPtrWillBeMember<Interpolation>>&);
222 template <CSSPropertyPriority priority> 219 template <CSSPropertyPriority priority>
223 void applyAllProperty(StyleResolverState&, CSSValue*, bool inheritedOnly); 220 void applyAllProperty(StyleResolverState&, CSSValue*, bool inheritedOnly);
224 221
225 bool pseudoStyleForElementInternal(Element&, const PseudoStyleRequest&, cons t ComputedStyle* parentStyle, StyleResolverState&); 222 bool pseudoStyleForElementInternal(Element&, const PseudoStyleRequest&, cons t ComputedStyle* parentStyle, StyleResolverState&);
223 bool hasAuthorBackground(const StyleResolverState&);
224 bool hasAuthorBorder(const StyleResolverState&);
226 225
227 PassRefPtrWillBeRawPtr<PseudoElement> createPseudoElement(Element* parent, P seudoId); 226 PassRefPtrWillBeRawPtr<PseudoElement> createPseudoElement(Element* parent, P seudoId);
228 227
229 Document& document() { return *m_document; } 228 Document& document() { return *m_document; }
230 229
231 static ComputedStyle* s_styleNotYetAvailable; 230 static ComputedStyle* s_styleNotYetAvailable;
232 231
233 MatchedPropertiesCache m_matchedPropertiesCache; 232 MatchedPropertiesCache m_matchedPropertiesCache;
234 233
235 OwnPtr<MediaQueryEvaluator> m_medium; 234 OwnPtr<MediaQueryEvaluator> m_medium;
(...skipping 24 matching lines...) Expand all
260 259
261 OwnPtr<StyleResolverStats> m_styleResolverStats; 260 OwnPtr<StyleResolverStats> m_styleResolverStats;
262 261
263 // Use only for Internals::updateStyleAndReturnAffectedElementCount. 262 // Use only for Internals::updateStyleAndReturnAffectedElementCount.
264 unsigned m_accessCount; 263 unsigned m_accessCount;
265 }; 264 };
266 265
267 } // namespace blink 266 } // namespace blink
268 267
269 #endif // StyleResolver_h 268 #endif // StyleResolver_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698