remove dead methods now that we use specials exclusively for imagefilters
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2164763003
Review-Url: https://codereview.chromium.org/2164763003
diff --git a/src/core/SkSpecialImage.cpp b/src/core/SkSpecialImage.cpp
index e3a14e5..a4ffa19 100644
--- a/src/core/SkSpecialImage.cpp
+++ b/src/core/SkSpecialImage.cpp
@@ -81,7 +81,11 @@
}
SkBitmap bmp;
- if (!this->internal_getBM(&bmp)) {
+ // At this point, we are definitely not texture-backed, so we must be raster or generator
+ // backed. If we remove the special-wrapping-an-image subclass, we may be able to assert that
+ // we are strictly raster-backed (i.e. generator images become raster when they are specialized)
+ // in which case getROPixels could turn into peekPixels...
+ if (!this->getROPixels(&bmp)) {
return nullptr;
}
@@ -161,28 +165,6 @@
#include "SkGrPixelRef.h"
#endif
-sk_sp<SkSpecialImage> SkSpecialImage::internal_fromBM(const SkBitmap& src,
- const SkSurfaceProps* props) {
-#if SK_SUPPORT_GPU
- // Need to test offset case! (see skbug.com/4967)
- if (src.getTexture()) {
- return SkSpecialImage::MakeFromGpu(src.bounds(),
- src.getGenerationID(),
- sk_ref_sp(src.getTexture()),
- props);
- }
-#endif
-
- return SkSpecialImage::MakeFromRaster(src.bounds(), src, props);
-}
-
-bool SkSpecialImage::internal_getBM(SkBitmap* result) {
- const SkSpecialImage_Base* ib = as_SIB(this);
-
- // TODO: need to test offset case! (see skbug.com/4967)
- return ib->getBitmapDeprecated(result);
-}
-
///////////////////////////////////////////////////////////////////////////////
#include "SkImage.h"
#if SK_SUPPORT_GPU