Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / platform / graphics / filters / FEConvolveMatrix.cpp

diff --git a/src/third_party/WebKit/Source/platform/graphics/filters/FEConvolveMatrix.cpp b/src/third_party/WebKit/Source/platform/graphics/filters/FEConvolveMatrix.cpp
index 418f19b..9bdbd8c 100644 (file)
--- a/src/third_party/WebKit/Source/platform/graphics/filters/FEConvolveMatrix.cpp
+++ b/src/third_party/WebKit/Source/platform/graphics/filters/FEConvolveMatrix.cpp
@@ -32,7 +32,7 @@
 #include "wtf/OwnPtr.h"
 #include "wtf/Uint8ClampedArray.h"
 
-namespace WebCore {
+namespace blink {
 
 FEConvolveMatrix::FEConvolveMatrix(Filter* filter, const IntSize& kernelSize,
     float divisor, float bias, const IntPoint& targetOffset, EdgeModeType edgeMode,
@@ -460,7 +460,7 @@ void FEConvolveMatrix::applySoftware()
 
         int optimalThreadNumber = (absolutePaintRect().width() * absolutePaintRect().height()) / s_minimalRectDimension;
         if (optimalThreadNumber > 1) {
-            ParallelJobs<InteriorPixelParameters> parallelJobs(&WebCore::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(WebCore::EdgeModeType edgeMode)
+SkMatrixConvolutionImageFilter::TileMode toSkiaTileMode(EdgeModeType edgeMode)
 {
     switch (edgeMode) {
-    case WebCore::EDGEMODE_DUPLICATE:
+    case EDGEMODE_DUPLICATE:
         return SkMatrixConvolutionImageFilter::kClamp_TileMode;
-    case WebCore::EDGEMODE_WRAP:
+    case EDGEMODE_WRAP:
         return SkMatrixConvolutionImageFilter::kRepeat_TileMode;
-    case WebCore::EDGEMODE_NONE:
+    case EDGEMODE_NONE:
         return SkMatrixConvolutionImageFilter::kClampToBlack_TileMode;
     default:
         return SkMatrixConvolutionImageFilter::kClamp_TileMode;
     }
 }
 
-}; // unnamed namespace
-
-namespace WebCore {
-
 PassRefPtr<SkImageFilter> FEConvolveMatrix::createImageFilter(SkiaImageFilterBuilder* builder)
 {
     RefPtr<SkImageFilter> input(builder->build(inputEffect(0), operatingColorSpace()));
@@ -527,7 +523,7 @@ PassRefPtr<SkImageFilter> FEConvolveMatrix::createImageFilter(SkiaImageFilterBui
     SkISize kernelSize(SkISize::Make(m_kernelSize.width(), m_kernelSize.height()));
     int numElements = kernelSize.width() * kernelSize.height();
     SkScalar gain = SkFloatToScalar(1.0f / m_divisor);
-    SkScalar bias = SkFloatToScalar(m_bias);
+    SkScalar bias = SkFloatToScalar(m_bias * 255);
     SkIPoint target = SkIPoint::Make(m_targetOffset.x(), m_targetOffset.y());
     SkMatrixConvolutionImageFilter::TileMode tileMode = toSkiaTileMode(m_edgeMode);
     bool convolveAlpha = !m_preserveAlpha;
@@ -574,4 +570,4 @@ TextStream& FEConvolveMatrix::externalRepresentation(TextStream& ts, int indent)
     return ts;
 }
 
-}; // namespace WebCore
+}; // namespace blink