| Index: Source/platform/graphics/filters/FEBlend.cpp
|
| diff --git a/Source/core/platform/graphics/filters/FEBlend.cpp b/Source/platform/graphics/filters/FEBlend.cpp
|
| similarity index 98%
|
| rename from Source/core/platform/graphics/filters/FEBlend.cpp
|
| rename to Source/platform/graphics/filters/FEBlend.cpp
|
| index 524013b71fcc3b8c8e8ba3017a09456ffbc2f39e..0953b91c784ffe2ac0d9f059d21034a354a7868b 100644
|
| --- a/Source/core/platform/graphics/filters/FEBlend.cpp
|
| +++ b/Source/platform/graphics/filters/FEBlend.cpp
|
| @@ -23,18 +23,17 @@
|
| */
|
|
|
| #include "config.h"
|
| +#include "platform/graphics/filters/FEBlend.h"
|
|
|
| -#include "core/platform/graphics/cpu/arm/filters/FEBlendNEON.h"
|
| -#include "core/platform/graphics/filters/FEBlend.h"
|
| +#include "SkBitmapSource.h"
|
| +#include "SkXfermodeImageFilter.h"
|
| #include "platform/graphics/GraphicsContext.h"
|
| +#include "platform/graphics/cpu/arm/filters/FEBlendNEON.h"
|
| #include "platform/graphics/filters/SkiaImageFilterBuilder.h"
|
| #include "platform/graphics/skia/NativeImageSkia.h"
|
| #include "platform/text/TextStream.h"
|
| #include "wtf/Uint8ClampedArray.h"
|
|
|
| -#include "SkBitmapSource.h"
|
| -#include "SkXfermodeImageFilter.h"
|
| -
|
| typedef unsigned char (*BlendType)(unsigned char colorA, unsigned char colorB, unsigned char alphaA, unsigned char alphaB);
|
|
|
| namespace WebCore {
|
| @@ -166,8 +165,9 @@ void FEBlend::applySoftware()
|
| ASSERT(pixelArrayLength == srcPixelArrayB->length());
|
|
|
| #if HAVE(ARM_NEON_INTRINSICS)
|
| - if (pixelArrayLength >= 8)
|
| + if (pixelArrayLength >= 8) {
|
| platformApplyNEON(srcPixelArrayA->data(), srcPixelArrayB->data(), dstPixelArray->data(), pixelArrayLength);
|
| + }
|
| else { // If there is just one pixel we expand it to two.
|
| ASSERT(pixelArrayLength > 0);
|
| uint32_t sourceA[2] = {0, 0};
|
|
|