CSS: Additional asserts for style invalidation

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 205 matching lines @@
         else
             addResult.storedValue->value = SiblingInvalidationSet::create(nullptr);
         return *addResult.storedValue->value;
     }
     if (addResult.storedValue->value->type() == type)
         return *addResult.storedValue->value;
 
     if (type == InvalidateDescendants)
         return toSiblingInvalidationSet(addResult.storedValue->value.get())->ensureDescendants();
 
-    addResult.storedValue->value = SiblingInvalidationSet::create(toDescendantInvalidationSet(addResult.storedValue->value.get()));
+    RefPtr<InvalidationSet> descendants = addResult.storedValue->value;
+    RefPtr<InvalidationSet> siblings = SiblingInvalidationSet::create(toDescendantInvalidationSet(descendants.get()));
+    addResult.storedValue->value = siblings;
     return *addResult.storedValue->value;
 }
 
 void extractInvalidationSets(InvalidationSet* invalidationSet, DescendantInvalidationSet*& descendants, SiblingInvalidationSet*& siblings)
 {
     RELEASE_ASSERT(invalidationSet->isAlive());
     if (invalidationSet->type() == InvalidateDescendants) {
         descendants = toDescendantInvalidationSet(invalidationSet);
         siblings = nullptr;
         return;
@@ skipping 32 matching lines @@
     m_idInvalidationSets.clear();
     m_pseudoInvalidationSets.clear();
     m_universalSiblingInvalidationSet.clear();
     m_nthInvalidationSet.clear();
 
     m_isAlive = false;
 }
 
 ALWAYS_INLINE InvalidationSet& RuleFeatureSet::ensureClassInvalidationSet(const AtomicString& className, InvalidationType type)
 {
+    RELEASE_ASSERT(!className.isEmpty());
     return ensureInvalidationSet(m_classInvalidationSets, className, type);
 }
 
 ALWAYS_INLINE InvalidationSet& RuleFeatureSet::ensureAttributeInvalidationSet(const AtomicString& attributeName, InvalidationType type)
 {
+    RELEASE_ASSERT(!attributeName.isEmpty());
     return ensureInvalidationSet(m_attributeInvalidationSets, attributeName, type);
 }
 
 ALWAYS_INLINE InvalidationSet& RuleFeatureSet::ensureIdInvalidationSet(const AtomicString& id, InvalidationType type)
 {
+    RELEASE_ASSERT(!id.isEmpty());
     return ensureInvalidationSet(m_idInvalidationSets, id, type);
 }
 
 ALWAYS_INLINE InvalidationSet& RuleFeatureSet::ensurePseudoInvalidationSet(CSSSelector::PseudoType pseudoType, InvalidationType type)
 {
+    RELEASE_ASSERT(pseudoType != CSSSelector::PseudoUnknown);
     return ensureInvalidationSet(m_pseudoInvalidationSets, pseudoType, type);
 }
 
 bool RuleFeatureSet::extractInvalidationSetFeature(const CSSSelector& selector, InvalidationSetFeatures& features)
 {
     if (selector.match() == CSSSelector::Tag && selector.tagQName().localName() != starAtom) {
         features.tagNames.append(selector.tagQName().localName());
         return true;
     }
     if (selector.match() == CSSSelector::Id) {
@@ skipping 419 matching lines @@
     usesWindowInactiveSelector = false;
     foundSiblingSelector = false;
     foundInsertionPointCrossing = false;
     maxDirectAdjacentSelectors = 0;
 }
 
 void RuleFeatureSet::add(const RuleFeatureSet& other)
 {
     RELEASE_ASSERT(m_isAlive);
     RELEASE_ASSERT(other.m_isAlive);
+    RELEASE_ASSERT(&other != this);
     for (const auto& entry : other.m_classInvalidationSets)
         ensureInvalidationSet(m_classInvalidationSets, entry.key, entry.value->type()).combine(*entry.value);
     for (const auto& entry : other.m_attributeInvalidationSets)
         ensureInvalidationSet(m_attributeInvalidationSets, entry.key, entry.value->type()).combine(*entry.value);
     for (const auto& entry : other.m_idInvalidationSets)
         ensureInvalidationSet(m_idInvalidationSets, entry.key, entry.value->type()).combine(*entry.value);
     for (const auto& entry : other.m_pseudoInvalidationSets)
         ensureInvalidationSet(m_pseudoInvalidationSets, static_cast<CSSSelector::PseudoType>(entry.key), entry.value->type()).combine(*entry.value);
     if (other.m_universalSiblingInvalidationSet)
         ensureUniversalSiblingInvalidationSet().combine(*other.m_universalSiblingInvalidationSet);
@@ skipping 196 matching lines @@
         addFeaturesToInvalidationSet(universalSet.ensureSiblingDescendants(), descendantFeatures);
 }
 
 DEFINE_TRACE(RuleFeatureSet)
 {
     visitor->trace(siblingRules);
     visitor->trace(uncommonAttributeRules);
 }
 
 } // namespace blink