Source/core/css/resolver/StyleResolver.h - Issue 418163003: Simplify watched selector handling and remove remnants of user stylesheets

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

Issue 418163003: Simplify watched selector handling and remove remnants of user stylesheets (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@cascade

Patch Set: Created 6 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 side-by-side diff with in-line comments

Download patch

Index: Source/core/css/resolver/StyleResolver.h

diff --git a/Source/core/css/resolver/StyleResolver.h b/Source/core/css/resolver/StyleResolver.h

index b1ea06928879a2f6a49d99d1d4b3be5607edf317..95bbbbad53c2b6beabc33f2f257a70154dc23f19 100644

--- a/Source/core/css/resolver/StyleResolver.h

+++ b/Source/core/css/resolver/StyleResolver.h

@@ -231,8 +231,6 @@ private:

void matchAuthorRulesForShadowHost(Element*, ElementRuleCollector&, bool includeEmptyRules, WillBeHeapVector<RawPtrWillBeMember<ScopedStyleResolver>, 8>& resolvers, WillBeHeapVector<RawPtrWillBeMember<ScopedStyleResolver>, 8>& resolversInShadowTree);

void matchAllRules(StyleResolverState&, ElementRuleCollector&, bool includeSMILProperties);

void matchUARules(ElementRuleCollector&);

- // FIXME: watched selectors should be implemented using injected author stylesheets: http://crbug.com/316960

- void matchWatchSelectorRules(ElementRuleCollector&);

void collectFeatures();

void resetRuleFeatures();

@@ -240,6 +238,7 @@ private:

void applyMatchedProperties(StyleResolverState&, const MatchResult&);

bool applyAnimatedProperties(StyleResolverState&, Element* animatingElement);

+ void applyCallbackSelectors(StyleResolverState&);

void resolveScopedStyles(const Element*, WillBeHeapVector<RawPtrWillBeMember<ScopedStyleResolver>, 8>&);

void collectScopedResolversForHostedShadowTrees(const Element*, WillBeHeapVector<RawPtrWillBeMember<ScopedStyleResolver>, 8>&);

@@ -257,7 +256,7 @@ private:

template <StyleApplicationPass pass>

void applyMatchedProperties(StyleResolverState&, const MatchResult&, bool important, int startIndex, int endIndex, bool inheritedOnly);

template <StyleApplicationPass pass>

- void applyProperties(StyleResolverState&, const StylePropertySet* properties, StyleRule*, bool isImportant, bool inheritedOnly, PropertyWhitelistType = PropertyWhitelistNone);

+ void applyProperties(StyleResolverState&, const StylePropertySet* properties, bool isImportant, bool inheritedOnly, PropertyWhitelistType = PropertyWhitelistNone);

template <StyleApplicationPass pass>

void applyAnimatedProperties(StyleResolverState&, const WillBeHeapHashMap<CSSPropertyID, RefPtrWillBeMember<Interpolation> >&);

template <StyleResolver::StyleApplicationPass pass>

@@ -299,8 +298,6 @@ private:

RuleFeatureSet m_features;

OwnPtrWillBeMember<RuleSet> m_siblingRuleSet;

OwnPtrWillBeMember<RuleSet> m_uncommonAttributeRuleSet;

- // FIXME: watched selectors should be implemented using injected author stylesheets: http://crbug.com/316960

rune 2014/08/14 19:50:31 Add BUG=316960 to the description so that the comm

Timothy Loh 2014/08/15 09:40:39 Done.

OwnPtrWillBeMember<RuleSet> m_watchedSelectorsRules;

TreeBoundaryCrossingRules m_treeBoundaryCrossingRules;

« no previous file with comments | « Source/core/css/resolver/StyleBuilderCustom.cpp ('k') | Source/core/css/resolver/StyleResolver.cpp » ('j') | Source/core/dom/CSSSelectorWatch.cpp » ('J')