Commit 2650087b authored by rune's avatar rune Committed by Commit bot

Remove ensureResolver before invalidation set scheduling.

ensureResolver() used to make sure the invalidation sets were up-to-
date with the currently active stylesheets. This is no longer necessary
as ruleset invalidation of changes in active stylesheets will make sure
changes are applied correctly.

R=meade@chromium.org
BUG=567021

Review-Url: https://codereview.chromium.org/2555083002
Cr-Commit-Position: refs/heads/master@{#439096}
parent 0ccc1271
...@@ -189,9 +189,7 @@ void StyleEngine::removePendingSheet(Node& styleSheetCandidateNode, ...@@ -189,9 +189,7 @@ void StyleEngine::removePendingSheet(Node& styleSheetCandidateNode,
} }
void StyleEngine::setNeedsActiveStyleUpdate(TreeScope& treeScope) { void StyleEngine::setNeedsActiveStyleUpdate(TreeScope& treeScope) {
if (!document().isActive() && isMaster()) if (document().isActive() || !isMaster())
return;
markTreeScopeDirty(treeScope); markTreeScopeDirty(treeScope);
} }
...@@ -630,9 +628,6 @@ void StyleEngine::classChangedForElement(const SpaceSplitString& changedClasses, ...@@ -630,9 +628,6 @@ void StyleEngine::classChangedForElement(const SpaceSplitString& changedClasses,
return; return;
InvalidationLists invalidationLists; InvalidationLists invalidationLists;
unsigned changedSize = changedClasses.size(); unsigned changedSize = changedClasses.size();
// TODO(rune@opera.com): ensureResolver() can be removed once stylesheet
// updates are async. https://crbug.com/567021
ensureResolver();
const RuleFeatureSet& features = ruleFeatureSet(); const RuleFeatureSet& features = ruleFeatureSet();
for (unsigned i = 0; i < changedSize; ++i) { for (unsigned i = 0; i < changedSize; ++i) {
features.collectInvalidationSetsForClass(invalidationLists, element, features.collectInvalidationSetsForClass(invalidationLists, element,
...@@ -659,9 +654,6 @@ void StyleEngine::classChangedForElement(const SpaceSplitString& oldClasses, ...@@ -659,9 +654,6 @@ void StyleEngine::classChangedForElement(const SpaceSplitString& oldClasses,
remainingClassBits.ensureSize(oldClasses.size()); remainingClassBits.ensureSize(oldClasses.size());
InvalidationLists invalidationLists; InvalidationLists invalidationLists;
// TODO(rune@opera.com): ensureResolver() can be removed once stylesheet
// updates are async. https://crbug.com/567021
ensureResolver();
const RuleFeatureSet& features = ruleFeatureSet(); const RuleFeatureSet& features = ruleFeatureSet();
for (unsigned i = 0; i < newClasses.size(); ++i) { for (unsigned i = 0; i < newClasses.size(); ++i) {
...@@ -700,9 +692,6 @@ void StyleEngine::attributeChangedForElement(const QualifiedName& attributeName, ...@@ -700,9 +692,6 @@ void StyleEngine::attributeChangedForElement(const QualifiedName& attributeName,
return; return;
InvalidationLists invalidationLists; InvalidationLists invalidationLists;
// TODO(rune@opera.com): ensureResolver() can be removed once stylesheet
// updates are async. https://crbug.com/567021
ensureResolver();
ruleFeatureSet().collectInvalidationSetsForAttribute(invalidationLists, ruleFeatureSet().collectInvalidationSetsForAttribute(invalidationLists,
element, attributeName); element, attributeName);
m_styleInvalidator.scheduleInvalidationSetsForNode(invalidationLists, m_styleInvalidator.scheduleInvalidationSetsForNode(invalidationLists,
...@@ -716,9 +705,6 @@ void StyleEngine::idChangedForElement(const AtomicString& oldId, ...@@ -716,9 +705,6 @@ void StyleEngine::idChangedForElement(const AtomicString& oldId,
return; return;
InvalidationLists invalidationLists; InvalidationLists invalidationLists;
// TODO(rune@opera.com): ensureResolver() can be removed once stylesheet
// updates are async. https://crbug.com/567021
ensureResolver();
const RuleFeatureSet& features = ruleFeatureSet(); const RuleFeatureSet& features = ruleFeatureSet();
if (!oldId.isEmpty()) if (!oldId.isEmpty())
features.collectInvalidationSetsForId(invalidationLists, element, oldId); features.collectInvalidationSetsForId(invalidationLists, element, oldId);
...@@ -735,9 +721,6 @@ void StyleEngine::pseudoStateChangedForElement( ...@@ -735,9 +721,6 @@ void StyleEngine::pseudoStateChangedForElement(
return; return;
InvalidationLists invalidationLists; InvalidationLists invalidationLists;
// TODO(rune@opera.com): ensureResolver() can be removed once stylesheet
// updates are async. https://crbug.com/567021
ensureResolver();
ruleFeatureSet().collectInvalidationSetsForPseudoClass(invalidationLists, ruleFeatureSet().collectInvalidationSetsForPseudoClass(invalidationLists,
element, pseudoType); element, pseudoType);
m_styleInvalidator.scheduleInvalidationSetsForNode(invalidationLists, m_styleInvalidator.scheduleInvalidationSetsForNode(invalidationLists,
...@@ -752,9 +735,6 @@ void StyleEngine::scheduleSiblingInvalidationsForElement( ...@@ -752,9 +735,6 @@ void StyleEngine::scheduleSiblingInvalidationsForElement(
InvalidationLists invalidationLists; InvalidationLists invalidationLists;
// TODO(rune@opera.com): ensureResolver() can be removed once stylesheet
// updates are async. https://crbug.com/567021
ensureResolver();
const RuleFeatureSet& features = ruleFeatureSet(); const RuleFeatureSet& features = ruleFeatureSet();
if (element.hasID()) { if (element.hasID()) {
...@@ -824,9 +804,6 @@ void StyleEngine::scheduleInvalidationsForRemovedSibling( ...@@ -824,9 +804,6 @@ void StyleEngine::scheduleInvalidationsForRemovedSibling(
void StyleEngine::scheduleNthPseudoInvalidations(ContainerNode& nthParent) { void StyleEngine::scheduleNthPseudoInvalidations(ContainerNode& nthParent) {
InvalidationLists invalidationLists; InvalidationLists invalidationLists;
// TODO(rune@opera.com): ensureResolver() can be removed once stylesheet
// updates are async. https://crbug.com/567021
ensureResolver();
ruleFeatureSet().collectNthInvalidationSet(invalidationLists); ruleFeatureSet().collectNthInvalidationSet(invalidationLists);
m_styleInvalidator.scheduleInvalidationSetsForNode(invalidationLists, m_styleInvalidator.scheduleInvalidationSetsForNode(invalidationLists,
nthParent); nthParent);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment