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

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

Issue 1368113002: Allow zero inputs for feMerge (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase; Drop assert. Created 5 years, 2 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
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 29 matching lines...) Expand all
40 PassRefPtrWillBeRawPtr<FilterEffect> SVGFEMergeElement::build(SVGFilterBuilder* filterBuilder, Filter* filter) 40 PassRefPtrWillBeRawPtr<FilterEffect> SVGFEMergeElement::build(SVGFilterBuilder* filterBuilder, Filter* filter)
41 { 41 {
42 RefPtrWillBeRawPtr<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
51 if (mergeInputs.isEmpty())
52 return nullptr;
53
54 return effect.release(); 50 return effect.release();
55 } 51 }
56 52
57 } 53 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698