| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2004, 2005, 2007 Nikolas Zimmermann <zimmermann@kde.org> | 2 * Copyright (C) 2004, 2005, 2007 Nikolas Zimmermann <zimmermann@kde.org> |
| 3 * Copyright (C) 2004, 2005, 2006 Rob Buis <buis@kde.org> | 3 * Copyright (C) 2004, 2005, 2006 Rob Buis <buis@kde.org> |
| 4 * | 4 * |
| 5 * This library is free software; you can redistribute it and/or | 5 * This library is free software; you can redistribute it and/or |
| 6 * modify it under the terms of the GNU Library General Public | 6 * modify it under the terms of the GNU Library General Public |
| 7 * License as published by the Free Software Foundation; either | 7 * License as published by the Free Software Foundation; either |
| 8 * version 2 of the License, or (at your option) any later version. | 8 * version 2 of the License, or (at your option) any later version. |
| 9 * | 9 * |
| 10 * This library is distributed in the hope that it will be useful, | 10 * This library is distributed in the hope that it will be useful, |
| (...skipping 19 matching lines...) Expand all Loading... |
| 30 | 30 |
| 31 namespace blink { | 31 namespace blink { |
| 32 | 32 |
| 33 inline SVGFEMergeElement::SVGFEMergeElement(Document& document) | 33 inline SVGFEMergeElement::SVGFEMergeElement(Document& document) |
| 34 : SVGFilterPrimitiveStandardAttributes(SVGNames::feMergeTag, document) | 34 : SVGFilterPrimitiveStandardAttributes(SVGNames::feMergeTag, document) |
| 35 { | 35 { |
| 36 } | 36 } |
| 37 | 37 |
| 38 DEFINE_NODE_FACTORY(SVGFEMergeElement) | 38 DEFINE_NODE_FACTORY(SVGFEMergeElement) |
| 39 | 39 |
| 40 PassRefPtr<FilterEffect> SVGFEMergeElement::build(SVGFilterBuilder* filterBuilde
r, Filter* filter) | 40 PassRefPtrWillBeRawPtr<FilterEffect> SVGFEMergeElement::build(SVGFilterBuilder*
filterBuilder, Filter* filter) |
| 41 { | 41 { |
| 42 RefPtr<FilterEffect> effect = FEMerge::create(filter); | 42 RefPtrWillBeRawPtr<FilterEffect> effect = FEMerge::create(filter); |
| 43 FilterEffectVector& mergeInputs = effect->inputEffects(); | 43 FilterEffectVector& mergeInputs = effect->inputEffects(); |
| 44 for (SVGFEMergeNodeElement* element = Traversal<SVGFEMergeNodeElement>::firs
tChild(*this); element; element = Traversal<SVGFEMergeNodeElement>::nextSibling(
*element)) { | 44 for (SVGFEMergeNodeElement* element = Traversal<SVGFEMergeNodeElement>::firs
tChild(*this); element; element = Traversal<SVGFEMergeNodeElement>::nextSibling(
*element)) { |
| 45 FilterEffect* mergeEffect = filterBuilder->getEffectById(AtomicString(el
ement->in1()->currentValue()->value())); | 45 FilterEffect* mergeEffect = filterBuilder->getEffectById(AtomicString(el
ement->in1()->currentValue()->value())); |
| 46 if (!mergeEffect) | 46 if (!mergeEffect) |
| 47 return nullptr; | 47 return nullptr; |
| 48 mergeInputs.append(mergeEffect); | 48 mergeInputs.append(mergeEffect); |
| 49 } | 49 } |
| 50 | 50 |
| 51 if (mergeInputs.isEmpty()) | 51 if (mergeInputs.isEmpty()) |
| 52 return nullptr; | 52 return nullptr; |
| 53 | 53 |
| 54 return effect.release(); | 54 return effect.release(); |
| 55 } | 55 } |
| 56 | 56 |
| 57 } | 57 } |
| OLD | NEW |