Get rid of ensureStyleResolver().

sky/engine/core/dom/Element.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2001 Peter Kelly (pmk@post.com)
  *           (C) 2001 Dirk Mueller (mueller@kde.org)
  *           (C) 2007 David Smith (catfish.man@gmail.com)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012, 2013 Apple Inc. All rights reserved.
  *           (C) 2007 Eric Seidel (eric@webkit.org)
  *
  * This library is free software; you can redistribute it and/or
@@ skipping 633 matching lines @@
 
 void Element::attributeChanged(const QualifiedName& name, const AtomicString& newValue, AttributeModificationReason reason)
 {
     if (ElementShadow* parentElementShadow = shadowWhereNodeCanBeDistributed(*this)) {
         if (shouldInvalidateDistributionWhenAttributeChanged(parentElementShadow, name, newValue))
             parentElementShadow->setNeedsDistributionRecalc();
     }
 
     parseAttribute(name, newValue);
 
-    StyleResolver* styleResolver = document().styleResolver();
-    bool testShouldInvalidateStyle = inActiveDocument() && styleResolver && styleChangeType() < SubtreeStyleChange;
+    bool testShouldInvalidateStyle = inActiveDocument() && styleChangeType() < SubtreeStyleChange;
 
     if (isStyledElement() && name == HTMLNames::styleAttr) {
         styleAttributeChanged(newValue);
     }
 
     if (name == HTMLNames::idAttr) {
         AtomicString oldId = elementData()->idForStyleResolution();
         AtomicString newId = newValue;
         if (newId != oldId) {
             elementData()->setIdForStyleResolution(newId);
             if (testShouldInvalidateStyle && (affectedByIdSelector(oldId) || affectedByIdSelector(newId)))
                 setNeedsStyleRecalc(LocalStyleChange);
         }
     } else if (name == HTMLNames::classAttr) {
         classAttributeChanged(newValue);
     }
-
-    // If there is currently no StyleResolver, we can't be sure that this attribute change won't affect style.
-    if (!styleResolver)
-        setNeedsStyleRecalc(SubtreeStyleChange);
 }
 
 inline void Element::attributeChangedFromParserOrByCloning(const QualifiedName& name, const AtomicString& newValue, AttributeModificationReason reason)
 {
     attributeChanged(name, newValue, reason);
 }
 
 void Element::classAttributeChanged(const AtomicString& newClassString)
 {
-    StyleResolver* styleResolver = document().styleResolver();
-    bool testShouldInvalidateStyle = inActiveDocument() && styleResolver && styleChangeType() < SubtreeStyleChange;
+    bool testShouldInvalidateStyle = inActiveDocument() && styleChangeType() < SubtreeStyleChange;
 
     ASSERT(elementData());
     const SpaceSplitString oldClasses = elementData()->classNames();
     elementData()->setClass(newClassString, false);
     const SpaceSplitString& newClasses = elementData()->classNames();
     if (testShouldInvalidateStyle && classChangeNeedsStyleRecalc(oldClasses, newClasses))
         setNeedsStyleRecalc(LocalStyleChange);
     if (!newClasses.size())
         elementData()->clearClass();
 }
