diff options
| author | Mike Reed <reed@google.com> | 2018-03-13 11:48:30 -0400 |
|---|---|---|
| committer | Mike Reed <reed@google.com> | 2018-03-13 15:53:32 +0000 |
| commit | 1b9eeb161defbcf4d48e1672477b79a2bcdc98f0 (patch) | |
| tree | b6cbffc9ee06cddbbda93710a6fa10a557ae16f4 | |
| parent | 21a7cfa2b235985ece0ef51d086bcf41b8e3dcd1 (diff) | |
update call-sites to use SkMaskFilter::MakeBlur
Blur is now part of the core, so SkBlurMaskFilter.h is deprecated
Test: make
Change-Id: I06dd34972f34151e3c7f1e9d384ab2bd39890a56
| -rw-r--r-- | core/jni/android/graphics/MaskFilter.cpp | 2 | ||||
| -rw-r--r-- | libs/hwui/pipeline/skia/ReorderBarrierDrawables.cpp | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/core/jni/android/graphics/MaskFilter.cpp b/core/jni/android/graphics/MaskFilter.cpp index 3e3de5aade7f..33d346f5d379 100644 --- a/core/jni/android/graphics/MaskFilter.cpp +++ b/core/jni/android/graphics/MaskFilter.cpp @@ -23,7 +23,7 @@ public: static jlong createBlur(JNIEnv* env, jobject, jfloat radius, jint blurStyle) { SkScalar sigma = SkBlurMask::ConvertRadiusToSigma(radius); - SkMaskFilter* filter = SkBlurMaskFilter::Make((SkBlurStyle)blurStyle, sigma).release(); + SkMaskFilter* filter = SkMaskFilter::MakeBlur((SkBlurStyle)blurStyle, sigma).release(); ThrowIAE_IfNull(env, filter); return reinterpret_cast<jlong>(filter); } diff --git a/libs/hwui/pipeline/skia/ReorderBarrierDrawables.cpp b/libs/hwui/pipeline/skia/ReorderBarrierDrawables.cpp index 25c51f2716e6..6e7a5b313cc5 100644 --- a/libs/hwui/pipeline/skia/ReorderBarrierDrawables.cpp +++ b/libs/hwui/pipeline/skia/ReorderBarrierDrawables.cpp @@ -19,8 +19,6 @@ #include "SkiaDisplayList.h" #include "SkiaPipeline.h" -#include <SkBlurMask.h> -#include <SkBlurMaskFilter.h> #include <SkPathOps.h> #include <SkRRectsGaussianEdgeMaskFilter.h> #include <SkShadowUtils.h> |