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

Unified Diff: Source/core/svg/SVGFEColorMatrixElement.cpp

Issue 19097005: Remove one SVG animated type special case from the bindings generator (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fix the regressions Created 7 years, 5 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 side-by-side diff with in-line comments
Download patch
Index: Source/core/svg/SVGFEColorMatrixElement.cpp
diff --git a/Source/core/svg/SVGFEColorMatrixElement.cpp b/Source/core/svg/SVGFEColorMatrixElement.cpp
index 5a82e7a1a33afe1a5ac947d6b9afc9708dc9dad5..c65485b238e0b3a0b165d7a7b56c8a9c4f02f219 100644
--- a/Source/core/svg/SVGFEColorMatrixElement.cpp
+++ b/Source/core/svg/SVGFEColorMatrixElement.cpp
@@ -100,9 +100,9 @@ bool SVGFEColorMatrixElement::setFilterEffectAttribute(FilterEffect* effect, con
{
FEColorMatrix* colorMatrix = static_cast<FEColorMatrix*>(effect);
if (attrName == SVGNames::typeAttr)
- return colorMatrix->setType(type());
+ return colorMatrix->setType(typeCurrentValue());
if (attrName == SVGNames::valuesAttr)
- return colorMatrix->setValues(values());
+ return colorMatrix->setValues(valuesCurrentValue());
ASSERT_NOT_REACHED();
return false;
@@ -132,13 +132,13 @@ void SVGFEColorMatrixElement::svgAttributeChanged(const QualifiedName& attrName)
PassRefPtr<FilterEffect> SVGFEColorMatrixElement::build(SVGFilterBuilder* filterBuilder, Filter* filter)
{
- FilterEffect* input1 = filterBuilder->getEffectById(in1());
+ FilterEffect* input1 = filterBuilder->getEffectById(in1CurrentValue());
if (!input1)
return 0;
Vector<float> filterValues;
- ColorMatrixType filterType = type();
+ ColorMatrixType filterType = typeCurrentValue();
// Use defaults if values is empty (SVG 1.1 15.10).
if (!hasAttribute(SVGNames::valuesAttr)) {
@@ -157,7 +157,7 @@ PassRefPtr<FilterEffect> SVGFEColorMatrixElement::build(SVGFilterBuilder* filter
break;
}
} else {
- filterValues = values();
+ filterValues = valuesCurrentValue();
unsigned size = filterValues.size();
if ((filterType == FECOLORMATRIX_TYPE_MATRIX && size != 20)

Powered by Google App Engine
This is Rietveld 408576698