Add a first pass of a class descendant invalidator, and a containing RuleSetAnalyzer

Source/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 1027 matching lines @@
 
     if (!length)
         return false;
 
     if (newClassString.is8Bit())
         return classStringHasClassName(newClassString.characters8(), length);
     return classStringHasClassName(newClassString.characters16(), length);
 }
 
 template<typename Checker>
-static bool checkSelectorForClassChange(const SpaceSplitString& changedClasses, const Checker& checker)
+static bool checkSelectorForClassChange(const SpaceSplitString& changedClasses, const Checker& checker, Element* element)
 {
     unsigned changedSize = changedClasses.size();
     for (unsigned i = 0; i < changedSize; ++i) {
-        if (checker.hasSelectorForClass(changedClasses[i]))
+        const RuleSetAnalyzer* ruleSetAnalyzer = checker.getRuleSetAnalyzer();
+        if (ruleSetAnalyzer)
+            ruleSetAnalyzer->invalidateElementSubtreeForClassChange(changedClasses[i], element);

[esprehn, 2014/01/14 21:32:56]

I had envisioned doing this in a single pass, not walking the subtree
repeatedly. This is doing to doing awful things to Modernizer apps:

ex.

body.className = "foo bar baz biz bam" will walk the entire document 5 times.

We can land this as-is, but we should do it behind a flag then and iterate on
combining the passes.

[esprehn, 2014/01/14 21:32:56]

You ignore the return value of invalidateElementSubtreeForClassChange which is
not right, you want to combine the getRuleSetAnalyzer() and the
invalidateElementSubtreeForClassChange steps into a method on checker.

if (checker.invalidateForClass(changedClasses[i], element))
  continue;
if (checker.hasSelectorForClass(changedClasses[i]))
  return true;

[chrishtr, 2014/01/14 23:33:00]

Done.

[chrishtr, 2014/01/14 23:33:00]

Done.

+        else if (checker.hasSelectorForClass(changedClasses[i]))
             return true;
     }
     return false;
 }
 
 template<typename Checker>
