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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: third_party/WebKit/Source/core/css/resolver/StyleResolver.cpp

Issue 2451893003: Move Document global rule data to CSSGlobalRuleSet. (Closed)
Patch Set: Rebased. Created 4 years, 2 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 | « third_party/WebKit/Source/core/css/resolver/StyleResolver.h ('k') | third_party/WebKit/Source/core/dom/Element.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/core/css/resolver/StyleResolver.cpp
diff --git a/third_party/WebKit/Source/core/css/resolver/StyleResolver.cpp b/third_party/WebKit/Source/core/css/resolver/StyleResolver.cpp
index f8b451a9ae24d3de8a09fec0994cd2134cf69783..701a69d21356084fa8e36e23d9a353dcd8aa1989 100644
--- a/third_party/WebKit/Source/core/css/resolver/StyleResolver.cpp
+++ b/third_party/WebKit/Source/core/css/resolver/StyleResolver.cpp
@@ -87,7 +87,6 @@
#include "core/html/HTMLSlotElement.h"
#include "core/inspector/InspectorInstrumentation.h"
#include "core/layout/GeneratedChildren.h"
-#include "core/layout/api/LayoutViewItem.h"
#include "core/style/StyleInheritedVariables.h"
#include "core/svg/SVGDocumentExtensions.h"
#include "core/svg/SVGElement.h"
@@ -181,7 +180,6 @@ static void collectScopedResolversForHostedShadowTrees(
StyleResolver::StyleResolver(Document& document)
: m_document(document),
- m_needCollectFeatures(false),
m_printMediaType(false),
m_styleSharingDepth(0) {
FrameView* view = document.view();
@@ -189,8 +187,6 @@ StyleResolver::StyleResolver(Document& document)
m_medium = new MediaQueryEvaluator(&view->frame());
m_printMediaType =
equalIgnoringCase(view->mediaType(), MediaTypeNames::print);
-
- initWatchedSelectorRules();
}
StyleResolver::~StyleResolver() {}
@@ -199,21 +195,6 @@ void StyleResolver::dispose() {
m_matchedPropertiesCache.clear();
}
-void StyleResolver::initWatchedSelectorRules() {
- m_watchedSelectorsRules = nullptr;
- CSSSelectorWatch* watch = CSSSelectorWatch::fromIfExists(*m_document);
- if (!watch)
- return;
- const HeapVector<Member<StyleRule>>& watchedSelectors =
- watch->watchedCallbackSelectors();
- if (!watchedSelectors.size())
- return;
- m_watchedSelectorsRules = RuleSet::create();
- for (unsigned i = 0; i < watchedSelectors.size(); ++i)
- m_watchedSelectorsRules->addStyleRule(watchedSelectors[i].get(),
- RuleHasNoSpecialState);
-}
-
void StyleResolver::lazyAppendAuthorStyleSheets(
unsigned firstNew,
const HeapVector<Member<CSSStyleSheet>>& styleSheets) {
@@ -266,7 +247,6 @@ void StyleResolver::appendPendingAuthorStyleSheets() {
appendCSSStyleSheet(*styleSheet);
m_pendingStyleSheets.clear();
- finishAppendAuthorStyleSheets();
}
void StyleResolver::appendAuthorStyleSheets(
@@ -278,68 +258,8 @@ void StyleResolver::appendAuthorStyleSheets(
appendCSSStyleSheet(*styleSheet);
}
-void StyleResolver::finishAppendAuthorStyleSheets() {
- collectFeatures();
-
- if (!document().layoutViewItem().isNull() &&
- document().layoutViewItem().style())
- document().layoutViewItem().style()->font().update(
- document().styleEngine().fontSelector());
-
- document().styleEngine().resetCSSFeatureFlags(m_features);
-}
-
-void StyleResolver::resetRuleFeatures() {
- // Need to recreate RuleFeatureSet.
- m_features.clear();
- m_siblingRuleSet.clear();
- m_uncommonAttributeRuleSet.clear();
- m_needCollectFeatures = true;
-}
-
-static RuleSet* makeRuleSet(const HeapVector<RuleFeature>& rules) {
- size_t size = rules.size();
- if (!size)
- return nullptr;
- RuleSet* ruleSet = RuleSet::create();
- for (size_t i = 0; i < size; ++i)
- ruleSet->addRule(rules[i].rule, rules[i].selectorIndex,
- rules[i].hasDocumentSecurityOrigin
- ? RuleHasDocumentSecurityOrigin
- : RuleHasNoSpecialState);
- return ruleSet;
-}
-
-void StyleResolver::collectFeatures() {
- m_features.clear();
- // Collect all ids and rules using sibling selectors (:first-child and
- // similar) in the current set of stylesheets. Style sharing code uses this
- // information to reject sharing candidates.
- CSSDefaultStyleSheets& defaultStyleSheets = CSSDefaultStyleSheets::instance();
- if (defaultStyleSheets.defaultStyle()) {
- m_features.add(defaultStyleSheets.defaultStyle()->features());
- m_hasFullscreenUAStyle = defaultStyleSheets.fullscreenStyleSheet();
- }
-
- if (document().isViewSource())
- m_features.add(defaultStyleSheets.defaultViewSourceStyle()->features());
-
- if (m_watchedSelectorsRules)
- m_features.add(m_watchedSelectorsRules->features());
-
- document().styleEngine().collectScopedStyleFeaturesTo(m_features);
-
- m_siblingRuleSet = makeRuleSet(m_features.siblingRules);
- m_uncommonAttributeRuleSet = makeRuleSet(m_features.uncommonAttributeRules);
- m_needCollectFeatures = false;
-}
-
-bool StyleResolver::hasRulesForId(const AtomicString& id) const {
- return m_features.hasSelectorForId(id);
-}
-
void StyleResolver::addToStyleSharingList(Element& element) {
- ASSERT(RuntimeEnabledFeatures::styleSharingEnabled());
+ DCHECK(RuntimeEnabledFeatures::styleSharingEnabled());
// Never add elements to the style sharing list if we're not in a recalcStyle,
// otherwise we could leave stale pointers in there.
if (!document().inStyleRecalc())
@@ -505,7 +425,7 @@ void StyleResolver::matchScopedRules(const Element& element,
it != treeBoundaryCrossingScopes.rend(); ++it) {
const TreeScope& scope = (*it)->containingTreeScope();
ScopedStyleResolver* resolver = scope.scopedStyleResolver();
- ASSERT(resolver);
+ DCHECK(resolver);
bool isInnerTreeScope =
element.containingTreeScope().isInclusiveAncestorOf(scope);
@@ -546,7 +466,7 @@ void StyleResolver::matchAuthorRules(const Element& element,
return;
}
- ASSERT(RuntimeEnabledFeatures::shadowDOMV1Enabled());
+ DCHECK(RuntimeEnabledFeatures::shadowDOMV1Enabled());
matchHostRules(element, collector);
matchScopedRules(element, collector);
}
@@ -736,9 +656,8 @@ PassRefPtr<ComputedStyle> StyleResolver::styleForElement(
StyleSharingBehavior sharingBehavior,
RuleMatchingBehavior matchingBehavior) {
DCHECK(document().frame());
- ASSERT(document().settings());
- ASSERT(!hasPendingAuthorStyleSheets());
- ASSERT(!m_needCollectFeatures);
+ DCHECK(document().settings());
+ DCHECK(!hasPendingAuthorStyleSheets());
// Once an element has a layoutObject, we don't try to destroy it, since
// otherwise the layoutObject will vanish if a style recalc happens during
@@ -766,10 +685,8 @@ PassRefPtr<ComputedStyle> StyleResolver::styleForElement(
if (RuntimeEnabledFeatures::styleSharingEnabled() &&
sharingBehavior == AllowStyleSharing &&
(defaultParent || elementContext.parentStyle())) {
- SharedStyleFinder styleFinder(elementContext, m_features,
- m_siblingRuleSet.get(),
- m_uncommonAttributeRuleSet.get(), *this);
- if (RefPtr<ComputedStyle> sharedStyle = styleFinder.findSharedStyle())
+ if (RefPtr<ComputedStyle> sharedStyle =
+ document().styleEngine().findSharedStyle(elementContext))
return sharedStyle.release();
}
@@ -819,11 +736,7 @@ PassRefPtr<ComputedStyle> StyleResolver::styleForElement(
}
if (!baseComputedStyle) {
- bool needsCollection = false;
- CSSDefaultStyleSheets::instance().ensureDefaultStyleSheetsForElement(
- *element, needsCollection);
- if (needsCollection)
- collectFeatures();
+ document().styleEngine().ensureUAStyleForElement(*element);
ElementRuleCollector collector(state.elementContext(), m_selectorFilter,
state.style());
@@ -961,7 +874,7 @@ PseudoElement* StyleResolver::createPseudoElementIfNeeded(Element& parent,
if (!pseudoStyleForElementInternal(parent, pseudoId, parentStyle, state))
return nullptr;
RefPtr<ComputedStyle> style = state.takeStyle();
- ASSERT(style);
+ DCHECK(style);
parentStyle->addCachedPseudoStyle(style);
if (!pseudoElementLayoutObjectIsNeeded(style.get()))
@@ -980,10 +893,10 @@ bool StyleResolver::pseudoStyleForElementInternal(
const PseudoStyleRequest& pseudoStyleRequest,
const ComputedStyle* parentStyle,
StyleResolverState& state) {
- ASSERT(document().frame());
- ASSERT(document().settings());
- ASSERT(pseudoStyleRequest.pseudoId != PseudoIdFirstLineInherited);
- ASSERT(state.parentStyle());
+ DCHECK(document().frame());
+ DCHECK(document().settings());
+ DCHECK(pseudoStyleRequest.pseudoId != PseudoIdFirstLineInherited);
+ DCHECK(state.parentStyle());
SelectorFilterParentScope::ensureParentStackIsPushed();
@@ -1058,7 +971,7 @@ PassRefPtr<ComputedStyle> StyleResolver::pseudoStyleForElement(
Element* element,
const PseudoStyleRequest& pseudoStyleRequest,
const ComputedStyle* parentStyle) {
- ASSERT(parentStyle);
+ DCHECK(parentStyle);
if (!element)
return nullptr;
@@ -1079,7 +992,7 @@ PassRefPtr<ComputedStyle> StyleResolver::pseudoStyleForElement(
}
PassRefPtr<ComputedStyle> StyleResolver::styleForPage(int pageIndex) {
- ASSERT(!hasPendingAuthorStyleSheets());
+ DCHECK(!hasPendingAuthorStyleSheets());
// m_rootElementStyle will be set to the document style.
StyleResolverState state(document(), document().documentElement());
@@ -1087,7 +1000,7 @@ PassRefPtr<ComputedStyle> StyleResolver::styleForPage(int pageIndex) {
const ComputedStyle* rootElementStyle = state.rootElementStyle()
? state.rootElementStyle()
: document().computedStyle();
- ASSERT(rootElementStyle);
+ DCHECK(rootElementStyle);
style->inheritFrom(*rootElementStyle);
state.setStyle(style.release());
@@ -1126,7 +1039,7 @@ PassRefPtr<ComputedStyle> StyleResolver::initialStyleForElement() {
}
PassRefPtr<ComputedStyle> StyleResolver::styleForText(Text* textNode) {
- ASSERT(textNode);
+ DCHECK(textNode);
Node* parentNode = LayoutTreeBuilderTraversal::parent(*textNode);
if (!parentNode || !parentNode->computedStyle())
@@ -1144,7 +1057,7 @@ void StyleResolver::updateFont(StyleResolverState& state) {
StyleRuleList* StyleResolver::styleRulesForElement(Element* element,
unsigned rulesToInclude) {
- ASSERT(element);
+ DCHECK(element);
StyleResolverState state(document(), element);
ElementRuleCollector collector(state.elementContext(), m_selectorFilter,
state.style());
@@ -1157,7 +1070,7 @@ StyleRuleList* StyleResolver::styleRulesForElement(Element* element,
CSSRuleList* StyleResolver::pseudoCSSRulesForElement(Element* element,
PseudoId pseudoId,
unsigned rulesToInclude) {
- ASSERT(element);
+ DCHECK(element);
StyleResolverState state(document(), element);
ElementRuleCollector collector(state.elementContext(), m_selectorFilter,
state.style());
@@ -1191,12 +1104,12 @@ void StyleResolver::collectPseudoRulesForElement(
bool StyleResolver::applyAnimatedProperties(StyleResolverState& state,
const Element* animatingElement) {
Element* element = state.element();
- ASSERT(element);
+ DCHECK(element);
// The animating element may be this element, or its pseudo element. It is
// null when calculating the style for a potential pseudo element that has
// yet to be created.
- ASSERT(animatingElement == element || !animatingElement ||
+ DCHECK(animatingElement == element || !animatingElement ||
animatingElement->parentOrShadowHostElement() == element);
if (!(animatingElement && animatingElement->hasAnimations()) &&
@@ -1214,7 +1127,7 @@ bool StyleResolver::applyAnimatedProperties(StyleResolverState& state,
return false;
if (state.style()->insideLink() != NotInsideLink) {
- ASSERT(state.applyPropertyToRegularStyle());
+ DCHECK(state.applyPropertyToRegularStyle());
state.setApplyPropertyToVisitedLinkStyle(true);
}
@@ -1238,7 +1151,7 @@ bool StyleResolver::applyAnimatedProperties(StyleResolverState& state,
// Start loading resources used by animations.
loadPendingResources(state);
- ASSERT(!state.fontBuilder().fontDirty());
+ DCHECK(!state.fontBuilder().fontDirty());
state.setApplyPropertyToVisitedLinkStyle(false);
@@ -1436,13 +1349,13 @@ static inline bool isValidFirstLetterStyleProperty(CSSPropertyID id) {
case CSSPropertyWordSpacing:
return true;
case CSSPropertyTextDecoration:
- ASSERT(!RuntimeEnabledFeatures::css3TextDecorationsEnabled());
+ DCHECK(!RuntimeEnabledFeatures::css3TextDecorationsEnabled());
return true;
case CSSPropertyTextDecorationColor:
case CSSPropertyTextDecorationLine:
case CSSPropertyTextDecorationStyle:
case CSSPropertyTextDecorationSkip:
- ASSERT(RuntimeEnabledFeatures::css3TextDecorationsEnabled());
+ DCHECK(RuntimeEnabledFeatures::css3TextDecorationsEnabled());
return true;
// text-shadow added in text decoration spec:
@@ -1491,7 +1404,7 @@ static inline bool isPropertyInWhitelist(
return isValidCueStyleProperty(property) &&
!shouldIgnoreTextTrackAuthorStyle(document);
- ASSERT_NOT_REACHED();
+ NOTREACHED();
return true;
}
@@ -1655,7 +1568,7 @@ void StyleResolver::notifyResizeForViewportUnits() {
void StyleResolver::applyMatchedProperties(StyleResolverState& state,
const MatchResult& matchResult) {
const Element* element = state.element();
- ASSERT(element);
+ DCHECK(element);
INCREMENT_STYLE_STATS_COUNTER(document().styleEngine(), matchedPropertyApply,
1);
@@ -1806,14 +1719,14 @@ void StyleResolver::applyMatchedProperties(StyleResolverState& state,
if (!cachedMatchedProperties && cacheHash &&
MatchedPropertiesCache::isCacheable(state)) {
- ASSERT(RuntimeEnabledFeatures::styleMatchedPropertiesCacheEnabled());
+ DCHECK(RuntimeEnabledFeatures::styleMatchedPropertiesCacheEnabled());
INCREMENT_STYLE_STATS_COUNTER(document().styleEngine(),
matchedPropertyCacheAdded, 1);
m_matchedPropertiesCache.add(*state.style(), *state.parentStyle(),
cacheHash, matchResult.matchedProperties());
}
- ASSERT(!state.fontBuilder().fontDirty());
+ DCHECK(!state.fontBuilder().fontDirty());
}
bool StyleResolver::hasAuthorBackground(const StyleResolverState& state) {
@@ -1839,7 +1752,9 @@ bool StyleResolver::hasAuthorBorder(const StyleResolverState& state) {
}
void StyleResolver::applyCallbackSelectors(StyleResolverState& state) {
- if (!m_watchedSelectorsRules)
+ RuleSet* watchedSelectorsRuleSet =
+ document().styleEngine().watchedSelectorsRuleSet();
+ if (!watchedSelectorsRuleSet)
return;
ElementRuleCollector collector(state.elementContext(), m_selectorFilter,
@@ -1847,7 +1762,7 @@ void StyleResolver::applyCallbackSelectors(StyleResolverState& state) {
collector.setMode(SelectorChecker::CollectingStyleRules);
collector.setIncludeEmptyRules(true);
- MatchRequest matchRequest(m_watchedSelectorsRules.get());
+ MatchRequest matchRequest(watchedSelectorsRuleSet);
collector.collectMatchingRules(matchRequest);
collector.sortAndTransferMatchedRules();
@@ -1915,10 +1830,6 @@ DEFINE_TRACE(StyleResolver) {
visitor->trace(m_viewportDependentMediaQueryResults);
visitor->trace(m_deviceDependentMediaQueryResults);
visitor->trace(m_selectorFilter);
- visitor->trace(m_features);
- visitor->trace(m_siblingRuleSet);
- visitor->trace(m_uncommonAttributeRuleSet);
- visitor->trace(m_watchedSelectorsRules);
visitor->trace(m_styleSharingLists);
visitor->trace(m_pendingStyleSheets);
visitor->trace(m_document);
« no previous file with comments | « third_party/WebKit/Source/core/css/resolver/StyleResolver.h ('k') | third_party/WebKit/Source/core/dom/Element.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698