Remove SkGrPixelRef

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"
 #include "SkBitmap.h"
 #include "SkImage.h"
 #include "SkBitmapCache.h"
 #include "SkCanvas.h"
 #include "SkImage_Base.h"
 #include "SkSpecialSurface.h"
 #include "SkSurfacePriv.h"
 #include "SkPixelRef.h"
 
 #if SK_SUPPORT_GPU
 #include "GrContext.h"
 #include "GrTexture.h"
 #include "GrTextureParams.h"
 #include "SkGr.h"
-#include "SkGrPixelRef.h"
 #include "SkGrPriv.h"
 #endif
 
 // Currently the raster imagefilters can only handle certain imageinfos. Call this to know if
 // a given info is supported.
 static bool valid_for_imagefilters(const SkImageInfo& info) {
     // no support for other swizzles/depths yet
     return info.colorType() == kN32_SkColorType;
 }
 
@@ skipping 10 matching lines @@
     virtual bool onGetROPixels(SkBitmap*) const = 0;
 
     virtual GrTexture* onPeekTexture() const { return nullptr; }
 
     virtual SkColorSpace* onGetColorSpace() const = 0;
 
 #if SK_SUPPORT_GPU
     virtual sk_sp<GrTexture> onAsTextureRef(GrContext* context) const = 0;
 #endif
 
-    // Delete this entry point ASAP (see skbug.com/4965)
-    virtual bool getBitmapDeprecated(SkBitmap* result) const = 0;
-
     virtual sk_sp<SkSpecialImage> onMakeSubset(const SkIRect& subset) const = 0;
 
     virtual sk_sp<SkSpecialSurface> onMakeSurface(const SkImageInfo& info) const = 0;
 
     virtual sk_sp<SkImage> onMakeTightSubset(const SkIRect& subset) const = 0;
 
     virtual sk_sp<SkSurface> onMakeTightSurface(const SkImageInfo& info) const = 0;
 
 private:
     typedef SkSpecialImage INHERITED;
@@ skipping 181 matching lines @@
             return sk_ref_sp(GrRefCachedBitmapTexture(context,
                                                       fBitmap,
                                                       GrTextureParams::ClampNoFilter(),
                                                       SkSourceGammaTreatment::kRespect));
         }
 
         return nullptr;
     }
 #endif
 
-    bool getBitmapDeprecated(SkBitmap* result) const override {
-        *result = fBitmap;
-        return true;
-    }
-
     sk_sp<SkSpecialSurface> onMakeSurface(const SkImageInfo& info) const override {
         return SkSpecialSurface::MakeRaster(info, nullptr);
     }
 
     sk_sp<SkSpecialImage> onMakeSubset(const SkIRect& subset) const override {
         SkBitmap subsetBM;
 
         if (!fBitmap.extractSubset(&subsetBM, subset)) {
             return nullptr;
         }
@@ skipping 111 matching lines @@
         dst->pixelRef()->setImmutableWithID(this->uniqueID());
         SkBitmapCache::Add(this->uniqueID(), *dst);
         fAddedRasterVersionToCache.store(true);
         return true;
     }
 
     SkColorSpace* onGetColorSpace() const override {
         return fColorSpace.get();
     }
 
-    bool getBitmapDeprecated(SkBitmap* result) const override {
-        const SkImageInfo info = GrMakeInfoFromTexture(fTexture.get(),
-                                                       this->width(), this->height(),
-                                                       this->isOpaque(), fColorSpace);
-        if (!result->setInfo(info)) {
-            return false;
-        }
-
-        const SkImageInfo prInfo = info.makeWH(fTexture->width(), fTexture->height());
-
-        SkAutoTUnref<SkGrPixelRef> pixelRef(new SkGrPixelRef(prInfo, fTexture.get()));
-        result->setPixelRef(pixelRef, this->subset().fLeft, this->subset().fTop);
-        return true;
-    }
-
     sk_sp<SkSpecialSurface> onMakeSurface(const SkImageInfo& info) const override {
         if (!fTexture->getContext()) {
             return nullptr;
         }
 
         GrPixelConfig config = SkImageInfo2GrPixelConfig(info, *fTexture->getContext()->caps());
 
         return SkSpecialSurface::MakeRenderTarget(fTexture->getContext(),
                                                   info.width(), info.height(),
                                                   config);
@@ skipping 51 matching lines @@
                                                   sk_sp<GrTexture> tex,
                                                   sk_sp<SkColorSpace> colorSpace,
                                                   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,
                                           std::move(colorSpace), props);
 }
 
 #endif