remove dead methods now that we use specials exclusively for imagefilters

src/core/SkSpecialImage.cpp

 /*
  * Copyright 2016 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file
  */
 #include "SkSpecialImage.h"
 
 #if SK_SUPPORT_GPU
 #include "GrTexture.h"
@@ skipping 63 matching lines @@
 sk_sp<SkSpecialImage> SkSpecialImage::makeTextureImage(GrContext* context) {
 #if SK_SUPPORT_GPU
     if (!context) {
         return nullptr;
     }
     if (GrTexture* peek = as_SIB(this)->onPeekTexture()) {
         return peek->getContext() == context ? sk_sp<SkSpecialImage>(SkRef(this)) : nullptr;
     }
 
     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;
     }
 
     if (bmp.empty()) {
         return SkSpecialImage::MakeFromRaster(SkIRect::MakeEmpty(), bmp, &this->props());
     }
 
     sk_sp<GrTexture> resultTex(GrRefCachedBitmapTexture(context,
                                                         bmp,
                                                         GrTextureParams::ClampNoFilter(),
@@ skipping 59 matching lines @@
 
 sk_sp<SkImage> SkSpecialImage::makeTightSubset(const SkIRect& subset) const {
     return as_SIB(this)->onMakeTightSubset(subset);
 }
 
 #if SK_SUPPORT_GPU
 #include "SkGr.h"
 #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
 #include "GrContext.h"
 #include "SkGrPriv.h"
 #endif
 
 class SkSpecialImage_Image : public SkSpecialImage_Base {
 public:
     SkSpecialImage_Image(const SkIRect& subset,
@@ skipping 384 matching lines @@
 sk_sp<SkSpecialImage> SkSpecialImage::MakeFromGpu(const SkIRect& subset,
                                                   uint32_t uniqueID,
                                                   sk_sp<GrTexture> tex,
                                                   const SkSurfaceProps* props,
                                                   SkAlphaType at) {
     SkASSERT(rect_fits(subset, tex->width(), tex->height()));
     return sk_make_sp<SkSpecialImage_Gpu>(subset, uniqueID, std::move(tex), at, props);
 }
 
 #endif