Changeset 198553 in webkit

Timestamp:

Mar 22, 2016 2:31:16 PM (8 years ago)

Author:

Antti Koivisto

Message:

Non-const DocumentRuleSets::features() does not check default style version
​https://bugs.webkit.org/show_bug.cgi?id=155766

Reviewed by Andreas Kling.

This may leave it out of date when the default stylesheet expands.

No test, don't know how to hit this with current codebase. With some further optimizations
it starts affecting some tests involving UA media control stylesheets.

• css/DocumentRuleSets.h:

(WebCore::DocumentRuleSets::mutableFeatures):

Check the default style version number in non-const case too.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• css/DocumentRuleSets.h (modified) (3 diffs)
• css/StyleBuilderCustom.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-03-22  Antti Koivisto  <antti@apple.com>
+
+        Non-const DocumentRuleSets::features() does not check default style version
+        https://bugs.webkit.org/show_bug.cgi?id=155766
+
+        Reviewed by Andreas Kling.
+
+        This may leave it out of date when the default stylesheet expands.
+
+        No test, don't know how to hit this with current codebase. With some further optimizations
+        it starts affecting some tests involving UA media control stylesheets.
+
+        * css/DocumentRuleSets.h:
+        (WebCore::DocumentRuleSets::mutableFeatures):
+
+            Check the default style version number in non-const case too.
+
 2016-03-22  Daniel Bates  <dabates@apple.com>
 

trunk/Source/WebCore/css/DocumentRuleSets.h

@@ -47 +47 @@
     RuleSet* authorStyle() const { return m_authorStyle.get(); }
     RuleSet* userStyle() const { return m_userStyle.get(); }
-    RuleFeatureSet& features() { return m_features; }
     const RuleFeatureSet& features() const;
     RuleSet* sibling() const { return m_siblingRuleSet.get(); }
@@ -62 +61 @@
     void resetAuthorStyle();
     void appendAuthorStyleSheets(const Vector<RefPtr<CSSStyleSheet>>&, MediaQueryEvaluator*, InspectorCSSOMWrappers&, StyleResolver*);
+
+    RuleFeatureSet& mutableFeatures();
 
 private:
@@ -85 +86 @@
 }
 
+// FIXME: There should be just the const version.
+inline RuleFeatureSet& DocumentRuleSets::mutableFeatures()
+{
+    if (m_defaultStyleVersionOnFeatureCollection < CSSDefaultStyleSheets::defaultStyleVersion)
+        collectFeatures();
+    return m_features;
+}
+
 } // namespace WebCore
 

trunk/Source/WebCore/css/StyleBuilderCustom.h

@@ -1346 +1346 @@
             didSet = true;
             // Register the fact that the attribute value affects the style.
-            styleResolver.ruleSets().features().attributeCanonicalLocalNamesInRules.add(attr.localName().impl());
-            styleResolver.ruleSets().features().attributeLocalNamesInRules.add(attr.localName().impl());
+            styleResolver.ruleSets().mutableFeatures().attributeCanonicalLocalNamesInRules.add(attr.localName().impl());
+            styleResolver.ruleSets().mutableFeatures().attributeLocalNamesInRules.add(attr.localName().impl());
         } else if (contentValue.isCounter()) {
             Counter* counterValue = contentValue.getCounterValue();
@@ -1716 +1716 @@
 
         // Register the fact that the attribute value affects the style.
-        styleResolver.ruleSets().features().attributeCanonicalLocalNamesInRules.add(attr.localName().impl());
-        styleResolver.ruleSets().features().attributeLocalNamesInRules.add(attr.localName().impl());
+        styleResolver.ruleSets().mutableFeatures().attributeCanonicalLocalNamesInRules.add(attr.localName().impl());
+        styleResolver.ruleSets().mutableFeatures().attributeLocalNamesInRules.add(attr.localName().impl());
     } else
         styleResolver.style()->setContentAltText(emptyAtom);