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

Source/core/css/resolver/StyleResolver.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, 2013 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 499 matching lines @@
     documentStyle->setZoom(frame && !document.printing() ? frame->pageZoomFactor() : 1);
     documentStyle->setLocale(document.contentLanguage());
     documentStyle->setZIndex(0);
     documentStyle->setUserModify(document.inDesignMode() ? READ_WRITE : READ_ONLY);
 
     document.setupFontBuilder(documentStyle.get());
 
     return documentStyle.release();
 }
 
-static void addContentAttrValuesToFeatures(const Vector<AtomicString>& contentAttrValues, RuleFeatureSet& features)
-{
-    for (size_t i = 0; i < contentAttrValues.size(); ++i)
-        features.addContentAttr(contentAttrValues[i]);
-}
-
 void StyleResolver::adjustRenderStyle(StyleResolverState& state, Element* element)
 {
     StyleAdjuster adjuster(document().inQuirksMode());
     adjuster.adjustRenderStyle(state.style(), state.parentStyle(), element, state.cachedUAStyle());
 }
 
 // Start loading resources referenced by this style.
 void StyleResolver::loadPendingResources(StyleResolverState& state)
 {
     m_styleResourceLoader.loadPendingResources(state.style(), state.elementStyleResources());
@@ skipping 87 matching lines @@
         if (element->renderStyle() && element->renderStyle()->textAutosizingMultiplier() != state.style()->textAutosizingMultiplier()) {
             // Preserve the text autosizing multiplier on style recalc. Autosizer will update it during layout if needed.
             // NOTE: this must occur before applyMatchedProperties for correct computation of font-relative lengths.
             state.style()->setTextAutosizingMultiplier(element->renderStyle()->textAutosizingMultiplier());
             state.style()->setUnique();
         }
 
         applyMatchedProperties(state, collector.matchedResult());
         applyCallbackSelectors(state);
 
-        addContentAttrValuesToFeatures(state.contentAttrValues(), m_features);
-
         // Cache our original display.
         state.style()->setOriginalDisplay(state.style()->display());
 
         adjustRenderStyle(state, element);
 
         if (activeAnimations)
             activeAnimations->updateBaseRenderStyle(state.style());
     }
 
     // FIXME: The CSSWG wants to specify that the effects of animations are applied before
@@ skipping 161 matching lines @@
 
         matchUARules(collector);
         matchAuthorRules(state.element(), collector, false);
 
         if (collector.matchedResult().matchedProperties.isEmpty())
             return false;
 
         applyMatchedProperties(state, collector.matchedResult());
         applyCallbackSelectors(state);
 
-        addContentAttrValuesToFeatures(state.contentAttrValues(), m_features);
-
         // Cache our original display.
         state.style()->setOriginalDisplay(state.style()->display());
 
         // FIXME: Passing 0 as the Element* introduces a lot of complexity
         // in the adjustRenderStyle code.
         adjustRenderStyle(state, 0);
 
         if (activeAnimations)
             activeAnimations->updateBaseRenderStyle(state.style());
     }
@@ skipping 53 matching lines @@
     bool inheritedOnly = false;
 
     MatchResult& result = collector.matchedResult();
     applyMatchedProperties<HighPriorityProperties>(state, result, false, 0, result.matchedProperties.size() - 1, inheritedOnly);
 
     // If our font got dirtied, go ahead and update it now.
     updateFont(state);
 
     applyMatchedProperties<LowPriorityProperties>(state, result, false, 0, result.matchedProperties.size() - 1, inheritedOnly);
 
-    addContentAttrValuesToFeatures(state.contentAttrValues(), m_features);
-
     loadPendingResources(state);
 
     didAccess();
 
     // Now return the style.
     return state.takeStyle();
 }
 
 void StyleResolver::collectViewportRules()
 {
@@ skipping 711 matching lines @@
     visitor->trace(m_uncommonAttributeRuleSet);
     visitor->trace(m_watchedSelectorsRules);
     visitor->trace(m_treeBoundaryCrossingRules);
     visitor->trace(m_styleSharingLists);
     visitor->trace(m_pendingStyleSheets);
     visitor->trace(m_document);
 #endif
 }
 
 } // namespace blink