From 1be1f8d097da4d4c07b4a1fa16013b0d440e4308 Mon Sep 17 00:00:00 2001 From: Mike Reed Date: Wed, 14 Mar 2018 13:01:17 -0400 Subject: hide SkBlurMaskFilter and SkBlurQuality SK_SUPPORT_LEGACY_BLURMASKFILTER Bug: skia: Change-Id: Ic3e27e08e6e3cd2ffc1cd13b044e197bebc96236 Reviewed-on: https://skia-review.googlesource.com/113940 Commit-Queue: Mike Reed Reviewed-by: Florin Malita --- tools/debugger/SkDrawCommand.cpp | 27 +-------------------------- 1 file changed, 1 insertion(+), 26 deletions(-) (limited to 'tools/debugger') diff --git a/tools/debugger/SkDrawCommand.cpp b/tools/debugger/SkDrawCommand.cpp index a99ff6d2b1..076dac57a5 100644 --- a/tools/debugger/SkDrawCommand.cpp +++ b/tools/debugger/SkDrawCommand.cpp @@ -10,7 +10,6 @@ #include "png.h" #include "SkAutoMalloc.h" -#include "SkBlurMaskFilter.h" #include "SkColorFilter.h" #include "SkDashPathEffect.h" #include "SkImageFilter.h" @@ -1124,18 +1123,6 @@ static void apply_paint_maskfilter(const SkPaint& paint, Json::Value* target, default: SkASSERT(false); } - switch (blurRec.fQuality) { - case SkBlurQuality::kLow_SkBlurQuality: - blur[SKDEBUGCANVAS_ATTRIBUTE_QUALITY] = Json::Value( - SKDEBUGCANVAS_BLURQUALITY_LOW); - break; - case SkBlurQuality::kHigh_SkBlurQuality: - blur[SKDEBUGCANVAS_ATTRIBUTE_QUALITY] = Json::Value( - SKDEBUGCANVAS_BLURQUALITY_HIGH); - break; - default: - SkASSERT(false); - } (*target)[SKDEBUGCANVAS_ATTRIBUTE_BLUR] = blur; } else { Json::Value jsonMaskFilter; @@ -1590,19 +1577,7 @@ static void extract_json_paint_blur(Json::Value& jsonPaint, SkPaint* target) { SkASSERT(false); style = SkBlurStyle::kNormal_SkBlurStyle; } - SkBlurMaskFilter::BlurFlags flags; - const char* jsonQuality = blur[SKDEBUGCANVAS_ATTRIBUTE_QUALITY].asCString(); - if (!strcmp(jsonQuality, SKDEBUGCANVAS_BLURQUALITY_LOW)) { - flags = SkBlurMaskFilter::BlurFlags::kNone_BlurFlag; - } - else if (!strcmp(jsonQuality, SKDEBUGCANVAS_BLURQUALITY_HIGH)) { - flags = SkBlurMaskFilter::BlurFlags::kHighQuality_BlurFlag; - } - else { - SkASSERT(false); - flags = SkBlurMaskFilter::BlurFlags::kNone_BlurFlag; - } - target->setMaskFilter(SkBlurMaskFilter::Make(style, sigma, flags)); + target->setMaskFilter(SkMaskFilter::MakeBlur(style, sigma)); } } -- cgit v1.2.3