Changeset 162843 in webkit

Timestamp:

Jan 27, 2014, 9:12:46 AM (11 years ago)

Author:

Antti Koivisto

Message:

REGRESSION(r133214): Don't invalidate style when adding classes that don't match rules
​https://bugs.webkit.org/show_bug.cgi?id=126177

Reviewed by Anders Carlsson.

Spotted by Elliott Sprehn in Chromium.

• dom/Element.cpp:

(WebCore::checkSelectorForClassChange):

Remove unnecessary templating.

(WebCore::Element::classAttributeChanged):

Fix logic error with 'continue'.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/Element.cpp (modified) (4 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-01-27  Antti Koivisto  <antti@apple.com>
+
+        REGRESSION(r133214): Don't invalidate style when adding classes that don't match rules
+        https://bugs.webkit.org/show_bug.cgi?id=126177
+
+        Reviewed by Anders Carlsson.
+        
+        Spotted by Elliott Sprehn in Chromium.
+
+        * dom/Element.cpp:
+        (WebCore::checkSelectorForClassChange):
+        
+            Remove unnecessary templating.
+
+        (WebCore::Element::classAttributeChanged):
+        
+            Fix logic error with 'continue'.
+
 2014-01-27  Brendan Long  <b.long@cablelabs.com>
 

trunk/Source/WebCore/dom/Element.cpp

@@ -1154 +1154 @@
 }
 
-template<typename Checker>
-static bool checkSelectorForClassChange(const SpaceSplitString& changedClasses, const Checker& checker)
+static bool checkSelectorForClassChange(const SpaceSplitString& changedClasses, const StyleResolver& styleResolver)
 {
     unsigned changedSize = changedClasses.size();
     for (unsigned i = 0; i < changedSize; ++i) {
-        if (checker.hasSelectorForClass(changedClasses[i]))
+        if (styleResolver.hasSelectorForClass(changedClasses[i]))
             return true;
     }
@@ -1165 +1164 @@
 }
 
-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 StyleResolver& styleResolver)
 {
     unsigned oldSize = oldClasses.size();
     if (!oldSize)
-        return checkSelectorForClassChange(newClasses, checker);
+        return checkSelectorForClassChange(newClasses, styleResolver);
     BitVector remainingClassBits;
     remainingClassBits.ensureSize(oldSize);
@@ -1176 +1174 @@
     unsigned newSize = newClasses.size();
     for (unsigned i = 0; i < newSize; ++i) {
+        bool foundFromBoth = false;
         for (unsigned j = 0; j < oldSize; ++j) {
             if (newClasses[i] == oldClasses[j]) {
                 remainingClassBits.quickSet(j);
-                continue;
+                foundFromBoth = true;
             }
         }
-        if (checker.hasSelectorForClass(newClasses[i]))
+        if (foundFromBoth)
+            continue;
+        if (styleResolver.hasSelectorForClass(newClasses[i]))
             return true;
     }
@@ -1189 +1190 @@
         if (remainingClassBits.quickGet(i))
             continue;
-        if (checker.hasSelectorForClass(oldClasses[i]))
+        if (styleResolver.hasSelectorForClass(oldClasses[i]))
             return true;
     }