Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(559)

Side by Side Diff: Source/core/svg/SVGFEMergeElement.cpp

Issue 191963002: Use new Traversal<SVG*Element> API more in SVG code (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « Source/core/svg/SVGFELightElement.h ('k') | Source/core/svg/SVGGradientElement.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 26 matching lines...) Expand all
37 37
38 PassRefPtr<SVGFEMergeElement> SVGFEMergeElement::create(Document& document) 38 PassRefPtr<SVGFEMergeElement> SVGFEMergeElement::create(Document& document)
39 { 39 {
40 return adoptRef(new SVGFEMergeElement(document)); 40 return adoptRef(new SVGFEMergeElement(document));
41 } 41 }
42 42
43 PassRefPtr<FilterEffect> SVGFEMergeElement::build(SVGFilterBuilder* filterBuilde r, Filter* filter) 43 PassRefPtr<FilterEffect> SVGFEMergeElement::build(SVGFilterBuilder* filterBuilde r, Filter* filter)
44 { 44 {
45 RefPtr<FilterEffect> effect = FEMerge::create(filter); 45 RefPtr<FilterEffect> effect = FEMerge::create(filter);
46 FilterEffectVector& mergeInputs = effect->inputEffects(); 46 FilterEffectVector& mergeInputs = effect->inputEffects();
47 for (Element* element = ElementTraversal::firstWithin(*this); element; eleme nt = ElementTraversal::nextSibling(*element)) { 47 for (SVGFEMergeNodeElement* element = Traversal<SVGFEMergeNodeElement>::firs tChild(*this); element; element = Traversal<SVGFEMergeNodeElement>::nextSibling( *element)) {
48 if (element->hasTagName(SVGNames::feMergeNodeTag)) { 48 FilterEffect* mergeEffect = filterBuilder->getEffectById(AtomicString(el ement->in1()->currentValue()->value()));
49 FilterEffect* mergeEffect = filterBuilder->getEffectById(AtomicStrin g(toSVGFEMergeNodeElement(element)->in1()->currentValue()->value())); 49 if (!mergeEffect)
50 if (!mergeEffect) 50 return nullptr;
51 return nullptr; 51 mergeInputs.append(mergeEffect);
52 mergeInputs.append(mergeEffect);
53 }
54 } 52 }
55 53
56 if (mergeInputs.isEmpty()) 54 if (mergeInputs.isEmpty())
57 return nullptr; 55 return nullptr;
58 56
59 return effect.release(); 57 return effect.release();
60 } 58 }
61 59
62 } 60 }
OLDNEW
« no previous file with comments | « Source/core/svg/SVGFELightElement.h ('k') | Source/core/svg/SVGGradientElement.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698