-static bool checkSelectorForClassChange(const SpaceSplitString& oldClasses, const SpaceSplitString& newClasses, const Checker& checker)
+static bool checkSelectorForClassChange(const SpaceSplitString& oldClasses, const SpaceSplitString& newClasses, const Checker& checker, Element* element)
 {
     if (!oldClasses.size())
-        return checkSelectorForClassChange(newClasses, checker);
+        return checkSelectorForClassChange(newClasses, checker, element);
 
     // Class vectors tend to be very short. This is faster than using a hash table.
     BitVector remainingClassBits;
     remainingClassBits.ensureSize(oldClasses.size());
 
     for (unsigned i = 0; i < newClasses.size(); ++i) {
         bool found = false;
         for (unsigned j = 0; j < oldClasses.size(); ++j) {
             if (newClasses[i] == oldClasses[j]) {
                 // Mark each class that is still in the newClasses so we can skip doing
                 // an n^2 search below when looking for removals. We can't break from
                 // this loop early since a class can appear more than once.
                 remainingClassBits.quickSet(j);
                 found = true;
             }
         }
         // Class was added.
-        if (!found && checker.hasSelectorForClass(newClasses[i]))
-            return true;
+
+        if (!found) {
+            const RuleSetAnalyzer* ruleSetAnalyzer = checker.getRuleSetAnalyzer();
+            if (ruleSetAnalyzer)

[esprehn, 2014/01/14 21:32:56]

Combing if and get, if (const RuleSet.... = checker.rulesetAnalyzer(...)).

invalidateElementSubtreeForClassChange also returns a bool, but you ignore it
here which isn't right.

[chrishtr, 2014/01/14 23:33:00]

Done.

+                ruleSetAnalyzer->invalidateElementSubtreeForClassChange(newClasses[i], element);
+            else if (checker.hasSelectorForClass(newClasses[i]))
+                return true;
+        }
     }
 
     for (unsigned i = 0; i < oldClasses.size(); ++i) {
         if (remainingClassBits.quickGet(i))
             continue;
+
         // Class was removed.
-        if (checker.hasSelectorForClass(oldClasses[i]))
+        const RuleSetAnalyzer* ruleSetAnalyzer = checker.getRuleSetAnalyzer();
+        if (ruleSetAnalyzer)
+            ruleSetAnalyzer->invalidateElementSubtreeForClassChange(oldClasses[i], element);
+        else if (checker.hasSelectorForClass(oldClasses[i]))
             return true;
     }
 
     return false;
 }
 
 void Element::classAttributeChanged(const AtomicString& newClassString)
 {
     StyleResolver* styleResolver = document().styleResolver();
     bool testShouldInvalidateStyle = inActiveDocument() && styleResolver && styleChangeType() < SubtreeStyleChange;
     bool shouldInvalidateStyle = false;
 
     if (classStringHasClassName(newClassString)) {
         const bool shouldFoldCase = document().inQuirksMode();
         const SpaceSplitString oldClasses = ensureUniqueElementData()->classNames();
         elementData()->setClass(newClassString, shouldFoldCase);
         const SpaceSplitString& newClasses = elementData()->classNames();
-        shouldInvalidateStyle = testShouldInvalidateStyle && checkSelectorForClassChange(oldClasses, newClasses, styleResolver->ensureRuleFeatureSet());
+        shouldInvalidateStyle = testShouldInvalidateStyle && checkSelectorForClassChange(oldClasses, newClasses, styleResolver->ensureRuleFeatureSet(), this);
     } else if (elementData()) {
         const SpaceSplitString& oldClasses = elementData()->classNames();
-        shouldInvalidateStyle = testShouldInvalidateStyle && checkSelectorForClassChange(oldClasses, styleResolver->ensureRuleFeatureSet());
+        shouldInvalidateStyle = testShouldInvalidateStyle && checkSelectorForClassChange(oldClasses, styleResolver->ensureRuleFeatureSet(), this);
         elementData()->clearClass();
     }
 
     if (hasRareData())
         elementRareData()->clearClassListValueForQuirksMode();
 
     if (shouldInvalidateStyle)
         setNeedsStyleRecalc();
 }
 
@@ skipping 12 matching lines @@
                 return true;
         }
     }
 
     if (name == HTMLNames::classAttr) {
         const AtomicString& newClassString = newValue;
         if (classStringHasClassName(newClassString)) {
             const bool shouldFoldCase = document().inQuirksMode();
             const SpaceSplitString& oldClasses = elementData()->classNames();
             const SpaceSplitString newClasses(newClassString, shouldFoldCase);
-            if (checkSelectorForClassChange(oldClasses, newClasses, featureSet))
+            if (checkSelectorForClassChange(oldClasses, newClasses, featureSet, this))
                 return true;
         } else {
             const SpaceSplitString& oldClasses = elementData()->classNames();
-            if (checkSelectorForClassChange(oldClasses, featureSet))
+            if (checkSelectorForClassChange(oldClasses, featureSet, this))

[esprehn, 2014/01/14 21:32:56]

These should be methods now, don't pass |this|, just turn
checkSelectorForClassChange into a method.

[chrishtr, 2014/01/14 23:33:00]

Done.

                 return true;
         }
     }
 
     return featureSet.hasSelectorForAttribute(name.localName());
 }
 
 // Returns true is the given attribute is an event handler.
 // We consider an event handler any attribute that begins with "on".
 // It is a simple solution that has the advantage of not requiring any
@@ skipping 2480 matching lines @@
     // Before doing so, we need to resolve issues in HTMLSelectElement::recalcListItems
     // and RenderMenuList::setText. See also https://bugs.webkit.org/show_bug.cgi?id=88405
     if (hasTagName(optionTag) || hasTagName(optgroupTag))
         return false;
     if (FullscreenElementStack::isActiveFullScreenElement(this))
         return false;
     return true;
 }
 
 } // namespace WebCore