CSS style invalidation: simplify updates to invalidation set collections

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 184 matching lines @@
     case CSSSelector::PseudoHostContext:
         // :host-context matches a shadow host, yet the simple selectors inside
         // :host-context matches an ancestor of the shadow host.
         return true;
     default:
         DCHECK(supportsInvalidation(selector.getPseudoType()));
         return false;
     }
 }
 
-template<class Map>
-InvalidationSet& ensureInvalidationSet(Map& map, const typename Map::KeyType& key, InvalidationType type)
+InvalidationSet& storedInvalidationSet(RefPtr<InvalidationSet>& invalidationSet, InvalidationType type)
 {
-    typename Map::AddResult addResult = map.add(key, nullptr);
-    if (addResult.isNewEntry) {
+    if (!invalidationSet) {
         if (type == InvalidateDescendants)
-            addResult.storedValue->value = DescendantInvalidationSet::create();
+            invalidationSet = DescendantInvalidationSet::create();
         else
-            addResult.storedValue->value = SiblingInvalidationSet::create(nullptr);
-        return *addResult.storedValue->value;
+            invalidationSet = SiblingInvalidationSet::create(nullptr);
+        return *invalidationSet;
     }
-    if (addResult.storedValue->value->type() == type)
-        return *addResult.storedValue->value;
+    if (invalidationSet->type() == type)
+        return *invalidationSet;
 
     if (type == InvalidateDescendants)
-        return toSiblingInvalidationSet(addResult.storedValue->value.get())->ensureDescendants();
+        return toSiblingInvalidationSet(*invalidationSet).ensureDescendants();
 
-    RefPtr<InvalidationSet> descendants = addResult.storedValue->value;
-    RefPtr<InvalidationSet> siblings = SiblingInvalidationSet::create(toDescendantInvalidationSet(descendants.get()));
-    addResult.storedValue->value = siblings;
-    return *addResult.storedValue->value;
+    RefPtr<InvalidationSet> descendants = invalidationSet;
+    invalidationSet = SiblingInvalidationSet::create(toDescendantInvalidationSet(descendants.get()));
+    return *invalidationSet;
+}
+
+InvalidationSet& ensureInvalidationSet(HashMap<AtomicString, RefPtr<InvalidationSet>>& map, const AtomicString& key, InvalidationType type)
+{
+    RefPtr<InvalidationSet>& invalidationSet = map.add(key, nullptr).storedValue->value;
+    return storedInvalidationSet(invalidationSet, type);
+}
+
+InvalidationSet& ensureInvalidationSet(HashMap<CSSSelector::PseudoType, RefPtr<InvalidationSet>, WTF::IntHash<unsigned>, WTF::UnsignedWithZeroKeyHashTraits<unsigned>>& map, CSSSelector::PseudoType key, InvalidationType type)
+{
+    RefPtr<InvalidationSet>& invalidationSet = map.add(key, nullptr).storedValue->value;
+    return storedInvalidationSet(invalidationSet, type);
 }
 
 void extractInvalidationSets(InvalidationSet* invalidationSet, DescendantInvalidationSet*& descendants, SiblingInvalidationSet*& siblings)
 {
     RELEASE_ASSERT(invalidationSet->isAlive());
     if (invalidationSet->type() == InvalidateDescendants) {
         descendants = toDescendantInvalidationSet(invalidationSet);
         siblings = nullptr;
         return;
     }
@@ skipping 825 matching lines @@
 
 bool RuleFeatureSet::InvalidationSetFeatures::hasTagIdClassOrAttribute() const
 {
     return !classes.isEmpty()
         || !attributes.isEmpty()
         || !ids.isEmpty()
         || !tagNames.isEmpty();
 }
 
 } // namespace blink