Replace narrowPrecisionToFloat with clampTo<float>

third_party/WebKit/Source/core/paint/FilterEffectBuilder.cpp

 /*
  * Copyright (C) 2011 Apple Inc. All rights reserved.
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 13 matching lines @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "core/paint/FilterEffectBuilder.h"
 
 #include "core/layout/svg/ReferenceFilterBuilder.h"
 #include "core/paint/PaintLayer.h"
 #include "core/svg/SVGFilterElement.h"
 #include "core/svg/SVGLengthContext.h"
 #include "core/svg/graphics/filters/SVGFilterBuilder.h"
-#include "platform/FloatConversion.h"
 #include "platform/LengthFunctions.h"
 #include "platform/graphics/ColorSpace.h"
 #include "platform/graphics/filters/FEBoxReflect.h"
 #include "platform/graphics/filters/FEColorMatrix.h"
 #include "platform/graphics/filters/FEComponentTransfer.h"
 #include "platform/graphics/filters/FEDropShadow.h"
 #include "platform/graphics/filters/FEGaussianBlur.h"
 #include "platform/graphics/filters/Filter.h"
 #include "platform/graphics/filters/FilterOperations.h"
 #include "platform/graphics/filters/SourceGraphic.h"
@@ skipping 21 matching lines @@
 
 Vector<float> grayscaleMatrix(double amount)
 {
     double oneMinusAmount = clampTo(1 - amount, 0.0, 1.0);
 
     // See https://dvcs.w3.org/hg/FXTF/raw-file/tip/filters/index.html#grayscaleEquivalent
     // for information on parameters.
     Vector<float> matrix;
     matrix.reserveInitialCapacity(20);
 
-    matrix.uncheckedAppend(narrowPrecisionToFloat(0.2126 + 0.7874 * oneMinusAmount));
-    matrix.uncheckedAppend(narrowPrecisionToFloat(0.7152 - 0.7152 * oneMinusAmount));
-    matrix.uncheckedAppend(narrowPrecisionToFloat(0.0722 - 0.0722 * oneMinusAmount));
+    matrix.uncheckedAppend(clampTo<float>(0.2126 + 0.7874 * oneMinusAmount));
+    matrix.uncheckedAppend(clampTo<float>(0.7152 - 0.7152 * oneMinusAmount));
+    matrix.uncheckedAppend(clampTo<float>(0.0722 - 0.0722 * oneMinusAmount));
     endMatrixRow(matrix);
 
-    matrix.uncheckedAppend(narrowPrecisionToFloat(0.2126 - 0.2126 * oneMinusAmount));
-    matrix.uncheckedAppend(narrowPrecisionToFloat(0.7152 + 0.2848 * oneMinusAmount));
-    matrix.uncheckedAppend(narrowPrecisionToFloat(0.0722 - 0.0722 * oneMinusAmount));
+    matrix.uncheckedAppend(clampTo<float>(0.2126 - 0.2126 * oneMinusAmount));
+    matrix.uncheckedAppend(clampTo<float>(0.7152 + 0.2848 * oneMinusAmount));
+    matrix.uncheckedAppend(clampTo<float>(0.0722 - 0.0722 * oneMinusAmount));
     endMatrixRow(matrix);
 
-    matrix.uncheckedAppend(narrowPrecisionToFloat(0.2126 - 0.2126 * oneMinusAmount));
-    matrix.uncheckedAppend(narrowPrecisionToFloat(0.7152 - 0.7152 * oneMinusAmount));
-    matrix.uncheckedAppend(narrowPrecisionToFloat(0.0722 + 0.9278 * oneMinusAmount));
+    matrix.uncheckedAppend(clampTo<float>(0.2126 - 0.2126 * oneMinusAmount));
+    matrix.uncheckedAppend(clampTo<float>(0.7152 - 0.7152 * oneMinusAmount));
+    matrix.uncheckedAppend(clampTo<float>(0.0722 + 0.9278 * oneMinusAmount));
     endMatrixRow(matrix);
 
     lastMatrixRow(matrix);
     return matrix;
 }
 
 Vector<float> sepiaMatrix(double amount)
 {
     double oneMinusAmount = clampTo(1 - amount, 0.0, 1.0);
 
     // See https://dvcs.w3.org/hg/FXTF/raw-file/tip/filters/index.html#sepiaEquivalent
     // for information on parameters.
     Vector<float> matrix;
     matrix.reserveInitialCapacity(20);
 
-    matrix.uncheckedAppend(narrowPrecisionToFloat(0.393 + 0.607 * oneMinusAmount));
-    matrix.uncheckedAppend(narrowPrecisionToFloat(0.769 - 0.769 * oneMinusAmount));
-    matrix.uncheckedAppend(narrowPrecisionToFloat(0.189 - 0.189 * oneMinusAmount));
+    matrix.uncheckedAppend(clampTo<float>(0.393 + 0.607 * oneMinusAmount));
+    matrix.uncheckedAppend(clampTo<float>(0.769 - 0.769 * oneMinusAmount));
+    matrix.uncheckedAppend(clampTo<float>(0.189 - 0.189 * oneMinusAmount));
     endMatrixRow(matrix);
 
-    matrix.uncheckedAppend(narrowPrecisionToFloat(0.349 - 0.349 * oneMinusAmount));
-    matrix.uncheckedAppend(narrowPrecisionToFloat(0.686 + 0.314 * oneMinusAmount));
-    matrix.uncheckedAppend(narrowPrecisionToFloat(0.168 - 0.168 * oneMinusAmount));
+    matrix.uncheckedAppend(clampTo<float>(0.349 - 0.349 * oneMinusAmount));
+    matrix.uncheckedAppend(clampTo<float>(0.686 + 0.314 * oneMinusAmount));
+    matrix.uncheckedAppend(clampTo<float>(0.168 - 0.168 * oneMinusAmount));
     endMatrixRow(matrix);
 
-    matrix.uncheckedAppend(narrowPrecisionToFloat(0.272 - 0.272 * oneMinusAmount));
-    matrix.uncheckedAppend(narrowPrecisionToFloat(0.534 - 0.534 * oneMinusAmount));
-    matrix.uncheckedAppend(narrowPrecisionToFloat(0.131 + 0.869 * oneMinusAmount));
+    matrix.uncheckedAppend(clampTo<float>(0.272 - 0.272 * oneMinusAmount));
+    matrix.uncheckedAppend(clampTo<float>(0.534 - 0.534 * oneMinusAmount));
+    matrix.uncheckedAppend(clampTo<float>(0.131 + 0.869 * oneMinusAmount));
     endMatrixRow(matrix);
 
     lastMatrixRow(matrix);
     return matrix;
 }
 
 FloatRect computeReferenceBox(const Element& element, const FloatSize* zoomedReferenceBoxSize, float zoom)
 {
     FloatRect box;
     if (zoomedReferenceBoxSize) {
@@ skipping 40 matching lines @@
             effect = FEColorMatrix::create(parentFilter, FECOLORMATRIX_TYPE_MATRIX, inputParameters);
             break;
         }
         case FilterOperation::SEPIA: {
             Vector<float> inputParameters = sepiaMatrix(toBasicColorMatrixFilterOperation(filterOperation)->amount());
             effect = FEColorMatrix::create(parentFilter, FECOLORMATRIX_TYPE_MATRIX, inputParameters);
             break;
         }
         case FilterOperation::SATURATE: {
             Vector<float> inputParameters;
-            inputParameters.append(narrowPrecisionToFloat(toBasicColorMatrixFilterOperation(filterOperation)->amount()));
+            inputParameters.append(clampTo<float>(toBasicColorMatrixFilterOperation(filterOperation)->amount()));
             effect = FEColorMatrix::create(parentFilter, FECOLORMATRIX_TYPE_SATURATE, inputParameters);
             break;
         }
         case FilterOperation::HUE_ROTATE: {
             Vector<float> inputParameters;
-            inputParameters.append(narrowPrecisionToFloat(toBasicColorMatrixFilterOperation(filterOperation)->amount()));
+            inputParameters.append(clampTo<float>(toBasicColorMatrixFilterOperation(filterOperation)->amount()));
             effect = FEColorMatrix::create(parentFilter, FECOLORMATRIX_TYPE_HUEROTATE, inputParameters);
             break;
         }
         case FilterOperation::INVERT: {
             BasicComponentTransferFilterOperation* componentTransferOperation = toBasicComponentTransferFilterOperation(filterOperation);
             ComponentTransferFunction transferFunction;
             transferFunction.type = FECOMPONENTTRANSFER_TYPE_TABLE;
             Vector<float> transferParameters;
-            transferParameters.append(narrowPrecisionToFloat(componentTransferOperation->amount()));
-            transferParameters.append(narrowPrecisionToFloat(1 - componentTransferOperation->amount()));
+            transferParameters.append(clampTo<float>(componentTransferOperation->amount()));
+            transferParameters.append(clampTo<float>(1 - componentTransferOperation->amount()));
             transferFunction.tableValues = transferParameters;
 
             ComponentTransferFunction nullFunction;
             effect = FEComponentTransfer::create(parentFilter, transferFunction, transferFunction, transferFunction, nullFunction);
             break;
         }
         case FilterOperation::OPACITY: {
             ComponentTransferFunction transferFunction;
             transferFunction.type = FECOMPONENTTRANSFER_TYPE_TABLE;
             Vector<float> transferParameters;
             transferParameters.append(0);
-            transferParameters.append(narrowPrecisionToFloat(toBasicComponentTransferFilterOperation(filterOperation)->amount()));
+            transferParameters.append(clampTo<float>(toBasicComponentTransferFilterOperation(filterOperation)->amount()));
             transferFunction.tableValues = transferParameters;
 
             ComponentTransferFunction nullFunction;
             effect = FEComponentTransfer::create(parentFilter, nullFunction, nullFunction, nullFunction, transferFunction);
             break;
         }
         case FilterOperation::BRIGHTNESS: {
             ComponentTransferFunction transferFunction;
             transferFunction.type = FECOMPONENTTRANSFER_TYPE_LINEAR;
-            transferFunction.slope = narrowPrecisionToFloat(toBasicComponentTransferFilterOperation(filterOperation)->amount());
+            transferFunction.slope = clampTo<float>(toBasicComponentTransferFilterOperation(filterOperation)->amount());
             transferFunction.intercept = 0;
 
             ComponentTransferFunction nullFunction;
             effect = FEComponentTransfer::create(parentFilter, transferFunction, transferFunction, transferFunction, nullFunction);
             break;
         }
         case FilterOperation::CONTRAST: {
             ComponentTransferFunction transferFunction;
             transferFunction.type = FECOMPONENTTRANSFER_TYPE_LINEAR;
-            float amount = narrowPrecisionToFloat(toBasicComponentTransferFilterOperation(filterOperation)->amount());
+            float amount = clampTo<float>(toBasicComponentTransferFilterOperation(filterOperation)->amount());
             transferFunction.slope = amount;
             transferFunction.intercept = -0.5 * amount + 0.5;
 
             ComponentTransferFunction nullFunction;
             effect = FEComponentTransfer::create(parentFilter, transferFunction, transferFunction, transferFunction, nullFunction);
             break;
         }
         case FilterOperation::BLUR: {
             float stdDeviation = floatValueForLength(toBlurFilterOperation(filterOperation)->stdDeviation(), 0);
             effect = FEGaussianBlur::create(parentFilter, stdDeviation, stdDeviation);
@@ skipping 79 matching lines @@
     if (!previousEffect)
         previousEffect = result->getSourceGraphic();
     SVGFilterBuilder builder(previousEffect, nodeMap, fillPaint, strokePaint);
     builder.buildGraph(result, filterElement, referenceBox);
     result->setLastEffect(builder.lastEffect());
     return result;
 }
 
 } // namespace blink