Upstream version 7.36.149.0

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

diff --git a/src/third_party/WebKit/Source/platform/graphics/filters/FETurbulence.cpp b/src/third_party/WebKit/Source/platform/graphics/filters/FETurbulence.cpp
index d3c7bf8..e79a7c9 100644 (file)
--- a/src/third_party/WebKit/Source/platform/graphics/filters/FETurbulence.cpp
+++ b/src/third_party/WebKit/Source/platform/graphics/filters/FETurbulence.cpp
@@ -404,13 +404,19 @@ void FETurbulence::applySoftware()
 SkShader* FETurbulence::createShader(const IntRect& filterRegion)
 {
     const SkISize size = SkISize::Make(filterRegion.width(), filterRegion.height());
-    float baseFrequencyX = 1.0f / filter()->applyHorizontalScale(1.0f / m_baseFrequencyX);
-    const float baseFrequencyY = 1.0f / filter()->applyVerticalScale(1.0f / m_baseFrequencyY);
+    // Frequency should be scaled by page zoom, but not by primitiveUnits.
+    // So we apply only the transform scale (as Filter::apply*Scale() do)
+    // and not the target bounding box scale (as SVGFilter::apply*Scale()
+    // would do). Note also that we divide by the scale since this is
+    // a frequency, not a period.
+    const AffineTransform& absoluteTransform = filter()->absoluteTransform();
+    float baseFrequencyX = m_baseFrequencyX / absoluteTransform.a();
+    float baseFrequencyY = m_baseFrequencyY / absoluteTransform.d();
     return (type() == FETURBULENCE_TYPE_FRACTALNOISE) ?
         SkPerlinNoiseShader::CreateFractalNoise(SkFloatToScalar(baseFrequencyX),
             SkFloatToScalar(baseFrequencyY), numOctaves(), SkFloatToScalar(seed()),
             stitchTiles() ? &size : 0) :
-        SkPerlinNoiseShader::CreateTubulence(SkFloatToScalar(baseFrequencyX),
+        SkPerlinNoiseShader::CreateTurbulence(SkFloatToScalar(baseFrequencyX),
             SkFloatToScalar(baseFrequencyY), numOctaves(), SkFloatToScalar(seed()),
             stitchTiles() ? &size : 0);
 }