SkFilterQuality is gone.

Bug: skia:11235 Change-Id: Iefa0156f542f217e687299f053768ee5b87f84d7 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/430977 Reviewed-by: Michael Ludwig <[email protected]> Commit-Queue: Mike Reed <[email protected]>
HistoryFork · Jul 22, 2021 · aebe248 · aebe248
1 parent ff32296
commit aebe248
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 53 deletions.
diff --git a/gn/core.gni b/gn/core.gni
@@ -32,7 +32,6 @@ skia_core_public = [
   "$_include/core/SkDrawable.h",
   "$_include/core/SkEncodedImageFormat.h",
   "$_include/core/SkExecutor.h",
-  "$_include/core/SkFilterQuality.h",
   "$_include/core/SkFlattenable.h",
   "$_include/core/SkFont.h",
   "$_include/core/SkFontArguments.h",

diff --git a/include/core/SkFilterQuality.h b/include/core/SkFilterQuality.h
diff --git a/include/core/SkPaint.h b/include/core/SkPaint.h
@@ -10,7 +10,6 @@
 
 #include "include/core/SkBlendMode.h"
 #include "include/core/SkColor.h"
-#include "include/core/SkFilterQuality.h"
 #include "include/core/SkRefCnt.h"
 #include "include/private/SkTOptional.h"
 #include "include/private/SkTo.h"

diff --git a/include/core/SkSamplingOptions.h b/include/core/SkSamplingOptions.h
@@ -8,7 +8,7 @@
 #ifndef SkImageSampling_DEFINED
 #define SkImageSampling_DEFINED
 
-#include "include/core/SkFilterQuality.h"
+#include "include/core/SkTypes.h"
 #include <new>
 
 enum class SkFilterMode {
@@ -79,14 +79,6 @@ struct SK_API SkSamplingOptions {
         : useCubic(true)
         , cubic(c) {}
 
-#ifdef SK_SUPPORT_LEGACY_FILTERQUALITY
-    enum MediumBehavior {
-        kMedium_asMipmapNearest,    // historic cpu behavior
-        kMedium_asMipmapLinear,     // historic gpu behavior
-    };
-    explicit SkSamplingOptions(SkFilterQuality, MediumBehavior = kMedium_asMipmapNearest);
-#endif
-
     bool operator==(const SkSamplingOptions& other) const {
         return useCubic == other.useCubic
             && cubic.B  == other.cubic.B

diff --git a/src/image/SkImage.cpp b/src/image/SkImage.cpp
@@ -842,9 +842,3 @@ void SkSamplingPriv::Write(SkWriteBuffer& buffer, const SkSamplingOptions& sampl
         buffer.writeUInt((unsigned)sampling.mipmap);
     }
 }
-
-#ifdef SK_SUPPORT_LEGACY_FILTERQUALITY
-SkSamplingOptions::SkSamplingOptions(SkFilterQuality fq, MediumBehavior behavior) {
-    *this = SkSamplingPriv::FromFQ((SkLegacyFQ)fq, (SkMediumAs)behavior);
-}
-#endif