Collect content:attr(...)-features in RuleFeatureSet.

Source/core/css/RuleFeature.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com)
  * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com)
  * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved.
  * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
  * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org>
  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  * Copyright (c) 2011, Code Aurora Forum. All rights reserved.
  * Copyright (C) Research In Motion Limited 2011. All rights reserved.
@@ skipping 14 matching lines @@
  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
 
 #include "config.h"
 #include "core/css/RuleFeature.h"
 
 #include "core/HTMLNames.h"
 #include "core/css/CSSSelector.h"
 #include "core/css/CSSSelectorList.h"
+#include "core/css/CSSValueList.h"
 #include "core/css/RuleSet.h"
+#include "core/css/StylePropertySet.h"
 #include "core/css/StyleRule.h"
 #include "core/css/invalidation/DescendantInvalidationSet.h"
 #include "core/dom/Element.h"
 #include "core/dom/Node.h"
 #include "core/inspector/InspectorTraceEvents.h"
 #include "wtf/BitVector.h"
 
 namespace blink {
 
 #if ENABLE(ASSERT)
@@ skipping 168 matching lines @@
     if (selector.match() == CSSSelector::Tag && selector.tagQName().localName() != starAtom)
         features.tagName = selector.tagQName().localName();
     else if (selector.match() == CSSSelector::Id)
         features.id = selector.value();
     else if (selector.match() == CSSSelector::Class)
         features.classes.append(selector.value());
     else if (selector.isAttributeSelector())
         features.attributes.append(selector.attribute().localName());
     else if (selector.isCustomPseudoElement())
         features.customPseudoElement = true;
+    else if (selector.pseudoType() == CSSSelector::PseudoBefore || selector.pseudoType() == CSSSelector::PseudoAfter)
+        features.hasBeforeOrAfter = true;
     else
         return false;
     return true;
 }
 
 RuleFeatureSet::RuleFeatureSet()
 {
 }
 
 RuleFeatureSet::~RuleFeatureSet()
@@ skipping 27 matching lines @@
         case CSSSelector::PseudoIndeterminate:
         case CSSSelector::PseudoTarget:
             return &ensurePseudoInvalidationSet(selector.pseudoType());
         default:
             break;
         }
     }
     return nullptr;
 }
 
-// Given a selector, update the descendant invalidation sets for the features found
-// in the selector. The first step is to extract the features from the rightmost
+// Given a rule, update the descendant invalidation sets for the features found
+// in its selector. The first step is to extract the features from the rightmost
 // compound selector (extractInvalidationSetFeatures). Secondly, add those features
 // to the invalidation sets for the features found in the other compound selectors
 // (addFeaturesToInvalidationSets). If we find a feature in the right-most compound
 // selector that requires a subtree recalc, we addFeaturesToInvalidationSets for the
 // rightmost compound selector as well.
 
-void RuleFeatureSet::updateInvalidationSets(const CSSSelector& selector)
+void RuleFeatureSet::updateInvalidationSets(const RuleData& ruleData)
 {
     InvalidationSetFeatures features;
-    auto result = extractInvalidationSetFeatures(selector, features, false);
+    auto result = extractInvalidationSetFeatures(ruleData.selector(), features, false);
     if (result.first) {
         features.forceSubtree = result.second == ForceSubtree;
         addFeaturesToInvalidationSets(*result.first, features);
     }
+
+    // If any ::before and ::after rules specify 'content: attr(...)', we
+    // need to create invalidation sets for those attributes.
+    if (features.hasBeforeOrAfter)
+        updateInvalidationSetsForContentAttribute(ruleData);
+}
+
+void RuleFeatureSet::updateInvalidationSetsForContentAttribute(const RuleData& ruleData)
+{
+    const StylePropertySet& propertySet = ruleData.rule()->properties();
+
+    int propertyIndex = propertySet.findPropertyIndex(CSSPropertyContent);
+
+    if (propertyIndex == -1)
+        return;
+
+    StylePropertySet::PropertyReference contentProperty = propertySet.propertyAt(propertyIndex);
+    CSSValue* contentValue = contentProperty.value();
+
+    if (!contentValue->isValueList())
+        return;
+
+    for (CSSValueListIterator i = contentValue; i.hasMore(); i.advance()) {
+        CSSValue* item = i.value();
+        if (!item->isPrimitiveValue())
+            continue;
+        CSSPrimitiveValue* primitiveItem = toCSSPrimitiveValue(item);
+        if (!primitiveItem->isAttr())
+            continue;
+        ensureAttributeInvalidationSet(AtomicString(primitiveItem->getStringValue()));
+    }
 }
 
 std::pair<const CSSSelector*, RuleFeatureSet::UseFeaturesType>
 RuleFeatureSet::extractInvalidationSetFeatures(const CSSSelector& selector, InvalidationSetFeatures& features, bool negated)
 {
     bool foundFeatures = false;
     for (const CSSSelector* current = &selector; current; current = current->tagHistory()) {
         if (!negated)
             foundFeatures |= extractInvalidationSetFeature(*current, features);
         // Initialize the entry in the invalidation set map, if supported.
@@ skipping 88 matching lines @@
         if (current->relation() == CSSSelector::SubSelector)
             continue;
 
         if (current->isShadowSelector())
             features.treeBoundaryCrossing = true;
 
         features.adjacent = current->isAdjacentSelector();
     }
 }
 
-void RuleFeatureSet::addContentAttr(const AtomicString& attributeName)
-{
-    ensureAttributeInvalidationSet(attributeName);
-}
-
 void RuleFeatureSet::collectFeaturesFromRuleData(const RuleData& ruleData)
 {
-    updateInvalidationSets(ruleData.selector());
+    updateInvalidationSets(ruleData);
 
     FeatureMetadata metadata;
     collectFeaturesFromSelector(ruleData.selector(), metadata);
     m_metadata.add(metadata);
 
     if (metadata.foundSiblingSelector)
         siblingRules.append(RuleFeature(ruleData.rule(), ruleData.selectorIndex(), ruleData.hasDocumentSecurityOrigin()));
     if (ruleData.containsUncommonAttributeSelector())
         uncommonAttributeRules.append(RuleFeature(ruleData.rule(), ruleData.selectorIndex(), ruleData.hasDocumentSecurityOrigin()));
 }
@@ skipping 197 matching lines @@
     visitor->trace(uncommonAttributeRules);
     visitor->trace(m_classInvalidationSets);
     visitor->trace(m_attributeInvalidationSets);
     visitor->trace(m_idInvalidationSets);
     visitor->trace(m_pseudoInvalidationSets);
     visitor->trace(m_styleInvalidator);
 #endif
 }
 
 } // namespace blink