| Index: Source/platform/graphics/filters/FEConvolveMatrix.cpp
|
| diff --git a/Source/platform/graphics/filters/FEConvolveMatrix.cpp b/Source/platform/graphics/filters/FEConvolveMatrix.cpp
|
| index ea854710995810b11f32ef35b9ac93f4565b31f2..9bdbd8c288cb6ca96f850e4d7af929c37e5a4512 100644
|
| --- a/Source/platform/graphics/filters/FEConvolveMatrix.cpp
|
| +++ b/Source/platform/graphics/filters/FEConvolveMatrix.cpp
|
| @@ -460,7 +460,7 @@ void FEConvolveMatrix::applySoftware()
|
|
|
| int optimalThreadNumber = (absolutePaintRect().width() * absolutePaintRect().height()) / s_minimalRectDimension;
|
| if (optimalThreadNumber > 1) {
|
| - ParallelJobs<InteriorPixelParameters> parallelJobs(&blink::FEConvolveMatrix::setInteriorPixelsWorker, optimalThreadNumber);
|
| + ParallelJobs<InteriorPixelParameters> parallelJobs(&FEConvolveMatrix::setInteriorPixelsWorker, optimalThreadNumber);
|
| const int numOfThreads = parallelJobs.numberOfJobs();
|
|
|
| // Split the job into "heightPerThread" jobs but there a few jobs that need to be slightly larger since
|
| @@ -502,24 +502,20 @@ void FEConvolveMatrix::applySoftware()
|
| }
|
| }
|
|
|
| -SkMatrixConvolutionImageFilter::TileMode toSkiaTileMode(blink::EdgeModeType edgeMode)
|
| +SkMatrixConvolutionImageFilter::TileMode toSkiaTileMode(EdgeModeType edgeMode)
|
| {
|
| switch (edgeMode) {
|
| - case blink::EDGEMODE_DUPLICATE:
|
| + case EDGEMODE_DUPLICATE:
|
| return SkMatrixConvolutionImageFilter::kClamp_TileMode;
|
| - case blink::EDGEMODE_WRAP:
|
| + case EDGEMODE_WRAP:
|
| return SkMatrixConvolutionImageFilter::kRepeat_TileMode;
|
| - case blink::EDGEMODE_NONE:
|
| + case EDGEMODE_NONE:
|
| return SkMatrixConvolutionImageFilter::kClampToBlack_TileMode;
|
| default:
|
| return SkMatrixConvolutionImageFilter::kClamp_TileMode;
|
| }
|
| }
|
|
|
| -}; // unnamed namespace
|
| -
|
| -namespace blink {
|
| -
|
| PassRefPtr<SkImageFilter> FEConvolveMatrix::createImageFilter(SkiaImageFilterBuilder* builder)
|
| {
|
| RefPtr<SkImageFilter> input(builder->build(inputEffect(0), operatingColorSpace()));
|
|
|