AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

remove legacy SkFilterOptions

Browse Source 
Prerequisite:
https://googleplex-android-review.git.corp.google.com/c/platform/frameworks/native/+/13103845

Change-Id: Ic89937b2fffa2e81b5e38ac7082134bc0a90c4de
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/337399
Reviewed-by: Derek Sollenberger <djsollen@google.com>
Commit-Queue: Mike Reed <reed@google.com>
This commit is contained in:
Mike Reed 2020-11-21 10:34:41 -05:00
parent e81fb87bb4
commit ee9c4c71f6
2 changed files with 0 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/core/SkImage.h
View File

@ -20,13 +20,6 @@
#include "include/gpu/GrTypes.h"
#include <functional> // std::function
// DEPRECATED -- use SkSamplingOptions
enum class SkSamplingMode { kNearest, kLinear };
struct SkFilterOptions {
SkSamplingMode fSampling;
SkMipmapMode fMipmap;
};
#if defined(SK_BUILD_FOR_ANDROID) && __ANDROID_API__ >= 26
#include <android/hardware_buffer.h>
#endif
@ -725,9 +718,6 @@ public:
return this->makeShader(SkTileMode::kClamp, SkTileMode::kClamp, &localMatrix);
}
// DEPRECATED -- use SkSamplingOptions
sk_sp<SkShader> makeShader(SkTileMode tmx, SkTileMode tmy, const SkFilterOptions&) const;
/** Copies SkImage pixel address, row bytes, and SkImageInfo to pixmap, if address
is available, and returns true. If pixel address is not available, return
false and leave pixmap unchanged.

7
src/image/SkImage.cpp
View File

@ -155,13 +155,6 @@ sk_sp<SkShader> SkImage::makeShader(SkTileMode tmx, SkTileMode tmy,
localMatrix);
}
// DEPRECATED
sk_sp<SkShader> SkImage::makeShader(SkTileMode tmx, SkTileMode tmy,
const SkFilterOptions& options) const {
return this->makeShader(tmx, tmy, SkSamplingOptions((SkFilterMode)options.fSampling,
options.fMipmap));
}
sk_sp<SkData> SkImage::encodeToData(SkEncodedImageFormat type, int quality) const {
// Context TODO: Elevate GrDirectContext requirement to public API.
auto dContext = as_IB(this)->directContext();