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

Unified Diff: Source/core/css/resolver/StyleResolver.h

Issue 892643002: Split property priority functions out of StyleResolver. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Use template class CSSPropertyPriority. Created 5 years, 11 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/css/resolver/CSSPropertyPriority.h ('k') | Source/core/css/resolver/StyleResolver.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/css/resolver/StyleResolver.h
diff --git a/Source/core/css/resolver/StyleResolver.h b/Source/core/css/resolver/StyleResolver.h
index c6cb3e0f93bdb7fad226fb467525c03dd167d24e..905c84ff3ae5b6ebf80451c8248e3e87baba379d 100644
--- a/Source/core/css/resolver/StyleResolver.h
+++ b/Source/core/css/resolver/StyleResolver.h
@@ -30,6 +30,7 @@
#include "core/css/SelectorFilter.h"
#include "core/css/SiblingTraversalStrategies.h"
#include "core/css/TreeBoundaryCrossingRules.h"
+#include "core/css/resolver/CSSPropertyPriority.h"
#include "core/css/resolver/MatchedPropertiesCache.h"
#include "core/css/resolver/StyleBuilder.h"
#include "core/css/resolver/StyleResourceLoader.h"
@@ -226,23 +227,13 @@ private:
bool applyAnimatedProperties(StyleResolverState&, const Element* animatingElement);
void applyCallbackSelectors(StyleResolverState&);
- enum StyleApplicationPass {
- HighPriorityProperties,
- LowPriorityProperties
- };
- template <StyleResolver::StyleApplicationPass pass>
- static inline CSSPropertyID firstCSSPropertyId();
- template <StyleResolver::StyleApplicationPass pass>
- static inline CSSPropertyID lastCSSPropertyId();
- template <StyleResolver::StyleApplicationPass pass>
- static inline bool isPropertyForPass(CSSPropertyID);
- template <StyleApplicationPass pass>
+ template <CSSPropertyPriority priority>
void applyMatchedProperties(StyleResolverState&, const MatchResult&, bool important, int startIndex, int endIndex, bool inheritedOnly);
- template <StyleApplicationPass pass>
+ template <CSSPropertyPriority priority>
void applyProperties(StyleResolverState&, const StylePropertySet* properties, bool isImportant, bool inheritedOnly, PropertyWhitelistType = PropertyWhitelistNone);
- template <StyleApplicationPass pass>
+ template <CSSPropertyPriority priority>
void applyAnimatedProperties(StyleResolverState&, const WillBeHeapHashMap<CSSPropertyID, RefPtrWillBeMember<Interpolation> >&);
- template <StyleResolver::StyleApplicationPass pass>
+ template <CSSPropertyPriority priority>
void applyAllProperty(StyleResolverState&, CSSValue*, bool inheritedOnly);
void matchPageRules(MatchResult&, RuleSet*, bool isLeftPage, bool isFirstPage, const String& pageName);
« no previous file with comments | « Source/core/css/resolver/CSSPropertyPriority.h ('k') | Source/core/css/resolver/StyleResolver.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698