@@ skipping 201 matching lines @@
 
 PassRefPtr<RenderStyle> Element::styleForRenderer()
 {
     ASSERT(document().inStyleRecalc());
 
     // FIXME: Instead of clearing updates that may have been added from calls to styleForElement
     // outside recalcStyle, we should just never set them if we're not inside recalcStyle.
     if (ActiveAnimations* activeAnimations = this->activeAnimations())
         activeAnimations->cssAnimations().setPendingUpdate(nullptr);
 
-    RefPtr<RenderStyle> style = document().ensureStyleResolver().styleForElement(this);
+    RefPtr<RenderStyle> style = document().styleResolver().styleForElement(this);
     ASSERT(style);
 
     // styleForElement() might add active animations so we need to get it again.
     if (ActiveAnimations* activeAnimations = this->activeAnimations()) {
         activeAnimations->cssAnimations().maybeApplyPendingUpdate(this);
     }
 
     if (style->hasTransform()) {
         if (const StylePropertySet* inlineStyle = this->inlineStyle())
             style->setHasInlineTransform(inlineStyle->hasProperty(CSSPropertyTransform) || inlineStyle->hasProperty(CSSPropertyWebkitTransform));
@@ skipping 84 matching lines @@
     if (change > Inherit || childNeedsStyleRecalc()) {
         if (ShadowRoot* root = shadowRoot()) {
             if (root->shouldCallRecalcStyle(change))
                 root->recalcStyle(change);
         }
 
         // This loop is deliberately backwards because we use insertBefore in the rendering tree, and want to avoid
         // a potentially n^2 loop to find the insertion point while resolving style. Having us start from the last
         // child and work our way back means in the common case, we'll find the insertion point in O(1) time.
         // See crbug.com/288225
-        StyleResolver& styleResolver = document().ensureStyleResolver();
+        StyleResolver& styleResolver = document().styleResolver();
         Text* lastTextNode = 0;
         for (Node* child = lastChild(); child; child = child->previousSibling()) {
             if (child->isTextNode()) {
                 toText(child)->recalcTextStyle(change, lastTextNode);
                 lastTextNode = toText(child);
             } else if (child->isElementNode()) {
                 Element* element = toElement(child);
                 if (element->shouldCallRecalcStyle(change))
                     element->recalcStyle(change, lastTextNode);
                 else if (element->supportsStyleSharing())
@@ skipping 340 matching lines @@
         return usedStyle;
 
     if (!inActiveDocument())
         // FIXME: Try to do better than this. Ensure that styleForElement() works for elements that are not in the
         // document tree and figure out when to destroy the computed style for such elements.
         return 0;
 
     ElementRareData& rareData = ensureElementRareData();
     if (!rareData.computedStyle()) {
         RenderStyle* parentStyle = parentNode() ? parentNode()->computedStyle() : 0;
-        rareData.setComputedStyle(document().ensureStyleResolver().styleForElement(this, parentStyle));
+        rareData.setComputedStyle(document().styleResolver().styleForElement(this, parentStyle));
     }
     return rareData.computedStyle();
 }
 
 AtomicString Element::computeInheritedLanguage() const
 {
     const Node* n = this;
     AtomicString value;
     // The language property is inherited, so we iterate over the parents to find the first language.
     do {
@@ skipping 150 matching lines @@
         scope.addElementById(newId, this);
 }
 
 void Element::willModifyAttribute(const QualifiedName& name, const AtomicString& oldValue, const AtomicString& newValue)
 {
     if (name == HTMLNames::idAttr) {
         updateId(oldValue, newValue);
     }
 
     if (oldValue != newValue) {
-        if (inActiveDocument() && document().styleResolver() && styleChangeType() < SubtreeStyleChange && affectedByAttributeSelector(name.localName()))
+        if (inActiveDocument() && styleChangeType() < SubtreeStyleChange && affectedByAttributeSelector(name.localName()))
             setNeedsStyleRecalc(LocalStyleChange);
 
         if (isUpgradedCustomElement())
             CustomElement::attributeDidChange(this, name.localName(), oldValue, newValue);
     }
 
     if (OwnPtr<MutationObserverInterestGroup> recipients = MutationObserverInterestGroup::createForAttributesMutation(*this, name))
         recipients->enqueueMutationRecord(MutationRecord::createAttributes(this, name, oldValue));
 }
 
@@ skipping 249 matching lines @@
     // FIXME: Why does gaining a layer from outside the style system require disabling sharing?
     if (isHTMLCanvasElement(*this))
         return false;
     return true;
 }
 
 bool Element::affectedByAttributeSelector(const AtomicString& attributeName) const
 {
     if (attributeName.isEmpty())
         return false;
-    // TODO(esprehn): This makes sure the style system is updated, eventually
-    // we'll remove all the global lists and this won't be needed.
-    document().ensureStyleResolver();
     if (treeScope().scopedStyleResolver().features().hasSelectorForAttribute(attributeName))
         return true;
     // Host rules could also have effects.
     if (ShadowRoot* shadowRoot = this->shadowRoot())
         return shadowRoot->scopedStyleResolver().features().hasSelectorForAttribute(attributeName);
     return false;
 }
 
 bool Element::affectedByClassSelector(const AtomicString& classValue) const
 {
     if (classValue.isEmpty())
         return false;
-    // TODO(esprehn): This makes sure the style system is updated, eventually
-    // we'll remove all the global lists and this won't be needed.
-    document().ensureStyleResolver();
     if (treeScope().scopedStyleResolver().features().hasSelectorForClass(classValue))
         return true;
     // Host rules could also have effects.
     if (ShadowRoot* shadowRoot = this->shadowRoot())
         return shadowRoot->scopedStyleResolver().features().hasSelectorForClass(classValue);
     return false;
 }
 
 bool Element::affectedByIdSelector(const AtomicString& idValue) const
 {
     if (idValue.isEmpty())
         return false;
-    // TODO(esprehn): This makes sure the style system is updated, eventually
-    // we'll remove all the global lists and this won't be needed.
-    document().ensureStyleResolver();
     if (treeScope().scopedStyleResolver().features().hasSelectorForId(idValue))
         return true;
     // Host rules could also have effects.
     if (ShadowRoot* shadowRoot = this->shadowRoot())
         return shadowRoot->scopedStyleResolver().features().hasSelectorForId(idValue);
     return false;
 }
 
 } // namespace blink