diff options
author | Feng Qian <fqian@google.com> | 2009-06-17 12:12:20 -0700 |
---|---|---|
committer | Feng Qian <fqian@google.com> | 2009-06-17 12:12:20 -0700 |
commit | 5f1ab04193ad0130ca8204aadaceae083aca9881 (patch) | |
tree | 5a92cd389e2cfe7fb67197ce14b38469462379f8 /WebCore/svg/SVGFEMergeElement.cpp | |
parent | 194315e5a908cc8ed67d597010544803eef1ac59 (diff) | |
download | external_webkit-5f1ab04193ad0130ca8204aadaceae083aca9881.zip external_webkit-5f1ab04193ad0130ca8204aadaceae083aca9881.tar.gz external_webkit-5f1ab04193ad0130ca8204aadaceae083aca9881.tar.bz2 |
Get WebKit r44544.
Diffstat (limited to 'WebCore/svg/SVGFEMergeElement.cpp')
-rw-r--r-- | WebCore/svg/SVGFEMergeElement.cpp | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/WebCore/svg/SVGFEMergeElement.cpp b/WebCore/svg/SVGFEMergeElement.cpp index 5ccf403..0640066 100644 --- a/WebCore/svg/SVGFEMergeElement.cpp +++ b/WebCore/svg/SVGFEMergeElement.cpp @@ -22,7 +22,7 @@ #include "config.h" -#if ENABLE(SVG) && ENABLE(SVG_FILTERS) +#if ENABLE(SVG) && ENABLE(FILTERS) #include "SVGFEMergeElement.h" #include "SVGFEMergeNodeElement.h" @@ -32,7 +32,6 @@ namespace WebCore { SVGFEMergeElement::SVGFEMergeElement(const QualifiedName& tagName, Document* doc) : SVGFilterPrimitiveStandardAttributes(tagName, doc) - , m_filterEffect(0) { } @@ -40,18 +39,12 @@ SVGFEMergeElement::~SVGFEMergeElement() { } -SVGFilterEffect* SVGFEMergeElement::filterEffect(SVGResourceFilter* filter) const -{ - ASSERT_NOT_REACHED(); - return 0; -} - -bool SVGFEMergeElement::build(FilterBuilder* builder) +bool SVGFEMergeElement::build(SVGResourceFilter* filterResource) { Vector<FilterEffect*> mergeInputs; for (Node* n = firstChild(); n != 0; n = n->nextSibling()) { if (n->hasTagName(SVGNames::feMergeNodeTag)) { - FilterEffect* mergeEffect = builder->getEffectById(static_cast<SVGFEMergeNodeElement*>(n)->in1()); + FilterEffect* mergeEffect = filterResource->builder()->getEffectById(static_cast<SVGFEMergeNodeElement*>(n)->in1()); mergeInputs.append(mergeEffect); } } @@ -59,7 +52,8 @@ bool SVGFEMergeElement::build(FilterBuilder* builder) if(mergeInputs.isEmpty()) return false; - builder->add(result(), FEMerge::create(mergeInputs)); + RefPtr<FilterEffect> effect = FEMerge::create(mergeInputs); + filterResource->addFilterEffect(this, effect.release()); return true; } |