Make error-handling for feColorMatrix consistent

third_party/WebKit/Source/core/svg/SVGFEColorMatrixElement.cpp

 /*
  * Copyright (C) 2004, 2005, 2007 Nikolas Zimmermann <zimmermann@kde.org>
  * Copyright (C) 2004, 2005, 2006 Rob Buis <buis@kde.org>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
@@ skipping 79 matching lines @@
     SVGFilterPrimitiveStandardAttributes::svgAttributeChanged(attrName);
 }
 
 PassRefPtrWillBeRawPtr<FilterEffect> SVGFEColorMatrixElement::build(SVGFilterBuilder* filterBuilder, Filter* filter)
 {
     FilterEffect* input1 = filterBuilder->getEffectById(AtomicString(m_in1->currentValue()->value()));
 
     if (!input1)
         return nullptr;
 
-    Vector<float> filterValues;
     ColorMatrixType filterType = m_type->currentValue()->enumValue();
-
-    // Use defaults if values is empty (SVG 1.1 15.10).
-    if (!hasAttribute(SVGNames::valuesAttr)) {
-        switch (filterType) {
-        case FECOLORMATRIX_TYPE_MATRIX:
-            for (size_t i = 0; i < 20; i++)
-                filterValues.append((i % 6) ? 0 : 1);
-            break;
-        case FECOLORMATRIX_TYPE_HUEROTATE:
-            filterValues.append(0);
-            break;
-        case FECOLORMATRIX_TYPE_SATURATE:
-            filterValues.append(1);
-            break;
-        default:
-            break;
-        }
-    } else {
-        RefPtrWillBeRawPtr<SVGNumberList> values = m_values->currentValue();
-        size_t size = values->length();
-
-        if ((filterType == FECOLORMATRIX_TYPE_MATRIX && size != 20)
-            || (filterType == FECOLORMATRIX_TYPE_HUEROTATE && size != 1)
-            || (filterType == FECOLORMATRIX_TYPE_SATURATE && size != 1))
-            return nullptr;
-
-        filterValues = values->toFloatVector();
-    }
-
+    Vector<float> filterValues = m_values->currentValue()->toFloatVector();
     RefPtrWillBeRawPtr<FilterEffect> effect = FEColorMatrix::create(filter, filterType, filterValues);
     effect->inputEffects().append(input1);
     return effect.release();
 }
 
 } // namespace blink