Always populate the node map in SVGFilterBuilder if one exists

third_party/WebKit/Source/core/svg/graphics/filters/SVGFilterBuilder.cpp

 /*
  * Copyright (C) 2009 Dirk Schulze <krit@webkit.org>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 26 matching lines @@
 {
     m_effectReferences.add(effect, FilterEffectSet());
 }
 
 void SVGFilterGraphNodeMap::addPrimitive(LayoutObject* object, PassRefPtrWillBeRawPtr<FilterEffect> prpEffect)
 {
     RefPtrWillBeRawPtr<FilterEffect> effect = prpEffect;
 
     // The effect must be a newly created filter effect.
     ASSERT(!m_effectReferences.contains(effect));
-    ASSERT(object && !m_effectRenderer.contains(object));
+    ASSERT(!object || !m_effectRenderer.contains(object));
     m_effectReferences.add(effect, FilterEffectSet());
 
     unsigned numberOfInputEffects = effect->inputEffects().size();
 
     // Add references from the inputs of this effect to the effect itself, to
     // allow determining what effects needs to be invalidated when a certain
     // effect changes.
     for (unsigned i = 0; i < numberOfInputEffects; ++i)
         effectReferences(effect->inputEffect(i)).add(effect.get());
 
-    m_effectRenderer.add(object, effect.get());
+    // If object is null, that means the element isn't attached for some
+    // reason, which in turn mean that certain types of invalidation will not
+    // work (the LayoutObject -> FilterEffect mapping will not be defined).
+    if (object)
+        m_effectRenderer.add(object, effect.get());
 }
 
 void SVGFilterGraphNodeMap::invalidateDependentEffects(FilterEffect* effect)
 {
     if (!effect->hasImageFilter())
         return;
 
     effect->clearResult();
 
     FilterEffectSet& effectReferences = this->effectReferences(effect);
@@ skipping 54 matching lines @@
 
     for (SVGElement* element = Traversal<SVGElement>::firstChild(filterElement); element; element = Traversal<SVGElement>::nextSibling(*element)) {
         if (!element->isFilterEffect())
             continue;
 
         SVGFilterPrimitiveStandardAttributes* effectElement = static_cast<SVGFilterPrimitiveStandardAttributes*>(element);
         RefPtrWillBeRawPtr<FilterEffect> effect = effectElement->build(this, filter);
         if (!effect)
             continue;
 
-        if (m_nodeMap && effectElement->layoutObject())
+        if (m_nodeMap)
             m_nodeMap->addPrimitive(effectElement->layoutObject(), effect);
+
         effectElement->setStandardAttributes(effect.get());
         effect->setEffectBoundaries(SVGLengthContext::resolveRectangle<SVGFilterPrimitiveStandardAttributes>(effectElement, filterElement.primitiveUnits()->currentValue()->enumValue(), referenceBox));
         EColorInterpolation colorInterpolation = colorInterpolationForElement(*effectElement, filterColorInterpolation);
         effect->setOperatingColorSpace(colorInterpolation == CI_LINEARRGB ? ColorSpaceLinearRGB : ColorSpaceDeviceRGB);
 
         add(AtomicString(effectElement->result()->currentValue()->value()), effect);
     }
 }
 
 void SVGFilterBuilder::add(const AtomicString& id, PassRefPtrWillBeRawPtr<FilterEffect> effect)
@@ skipping 20 matching lines @@
             return namedEffect;
     }
 
     if (m_lastEffect)
         return m_lastEffect.get();
 
     return m_builtinEffects.get(SourceGraphic::effectName());
 }
 
 } // namespace blink