aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--gn/effects.gni1
-rw-r--r--include/core/SkBlurTypes.h9
-rw-r--r--include/core/SkDrawLooper.h3
-rw-r--r--include/effects/SkBlurMaskFilter.h34
-rw-r--r--src/core/SkBlurMF.cpp3
-rw-r--r--src/core/SkMaskFilterBase.h3
-rw-r--r--src/effects/SkBlurMaskFilter.cpp17
-rw-r--r--src/effects/SkLayerDrawLooper.cpp3
-rw-r--r--tests/BlurTest.cpp9
9 files changed, 0 insertions, 82 deletions
diff --git a/gn/effects.gni b/gn/effects.gni
index 4208306df8..7ea768ba25 100644
--- a/gn/effects.gni
+++ b/gn/effects.gni
@@ -17,7 +17,6 @@ skia_effects_sources = [
"$_src/effects/Sk2DPathEffect.cpp",
"$_src/effects/SkAlphaThresholdFilter.cpp",
"$_src/effects/SkArithmeticImageFilter.cpp",
- "$_src/effects/SkBlurMaskFilter.cpp",
"$_src/effects/SkColorFilterImageFilter.cpp",
"$_src/effects/SkColorMatrix.cpp",
"$_src/effects/SkColorMatrixFilter.cpp",
diff --git a/include/core/SkBlurTypes.h b/include/core/SkBlurTypes.h
index 49a4e1914e..1272643330 100644
--- a/include/core/SkBlurTypes.h
+++ b/include/core/SkBlurTypes.h
@@ -19,13 +19,4 @@ enum SkBlurStyle {
kLastEnum_SkBlurStyle = kInner_SkBlurStyle
};
-#ifdef SK_SUPPORT_LEGACY_BLURMASKFILTER
-enum SkBlurQuality {
- kLow_SkBlurQuality, //!< e.g. box filter
- kHigh_SkBlurQuality, //!< e.g. 3-pass similar to gaussian
-
- kLastEnum_SkBlurQuality
-};
-#endif
-
#endif
diff --git a/include/core/SkDrawLooper.h b/include/core/SkDrawLooper.h
index e318e113b5..4280daa4a9 100644
--- a/include/core/SkDrawLooper.h
+++ b/include/core/SkDrawLooper.h
@@ -84,9 +84,6 @@ public:
SkVector fOffset;
SkColor fColor;
SkBlurStyle fStyle;
-#ifdef SK_SUPPORT_LEGACY_BLURMASKFILTER
- SkBlurQuality fQuality;
-#endif
};
/**
* If this looper can be interpreted as having two layers, such that
diff --git a/include/effects/SkBlurMaskFilter.h b/include/effects/SkBlurMaskFilter.h
index 5a0f7adaad..86e7d12e97 100644
--- a/include/effects/SkBlurMaskFilter.h
+++ b/include/effects/SkBlurMaskFilter.h
@@ -18,35 +18,6 @@ class SkRRect;
class SK_API SkBlurMaskFilter {
public:
-#ifdef SK_SUPPORT_LEGACY_BLURMASKFILTER
- enum BlurFlags {
- kNone_BlurFlag = 0x00,
- /** The blur layer's radius is not affected by transforms */
- kIgnoreTransform_BlurFlag = 0x01,
- /** Use a smother, higher qulity blur algorithm */
- kHighQuality_BlurFlag = 0x02,
- /** mask for all blur flags */
- kAll_BlurFlag = 0x03
- };
-
- /** Create a blur maskfilter.
- * @param style The SkBlurStyle to use
- * @param sigma Standard deviation of the Gaussian blur to apply. Must be > 0.
- * @param occluder The rect for which no pixels need be drawn (b.c. it will be overdrawn
- * with some opaque object. This is just a hint which backends are free to
- * ignore.
- * @param flags Flags to use - defaults to none
- * @return The new blur maskfilter
- */
- static sk_sp<SkMaskFilter> Make(SkBlurStyle style, SkScalar sigma,
- const SkRect& occluder, uint32_t flags = kNone_BlurFlag);
-
- static sk_sp<SkMaskFilter> Make(SkBlurStyle style, SkScalar sigma,
- uint32_t flags = kNone_BlurFlag) {
- return Make(style, sigma, SkRect::MakeEmpty(), flags);
- }
-#endif
-
#ifdef SK_SUPPORT_LEGACY_EMBOSSMASKFILTER
/** Create an emboss maskfilter
@param blurSigma standard deviation of the Gaussian blur to apply
@@ -59,11 +30,6 @@ public:
static sk_sp<SkMaskFilter> MakeEmboss(SkScalar blurSigma, const SkScalar direction[3],
SkScalar ambient, SkScalar specular);
#endif
-
-#ifdef SK_SUPPORT_LEGACY_BLURMASKFILTER
-private:
- SkBlurMaskFilter(); // can't be instantiated
-#endif
};
#endif
diff --git a/src/core/SkBlurMF.cpp b/src/core/SkBlurMF.cpp
index 432807d403..baa656597f 100644
--- a/src/core/SkBlurMF.cpp
+++ b/src/core/SkBlurMF.cpp
@@ -289,9 +289,6 @@ bool SkBlurMaskFilterImpl::asABlur(BlurRec* rec) const {
if (rec) {
rec->fSigma = fSigma;
rec->fStyle = fBlurStyle;
-#ifdef SK_SUPPORT_LEGACY_BLURMASKFILTER
- rec->fQuality = kHigh_SkBlurQuality;
-#endif
}
return true;
}
diff --git a/src/core/SkMaskFilterBase.h b/src/core/SkMaskFilterBase.h
index 4fa6ae08f4..b61ec983f6 100644
--- a/src/core/SkMaskFilterBase.h
+++ b/src/core/SkMaskFilterBase.h
@@ -155,9 +155,6 @@ public:
struct BlurRec {
SkScalar fSigma;
SkBlurStyle fStyle;
-#ifdef SK_SUPPORT_LEGACY_BLURMASKFILTER
- SkBlurQuality fQuality;
-#endif
};
/**
* If this filter can be represented by a BlurRec, return true and (if not null) fill in the
diff --git a/src/effects/SkBlurMaskFilter.cpp b/src/effects/SkBlurMaskFilter.cpp
deleted file mode 100644
index 57e6eedd08..0000000000
--- a/src/effects/SkBlurMaskFilter.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * Copyright 2006 The Android Open Source Project
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#include "SkBlurMaskFilter.h"
-
-#ifdef SK_SUPPORT_LEGACY_BLURMASKFILTER
-sk_sp<SkMaskFilter> SkBlurMaskFilter::Make(SkBlurStyle style, SkScalar sigma,
- const SkRect& occluder, uint32_t flags) {
- bool respectCTM = !(flags & kIgnoreTransform_BlurFlag);
- return SkMaskFilter::MakeBlur(style, sigma, occluder, respectCTM);
-}
-#endif
-
diff --git a/src/effects/SkLayerDrawLooper.cpp b/src/effects/SkLayerDrawLooper.cpp
index 4ef5102118..6a8254d894 100644
--- a/src/effects/SkLayerDrawLooper.cpp
+++ b/src/effects/SkLayerDrawLooper.cpp
@@ -204,9 +204,6 @@ bool SkLayerDrawLooper::asABlurShadow(BlurShadowRec* bsRec) const {
bsRec->fOffset = fRecs->fInfo.fOffset;
bsRec->fColor = fRecs->fPaint.getColor();
bsRec->fStyle = maskBlur.fStyle;
-#ifdef SK_SUPPORT_LEGACY_BLURMASKFILTER
- bsRec->fQuality = maskBlur.fQuality;
-#endif
}
return true;
}
diff --git a/tests/BlurTest.cpp b/tests/BlurTest.cpp
index 50bc4d799e..b606064448 100644
--- a/tests/BlurTest.cpp
+++ b/tests/BlurTest.cpp
@@ -383,9 +383,6 @@ static void test_blurDrawLooper(skiatest::Reporter* reporter, SkScalar sigma, Sk
REPORTER_ASSERT(reporter, rec.fOffset.y() == dy);
REPORTER_ASSERT(reporter, rec.fColor == color);
REPORTER_ASSERT(reporter, rec.fStyle == style);
-#ifdef SK_SUPPORT_LEGACY_BLURMASKFILTER
- REPORTER_ASSERT(reporter, rec.fQuality == kHigh_SkBlurQuality);
-#endif
}
}
}
@@ -401,9 +398,6 @@ static void test_looper(skiatest::Reporter* reporter, sk_sp<SkDrawLooper> lp, Sk
if (success) {
REPORTER_ASSERT(reporter, rec.fSigma == sigma);
REPORTER_ASSERT(reporter, rec.fStyle == style);
-#ifdef SK_SUPPORT_LEGACY_BLURMASKFILTER
- REPORTER_ASSERT(reporter, rec.fQuality == kHigh_SkBlurQuality);
-#endif
}
}
@@ -478,9 +472,6 @@ DEF_TEST(BlurAsABlur, reporter) {
REPORTER_ASSERT(reporter, success);
REPORTER_ASSERT(reporter, rec.fSigma == sigma);
REPORTER_ASSERT(reporter, rec.fStyle == style);
-#ifdef SK_SUPPORT_LEGACY_BLURMASKFILTER
- REPORTER_ASSERT(reporter, rec.fQuality == kHigh_SkBlurQuality);
-#endif
} else {
REPORTER_ASSERT(reporter, !success);
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-06 20:14:29 +0000