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

Side by Side Diff: third_party/WebKit/Source/core/svg/SVGFEColorMatrixElement.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 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
86 invalidate(); 86 invalidate();
87 return; 87 return;
88 } 88 }
89 89
90 SVGFilterPrimitiveStandardAttributes::svgAttributeChanged(attrName); 90 SVGFilterPrimitiveStandardAttributes::svgAttributeChanged(attrName);
91 } 91 }
92 92
93 PassRefPtrWillBeRawPtr<FilterEffect> SVGFEColorMatrixElement::build(SVGFilterBui lder* filterBuilder, Filter* filter) 93 PassRefPtrWillBeRawPtr<FilterEffect> SVGFEColorMatrixElement::build(SVGFilterBui lder* filterBuilder, Filter* filter)
94 { 94 {
95 FilterEffect* input1 = filterBuilder->getEffectById(AtomicString(m_in1->curr entValue()->value())); 95 FilterEffect* input1 = filterBuilder->getEffectById(AtomicString(m_in1->curr entValue()->value()));
96 96 ASSERT(input1);
97 if (!input1)
98 return nullptr;
99 97
100 ColorMatrixType filterType = m_type->currentValue()->enumValue(); 98 ColorMatrixType filterType = m_type->currentValue()->enumValue();
101 Vector<float> filterValues = m_values->currentValue()->toFloatVector(); 99 Vector<float> filterValues = m_values->currentValue()->toFloatVector();
102 RefPtrWillBeRawPtr<FilterEffect> effect = FEColorMatrix::create(filter, filt erType, filterValues); 100 RefPtrWillBeRawPtr<FilterEffect> effect = FEColorMatrix::create(filter, filt erType, filterValues);
103 effect->inputEffects().append(input1); 101 effect->inputEffects().append(input1);
104 return effect.release(); 102 return effect.release();
105 } 103 }
106 104
107 } // namespace blink 105 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698