Index: src/core/SkSpecialImage.cpp |
diff --git a/src/core/SkSpecialImage.cpp b/src/core/SkSpecialImage.cpp |
index ecde3d97c8f309557f25b1801426a07ede236f89..d6fbd2ad2fcf7e21ccbd245da4c3f1a2027429ae 100644 |
--- a/src/core/SkSpecialImage.cpp |
+++ b/src/core/SkSpecialImage.cpp |
@@ -20,7 +20,6 @@ |
#include "GrTexture.h" |
#include "GrTextureParams.h" |
#include "SkGr.h" |
-#include "SkGrPixelRef.h" |
#include "SkGrPriv.h" |
#endif |
@@ -51,9 +50,6 @@ public: |
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; |
@@ -255,11 +251,6 @@ public: |
} |
#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); |
} |
@@ -391,21 +382,6 @@ public: |
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; |