| Index: Source/platform/graphics/filters/FEColorMatrix.cpp
|
| diff --git a/Source/core/platform/graphics/filters/FEColorMatrix.cpp b/Source/platform/graphics/filters/FEColorMatrix.cpp
|
| similarity index 95%
|
| rename from Source/core/platform/graphics/filters/FEColorMatrix.cpp
|
| rename to Source/platform/graphics/filters/FEColorMatrix.cpp
|
| index 1e2c5a41816b3eb5536f9fc5d227b14ca13fc307..e56df350beb67b0101d2d33fdb58d837883781f4 100644
|
| --- a/Source/core/platform/graphics/filters/FEColorMatrix.cpp
|
| +++ b/Source/platform/graphics/filters/FEColorMatrix.cpp
|
| @@ -22,9 +22,10 @@
|
| */
|
|
|
| #include "config.h"
|
| +#include "platform/graphics/filters/FEColorMatrix.h"
|
|
|
| -#include "core/platform/graphics/filters/FEColorMatrix.h"
|
| -
|
| +#include "SkColorFilterImageFilter.h"
|
| +#include "SkColorMatrixFilter.h"
|
| #include "platform/graphics/GraphicsContext.h"
|
| #include "platform/graphics/filters/SkiaImageFilterBuilder.h"
|
| #include "platform/graphics/skia/NativeImageSkia.h"
|
| @@ -32,9 +33,6 @@
|
| #include "wtf/MathExtras.h"
|
| #include "wtf/Uint8ClampedArray.h"
|
|
|
| -#include "SkColorFilterImageFilter.h"
|
| -#include "SkColorMatrixFilter.h"
|
| -
|
| namespace WebCore {
|
|
|
| FEColorMatrix::FEColorMatrix(Filter* filter, ColorMatrixType type, const Vector<float>& values)
|
| @@ -125,16 +123,16 @@ void effectType(Uint8ClampedArray* pixelArray, const Vector<float>& values)
|
| float alpha = pixelArray->item(pixelByteOffset + 3);
|
|
|
| switch (filterType) {
|
| - case FECOLORMATRIX_TYPE_MATRIX:
|
| - matrix(red, green, blue, alpha, values);
|
| - break;
|
| - case FECOLORMATRIX_TYPE_SATURATE:
|
| - case FECOLORMATRIX_TYPE_HUEROTATE:
|
| - saturateAndHueRotate(red, green, blue, components);
|
| - break;
|
| - case FECOLORMATRIX_TYPE_LUMINANCETOALPHA:
|
| - luminance(red, green, blue, alpha);
|
| - break;
|
| + case FECOLORMATRIX_TYPE_MATRIX:
|
| + matrix(red, green, blue, alpha, values);
|
| + break;
|
| + case FECOLORMATRIX_TYPE_SATURATE:
|
| + case FECOLORMATRIX_TYPE_HUEROTATE:
|
| + saturateAndHueRotate(red, green, blue, components);
|
| + break;
|
| + case FECOLORMATRIX_TYPE_LUMINANCETOALPHA:
|
| + luminance(red, green, blue, alpha);
|
| + break;
|
| }
|
|
|
| pixelArray->set(pixelByteOffset, red);
|
|
|