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

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

Issue 1383013002: SVGFilterBuilder::getEffectById never return nullptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
118 return; 118 return;
119 } 119 }
120 120
121 SVGFilterPrimitiveStandardAttributes::svgAttributeChanged(attrName); 121 SVGFilterPrimitiveStandardAttributes::svgAttributeChanged(attrName);
122 } 122 }
123 123
124 PassRefPtrWillBeRawPtr<FilterEffect> SVGFECompositeElement::build(SVGFilterBuild er* filterBuilder, Filter* filter) 124 PassRefPtrWillBeRawPtr<FilterEffect> SVGFECompositeElement::build(SVGFilterBuild er* filterBuilder, Filter* filter)
125 { 125 {
126 FilterEffect* input1 = filterBuilder->getEffectById(AtomicString(m_in1->curr entValue()->value())); 126 FilterEffect* input1 = filterBuilder->getEffectById(AtomicString(m_in1->curr entValue()->value()));
127 FilterEffect* input2 = filterBuilder->getEffectById(AtomicString(m_in2->curr entValue()->value())); 127 FilterEffect* input2 = filterBuilder->getEffectById(AtomicString(m_in2->curr entValue()->value()));
128 128 ASSERT(input1 && input2);
129 if (!input1 || !input2)
130 return nullptr;
131 129
132 RefPtrWillBeRawPtr<FilterEffect> effect = FEComposite::create(filter, m_svgO perator->currentValue()->enumValue(), m_k1->currentValue()->value(), m_k2->curre ntValue()->value(), m_k3->currentValue()->value(), m_k4->currentValue()->value() ); 130 RefPtrWillBeRawPtr<FilterEffect> effect = FEComposite::create(filter, m_svgO perator->currentValue()->enumValue(), m_k1->currentValue()->value(), m_k2->curre ntValue()->value(), m_k3->currentValue()->value(), m_k4->currentValue()->value() );
133 FilterEffectVector& inputEffects = effect->inputEffects(); 131 FilterEffectVector& inputEffects = effect->inputEffects();
134 inputEffects.reserveCapacity(2); 132 inputEffects.reserveCapacity(2);
135 inputEffects.append(input1); 133 inputEffects.append(input1);
136 inputEffects.append(input2); 134 inputEffects.append(input2);
137 return effect.release(); 135 return effect.release();
138 } 136 }
139 137
140 } // namespace blink 138 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698