Code drop from //branches/cupcake/...@124589

1 files changed, 17 insertions, 10 deletions

diff --git a/WebCore/svg/SVGFEMergeElement.cpp b/WebCore/svg/SVGFEMergeElement.cpp
index 7c7fd75..5ccf403 100644
--- a/WebCore/svg/SVGFEMergeElement.cpp
+++ b/WebCore/svg/SVGFEMergeElement.cpp
@@ -38,23 +38,30 @@ SVGFEMergeElement::SVGFEMergeElement(const QualifiedName& tagName, Document* doc
 
 SVGFEMergeElement::~SVGFEMergeElement()
 {
-    delete m_filterEffect;
 }
 
-SVGFEMerge* SVGFEMergeElement::filterEffect(SVGResourceFilter* filter) const
+SVGFilterEffect* SVGFEMergeElement::filterEffect(SVGResourceFilter* filter) const
 {
-    if (!m_filterEffect)
-        m_filterEffect = new SVGFEMerge(filter);
-    setStandardAttributes(m_filterEffect);
+    ASSERT_NOT_REACHED();
+    return 0;
+}
 
-    Vector<String> mergeInputs;
+bool SVGFEMergeElement::build(FilterBuilder* builder)
+{
+    Vector<FilterEffect*> mergeInputs;
     for (Node* n = firstChild(); n != 0; n = n->nextSibling()) {
-        if (n->hasTagName(SVGNames::feMergeNodeTag))
-            mergeInputs.append(static_cast<SVGFEMergeNodeElement*>(n)->in1());
+        if (n->hasTagName(SVGNames::feMergeNodeTag)) {
+            FilterEffect* mergeEffect = builder->getEffectById(static_cast<SVGFEMergeNodeElement*>(n)->in1());
+            mergeInputs.append(mergeEffect);
+        }
     }
 
-    m_filterEffect->setMergeInputs(mergeInputs);
-    return m_filterEffect;
+    if(mergeInputs.isEmpty())
+        return false;
+
+    builder->add(result(), FEMerge::create(mergeInputs));
+
+    return true;
 }
 
 }