Allow multiple type and id selectors in invalidation set features.

third_party/WebKit/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 279 matching lines @@
 }
 
 ALWAYS_INLINE InvalidationSet& RuleFeatureSet::ensurePseudoInvalidationSet(CSSSelector::PseudoType pseudoType, InvalidationType type)
 {
     return ensureInvalidationSet(m_pseudoInvalidationSets, pseudoType, type);
 }
 
 bool RuleFeatureSet::extractInvalidationSetFeature(const CSSSelector& selector, InvalidationSetFeatures& features)
 {
     if (selector.match() == CSSSelector::Tag && selector.tagQName().localName() != starAtom) {
-        features.tagName = selector.tagQName().localName();
+        features.tagNames.append(selector.tagQName().localName());
         return true;
     }
     if (selector.match() == CSSSelector::Id) {
-        features.id = selector.value();
+        features.ids.append(selector.value());
         return true;
     }
     if (selector.match() == CSSSelector::Class) {
         features.classes.append(selector.value());
         return true;
     }
     if (selector.isAttributeSelector()) {
         features.attributes.append(selector.attribute().localName());
         return true;
     }
@@ skipping 204 matching lines @@
         invalidationSet.setTreeBoundaryCrossing();
     if (features.insertionPointCrossing)
         invalidationSet.setInsertionPointCrossing();
     if (features.invalidatesSlotted)
         invalidationSet.setInvalidatesSlotted();
     if (features.forceSubtree)
         invalidationSet.setWholeSubtreeInvalid();
     if (features.contentPseudoCrossing || features.forceSubtree)
         return;
 
-    if (!features.id.isEmpty())
-        invalidationSet.addId(features.id);
-    if (!features.tagName.isEmpty())
-        invalidationSet.addTagName(features.tagName);
+    for (const auto& id : features.ids)
+        invalidationSet.addId(id);
+    for (const auto& tagName : features.tagNames)
+        invalidationSet.addTagName(tagName);
     for (const auto& className : features.classes)
         invalidationSet.addClass(className);
     for (const auto& attribute : features.attributes)
         invalidationSet.addAttribute(attribute);
     if (features.customPseudoElement)
         invalidationSet.setCustomPseudoInvalid();
 }
 
 // selector is the selector immediately to the left of the rightmost combinator.
 // siblingFeatures is null if selector is not immediately to the left of a sibling combinator.
@@ skipping 396 matching lines @@
         addFeaturesToInvalidationSet(universalSet.ensureSiblingDescendants(), descendantFeatures);
 }
 
 DEFINE_TRACE(RuleFeatureSet)
 {
     visitor->trace(siblingRules);
     visitor->trace(uncommonAttributeRules);
 }
 
 } // namespace blink