Use newer Skia API for constructing mask blur filters (flutter#4875)

Old API is going to be hidden/removed soon
jnuhwb · Mar 27, 2018 · 6473f1b · 6473f1b
1 parent 5bfdc8f
commit 6473f1b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/sky/engine/platform/graphics/DrawLooperBuilder.cpp b/sky/engine/platform/graphics/DrawLooperBuilder.cpp
@@ -37,8 +37,8 @@
 #include "third_party/skia/include/core/SkColor.h"
 #include "third_party/skia/include/core/SkColorFilter.h"
 #include "third_party/skia/include/core/SkDrawLooper.h"
+#include "third_party/skia/include/core/SkMaskFilter.h"
 #include "third_party/skia/include/core/SkPaint.h"
-#include "third_party/skia/include/effects/SkBlurMaskFilter.h"
 
 namespace blink {
 
@@ -100,11 +100,9 @@ void DrawLooperBuilder::addShadow(const FloatSize& offset,
 
   if (blur) {
     const SkScalar sigma = RadiusToSigma(blur / 2);
-    uint32_t mfFlags = SkBlurMaskFilter::kHighQuality_BlurFlag;
-    if (shadowTransformMode == ShadowIgnoresTransforms)
-      mfFlags |= SkBlurMaskFilter::kIgnoreTransform_BlurFlag;
+    bool respectCTM = (shadowTransformMode != ShadowIgnoresTransforms);
     paint->setMaskFilter(
-        SkBlurMaskFilter::Make(kNormal_SkBlurStyle, sigma, mfFlags));
+        SkMaskFilter::MakeBlur(kNormal_SkBlurStyle, sigma, respectCTM));
   }
 
   paint->setColorFilter(

diff --git a/sky/engine/platform/graphics/GraphicsContext.cpp b/sky/engine/platform/graphics/GraphicsContext.cpp
@@ -37,11 +37,11 @@
 #include "third_party/skia/include/core/SkAnnotation.h"
 #include "third_party/skia/include/core/SkColorFilter.h"
 #include "third_party/skia/include/core/SkData.h"
+#include "third_party/skia/include/core/SkMaskFilter.h"
 #include "third_party/skia/include/core/SkPicture.h"
 #include "third_party/skia/include/core/SkRRect.h"
 #include "third_party/skia/include/core/SkRefCnt.h"
 #include "third_party/skia/include/core/SkSurface.h"
-#include "third_party/skia/include/effects/SkBlurMaskFilter.h"
 #include "third_party/skia/include/effects/SkCornerPathEffect.h"
 #include "third_party/skia/include/effects/SkLumaColorFilter.h"
 #include "third_party/skia/include/effects/SkPictureImageFilter.h"