aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorGravatar Matt Sarett <msarett@google.com>2017-01-05 09:32:11 -0500
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2017-01-05 16:33:21 +0000
commitac1f09d53bfe8b99ae7ac82b54e3911258b07b6a (patch)
tree4bd21ded20635fbc814f2d9a2bee2af16113f35f /src
parent56770752c28d4619fe5f36b075d709efcd9a831c (diff)
Delete SkMakeImageFromPixelRef
There are no callers. BUG=skia: Change-Id: Ie743fc61cc0a0ca755d4e3fdab8a5985fa35fbd3 Reviewed-on: https://skia-review.googlesource.com/6598 Reviewed-by: Mike Reed <reed@google.com> Commit-Queue: Matt Sarett <msarett@google.com>
Diffstat (limited to 'src')
-rw-r--r--src/core/SkImagePriv.h5
-rw-r--r--src/image/SkImage_Raster.cpp21
2 files changed, 0 insertions, 26 deletions
diff --git a/src/core/SkImagePriv.h b/src/core/SkImagePriv.h
index 5b470e2092..1d19714717 100644
--- a/src/core/SkImagePriv.h
+++ b/src/core/SkImagePriv.h
@@ -33,11 +33,6 @@ sk_sp<SkShader> SkMakeBitmapShader(const SkBitmap& src, SkShader::TileMode, SkSh
const SkMatrix* localMatrix, SkCopyPixelsMode,
SkTBlitterAllocator* alloc);
-// Call this if you explicitly want to use/share this pixelRef in the image
-extern sk_sp<SkImage> SkMakeImageFromPixelRef(const SkImageInfo&, SkPixelRef*,
- const SkIPoint& pixelRefOrigin,
- size_t rowBytes);
-
/**
* Examines the bitmap to decide if it can share the existing pixelRef, or
* if it needs to make a deep-copy of the pixels.
diff --git a/src/image/SkImage_Raster.cpp b/src/image/SkImage_Raster.cpp
index afd5f90390..cce1ed20c5 100644
--- a/src/image/SkImage_Raster.cpp
+++ b/src/image/SkImage_Raster.cpp
@@ -92,9 +92,6 @@ public:
sk_sp<SkColorSpace>*) const override;
sk_sp<SkImage> onMakeSubset(const SkIRect&) const override;
- // exposed for SkSurface_Raster via SkNewImageFromPixelRef
- SkImage_Raster(const SkImageInfo&, SkPixelRef*, const SkIPoint& origin, size_t rowBytes);
-
SkPixelRef* getPixelRef() const { return fBitmap.pixelRef(); }
bool onAsLegacyBitmap(SkBitmap*, LegacyBitmapMode) const override;
@@ -153,16 +150,6 @@ SkImage_Raster::SkImage_Raster(const Info& info, sk_sp<SkData> data, size_t rowB
fBitmap.lockPixels();
}
-SkImage_Raster::SkImage_Raster(const Info& info, SkPixelRef* pr, const SkIPoint& pixelRefOrigin,
- size_t rowBytes)
- : INHERITED(info.width(), info.height(), pr->getGenerationID())
-{
- fBitmap.setInfo(info, rowBytes);
- fBitmap.setPixelRef(sk_ref_sp(pr), pixelRefOrigin.x(), pixelRefOrigin.y());
- fBitmap.lockPixels();
- SkASSERT(fBitmap.isImmutable());
-}
-
SkImage_Raster::~SkImage_Raster() {
#if SK_SUPPORT_GPU
SkASSERT(nullptr == fPinnedTexture.get()); // want the caller to have manually unpinned
@@ -313,14 +300,6 @@ sk_sp<SkImage> SkImage::MakeFromRaster(const SkPixmap& pmap, RasterReleaseProc p
return sk_make_sp<SkImage_Raster>(pmap.info(), std::move(data), pmap.rowBytes(), pmap.ctable());
}
-sk_sp<SkImage> SkMakeImageFromPixelRef(const SkImageInfo& info, SkPixelRef* pr,
- const SkIPoint& pixelRefOrigin, size_t rowBytes) {
- if (!SkImage_Raster::ValidArgs(info, rowBytes, false, nullptr)) {
- return nullptr;
- }
- return sk_make_sp<SkImage_Raster>(info, pr, pixelRefOrigin, rowBytes);
-}
-
sk_sp<SkImage> SkMakeImageFromRasterBitmap(const SkBitmap& bm, SkCopyPixelsMode cpm,
SkTBlitterAllocator* allocator) {
bool hasColorTable = false;