commit 1be1f8d097da4d4c07b4a1fa16013b0d440e4308
author Mike Reed <reed@google.com> Wed Mar 14 13:01:17 2018 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed Mar 14 17:27:36 2018 +0000
tree 0d0d96a7ad0dcf35cc40838c5f0041e43929b384
parent c29c76aae518a9c368248063e84a96ffe8c75b90

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 <reed@google.com>
Reviewed-by: Florin Malita <fmalita@chromium.org>

samplecode/SampleBlur.cpp

diff --git a/samplecode/SampleBlur.cpp b/samplecode/SampleBlur.cpp
index a5e5a18..5890ce6 100644
--- a/samplecode/SampleBlur.cpp
+++ b/samplecode/SampleBlur.cpp
@@ -8,10 +8,10 @@
 #include "SampleCode.h"
 #include "SkBitmap.h"
 #include "SkBlurMask.h"
-#include "SkBlurMaskFilter.h"
 #include "SkCanvas.h"
 #include "SkColorPriv.h"
 #include "SkGradientShader.h"
+#include "SkMaskFilter.h"
 #include "SkUtils.h"
 #include "SkView.h"
 
@@ -54,40 +54,31 @@
         paint.setTextSize(25);
         canvas->translate(-40, 0);
 
-        SkBlurMaskFilter::BlurFlags flags = SkBlurMaskFilter::kNone_BlurFlag;
-        for (int j = 0; j < 2; j++) {
-            canvas->save();
-            paint.setColor(SK_ColorBLUE);
-            for (size_t i = 0; i < SK_ARRAY_COUNT(gRecs); i++) {
-                if (gRecs[i].fStyle != NONE) {
-                    paint.setMaskFilter(SkBlurMaskFilter::Make(gRecs[i].fStyle,
-                                      SkBlurMask::ConvertRadiusToSigma(SkIntToScalar(20)),
-                                      flags));
-                } else {
-                    paint.setMaskFilter(nullptr);
-                }
-                canvas->drawCircle(200 + gRecs[i].fCx*100.f,
-                                   200 + gRecs[i].fCy*100.f, 50, paint);
-            }
-            // draw text
-            {
-                paint.setMaskFilter(SkBlurMaskFilter::Make(kNormal_SkBlurStyle,
-                                                           SkBlurMask::ConvertRadiusToSigma(4),
-                                                           flags));
-                SkScalar x = SkIntToScalar(70);
-                SkScalar y = SkIntToScalar(400);
-                paint.setColor(SK_ColorBLACK);
-                canvas->drawString("Hamburgefons Style", x, y, paint);
-                canvas->drawString("Hamburgefons Style", x, y + SkIntToScalar(50), paint);
+        paint.setColor(SK_ColorBLUE);
+        for (size_t i = 0; i < SK_ARRAY_COUNT(gRecs); i++) {
+            if (gRecs[i].fStyle != NONE) {
+                paint.setMaskFilter(SkMaskFilter::MakeBlur(gRecs[i].fStyle,
+                                    SkBlurMask::ConvertRadiusToSigma(SkIntToScalar(20))));
+            } else {
                 paint.setMaskFilter(nullptr);
-                paint.setColor(SK_ColorWHITE);
-                x -= SkIntToScalar(2);
-                y -= SkIntToScalar(2);
-                canvas->drawString("Hamburgefons Style", x, y, paint);
             }
-            canvas->restore();
-            flags = SkBlurMaskFilter::kHighQuality_BlurFlag;
-            canvas->translate(350, 0);
+            canvas->drawCircle(200 + gRecs[i].fCx*100.f,
+                               200 + gRecs[i].fCy*100.f, 50, paint);
+        }
+        // draw text
+        {
+            paint.setMaskFilter(SkMaskFilter::MakeBlur(kNormal_SkBlurStyle,
+                                                       SkBlurMask::ConvertRadiusToSigma(4)));
+            SkScalar x = SkIntToScalar(70);
+            SkScalar y = SkIntToScalar(400);
+            paint.setColor(SK_ColorBLACK);
+            canvas->drawString("Hamburgefons Style", x, y, paint);
+            canvas->drawString("Hamburgefons Style", x, y + SkIntToScalar(50), paint);
+            paint.setMaskFilter(nullptr);
+            paint.setColor(SK_ColorWHITE);
+            x -= SkIntToScalar(2);
+            y -= SkIntToScalar(2);
+            canvas->drawString("Hamburgefons Style", x, y, paint);
         }
     }