Source/core/css/resolver/StyleResolver.h - Issue 1224673002: Implement proposed shadow tree cascade order.

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

Issue 1224673002: Implement proposed shadow tree cascade order. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

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

Download patch

« Source/core/css/resolver/MatchResult.cpp ('K') | « Source/core/css/resolver/ScopedStyleResolver.cpp ('k') | Source/core/css/resolver/StyleResolver.cpp » ('j') | Source/core/css/resolver/StyleResolver.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | 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 b65a58b6f95b2bab8831842c89f306f227d3390c..3235c36ef8bc85d4de1280f7aa7af744e4f1c378 100644

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

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

@@ -30,12 +30,12 @@

#include "core/css/RuleSet.h"

#include "core/css/SelectorChecker.h"

#include "core/css/SelectorFilter.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/StyleResolverStats.h"

#include "core/css/resolver/StyleResourceLoader.h"

+#include "core/dom/DocumentOrderedList.h"

#include "core/style/AuthorStyleInfo.h"

#include "core/style/CachedUAStyle.h"

#include "platform/heap/Handle.h"

@@ -201,7 +201,10 @@ private:

void collectPseudoRulesForElement(Element*, ElementRuleCollector&, PseudoId, unsigned rulesToInclude);

void matchRuleSet(ElementRuleCollector&, RuleSet*);

void matchUARules(ElementRuleCollector&);

- void matchAuthorRules(Element*, ElementRuleCollector&, bool includeEmptyRules);

+ void matchAuthorRules(const Element&, ElementRuleCollector&, bool includeEmptyRules);

+ void matchHostRules(const Element&, ElementRuleCollector&, bool includeEmptyRules);

+ ScopedStyleResolver* matchElementScopeRules(const Element&, ElementRuleCollector&, bool includeEmptyRules);

+ void matchScopedRules(const Element&, ElementRuleCollector&, bool includeEmptyRules);

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

void collectFeatures();

void resetRuleFeatures();

@@ -211,7 +214,7 @@ private:

void applyCallbackSelectors(StyleResolverState&);

template <CSSPropertyPriority priority>

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

+ void applyMatchedProperties(StyleResolverState&, const MatchedPropertiesRange&, bool important, bool inheritedOnly);

template <CSSPropertyPriority priority>

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

template <CSSPropertyPriority priority>

@@ -245,7 +248,7 @@ private:

OwnPtrWillBeMember<RuleSet> m_siblingRuleSet;

OwnPtrWillBeMember<RuleSet> m_uncommonAttributeRuleSet;

OwnPtrWillBeMember<RuleSet> m_watchedSelectorsRules;

- TreeBoundaryCrossingRules m_treeBoundaryCrossingRules;

+ DocumentOrderedList m_treeBoundaryCrossingScopes;

bool m_needCollectFeatures;

bool m_printMediaType;