Index: Source/core/css/resolver/StyleResolver.h |
diff --git a/Source/core/css/resolver/StyleResolver.h b/Source/core/css/resolver/StyleResolver.h |
index 320b4f6346eda64031891b262bf97dab31e6f1ce..df76601cd1367aaf4ea9c3c327da56edd961614c 100644 |
--- a/Source/core/css/resolver/StyleResolver.h |
+++ b/Source/core/css/resolver/StyleResolver.h |
@@ -197,6 +197,10 @@ public: |
void addToStyleSharingList(Element&); |
void clearStyleSharingList(); |
+ // FIXME: These should be either generated or moved to CascadedValues |
+ static bool isValidFirstLetterStyleProperty(CSSPropertyID); |
+ static bool isValidCueStyleProperty(CSSPropertyID); |
+ |
StyleResolverStats* stats() { return m_styleResolverStats.get(); } |
StyleResolverStats* statsTotals() { return m_styleResolverStatsTotals.get(); } |
enum StatsReportType { ReportDefaultStats, ReportSlowStats }; |
@@ -248,20 +252,15 @@ private: |
HighPriorityProperties, |
LowPriorityProperties |
}; |
- template <StyleResolver::StyleApplicationPass pass> |
+ template <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> |
- void applyMatchedProperties(StyleResolverState&, const MatchResult&, bool important, int startIndex, int endIndex, bool inheritedOnly); |
+ static inline CSSPropertyID lastCSSPropertyId(); |
template <StyleApplicationPass pass> |
- void applyProperties(StyleResolverState&, const StylePropertySet* properties, StyleRule*, bool isImportant, bool inheritedOnly, PropertyWhitelistType = PropertyWhitelistNone); |
+ static inline bool isPropertyForPass(CSSPropertyID); |
+ |
template <StyleApplicationPass pass> |
void applyAnimatedProperties(StyleResolverState&, const WillBeHeapHashMap<CSSPropertyID, RefPtrWillBeMember<Interpolation> >&); |
- template <StyleResolver::StyleApplicationPass pass> |
- void applyAllProperty(StyleResolverState&, CSSValue*); |
void matchPageRules(MatchResult&, RuleSet*, bool isLeftPage, bool isFirstPage, const String& pageName); |
void matchPageRulesForList(WillBeHeapVector<RawPtrWillBeMember<StyleRulePage> >& matchedRules, const WillBeHeapVector<RawPtrWillBeMember<StyleRulePage> >&, bool isLeftPage, bool isFirstPage, const String& pageName); |