SkFilterQuality is gone.
Bug: skia:11235
Change-Id: Iefa0156f542f217e687299f053768ee5b87f84d7
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/430977
Reviewed-by: Michael Ludwig <michaelludwig@google.com>
Commit-Queue: Mike Reed <reed@google.com>
diff --git a/gn/core.gni b/gn/core.gni
index 55b5cea..11a593b 100644
--- a/gn/core.gni
+++ b/gn/core.gni
@@ -32,7 +32,6 @@
"$_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
deleted file mode 100644
index 465fed0..0000000
--- a/include/core/SkFilterQuality.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright 2015 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-
-#ifndef SkFilterQuality_DEFINED
-#define SkFilterQuality_DEFINED
-
-#include "include/core/SkTypes.h"
-
-#ifndef SK_SUPPORT_LEGACY_FILTERQUALITY
-//#define SK_SUPPORT_LEGACY_FILTERQUALITY
-#endif
-
-#ifdef SK_SUPPORT_LEGACY_FILTERQUALITY
-
-/**
- * Controls how much filtering to be done when scaling/transforming complex colors
- * e.g. images.
- These values are persisted to logs. Entries should not be renumbered and
- numeric values should never be reused.
- */
-enum SkFilterQuality {
- kNone_SkFilterQuality = 0, //!< nearest-neighbor; fastest but lowest quality
- kLow_SkFilterQuality = 1, //!< bilerp
- kMedium_SkFilterQuality = 2, //!< bilerp + mipmaps; good for down-scaling
- kHigh_SkFilterQuality = 3, //!< bicubic resampling; slowest but good quality
-
- kLast_SkFilterQuality = kHigh_SkFilterQuality,
-};
-
-#endif
-
-#endif
diff --git a/include/core/SkPaint.h b/include/core/SkPaint.h
index 8de60b2..e3cc039 100644
--- 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
index 6296bfce..468cf5b 100644
--- 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 @@
: 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
index 171f50b..1db67bd 100644
--- a/src/image/SkImage.cpp
+++ b/src/image/SkImage.cpp
@@ -842,9 +842,3 @@
buffer.writeUInt((unsigned)sampling.mipmap);
}
}
-
-#ifdef SK_SUPPORT_LEGACY_FILTERQUALITY
-SkSamplingOptions::SkSamplingOptions(SkFilterQuality fq, MediumBehavior behavior) {
- *this = SkSamplingPriv::FromFQ((SkLegacyFQ)fq, (SkMediumAs)behavior);
-}
-#endif
