Make error-handling for feColorMatrix consistent

third_party/WebKit/Source/platform/graphics/filters/FEColorMatrix.cpp

 /*
  * Copyright (C) 2004, 2005, 2006, 2007 Nikolas Zimmermann <zimmermann@kde.org>
  * Copyright (C) 2004, 2005 Rob Buis <buis@kde.org>
  * Copyright (C) 2005 Eric Seidel <eric@webkit.org>
  * Copyright (C) 2009 Dirk Schulze <krit@webkit.org>
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * 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
@@ skipping 103 matching lines @@
 static void luminanceToAlphaMatrix(SkScalar matrix[kColorMatrixSize])
 {
     memset(matrix, 0, kColorMatrixSize * sizeof(SkScalar));
     matrix[15] = 0.2125f;
     matrix[16] = 0.7154f;
     matrix[17] = 0.0721f;
 }
 
 static SkColorFilter* createColorFilter(ColorMatrixType type, const Vector<float>& values)
 {
-    // Use defaults if values contains too few values. See SVGFEColorMatrixElement::build
+    // Use defaults if values contains too few/many values.
     SkScalar matrix[kColorMatrixSize];
     memset(matrix, 0, kColorMatrixSize * sizeof(SkScalar));
     matrix[0] = matrix[6] = matrix[12] = matrix[18] = 1;
 
     switch (type) {
     case FECOLORMATRIX_TYPE_UNKNOWN:
         break;
     case FECOLORMATRIX_TYPE_MATRIX:
-        if (values.size() >= kColorMatrixSize) {
+        if (values.size() == kColorMatrixSize) {
             for (unsigned i = 0; i < kColorMatrixSize; ++i)
                 matrix[i] = values[i];
         }
         matrix[4] *= SkScalar(255);
         matrix[9] *= SkScalar(255);
         matrix[14] *= SkScalar(255);
         matrix[19] *= SkScalar(255);
         break;
     case FECOLORMATRIX_TYPE_SATURATE:
-        if (values.size())
+        if (values.size() == 1)
             saturateMatrix(values[0], matrix);
         break;
     case FECOLORMATRIX_TYPE_HUEROTATE:
-        if (values.size())
+        if (values.size() == 1)
             hueRotateMatrix(values[0], matrix);
         break;
     case FECOLORMATRIX_TYPE_LUMINANCETOALPHA:
         luminanceToAlphaMatrix(matrix);
         break;
     }
     return SkColorMatrixFilter::Create(matrix);
 }
 
 bool FEColorMatrix::affectsTransparentPixels()
@@ skipping 26 matching lines @@
     case FECOLORMATRIX_TYPE_HUEROTATE:
         ts << "HUEROTATE";
         break;
     case FECOLORMATRIX_TYPE_LUMINANCETOALPHA:
         ts << "LUMINANCETOALPHA";
         break;
     }
     return ts;
 }
 
+static bool valuesIsValidForType(ColorMatrixType type, const Vector<float>& values)
+{
+    switch (type) {
+    case FECOLORMATRIX_TYPE_MATRIX:
+        return values.size() == kColorMatrixSize;
+    case FECOLORMATRIX_TYPE_SATURATE:
+    case FECOLORMATRIX_TYPE_HUEROTATE:
+        return values.size() == 1;
+    case FECOLORMATRIX_TYPE_LUMINANCETOALPHA:
+        return values.size() == 0;
+    case FECOLORMATRIX_TYPE_UNKNOWN:
+        break;
+    }
+    ASSERT_NOT_REACHED();
+    return false;
+}
+
 TextStream& FEColorMatrix::externalRepresentation(TextStream& ts, int indent) const
 {
     writeIndent(ts, indent);
     ts << "[feColorMatrix";
     FilterEffect::externalRepresentation(ts);
     ts << " type=\"" << m_type << "\"";
-    if (!m_values.isEmpty()) {
+    if (!m_values.isEmpty() && valuesIsValidForType(m_type, m_values)) {
         ts << " values=\"";
         Vector<float>::const_iterator ptr = m_values.begin();
         const Vector<float>::const_iterator end = m_values.end();
         while (ptr < end) {
             ts << *ptr;
             ++ptr;
             if (ptr < end)
                 ts << " ";
         }
         ts << "\"";
     }
     ts << "]\n";
     inputEffect(0)->externalRepresentation(ts, indent + 1);
     return ts;
 }
 
 } // namespace blink