diff options
author | 2016-07-19 08:26:09 -0700 | |
---|---|---|
committer | 2016-07-19 08:26:09 -0700 | |
commit | 7f3ff208435e32f105174b37791d4c88ee1072fd (patch) | |
tree | fbc6fb3159d5ecac7221fcaba86dea454818d69b | |
parent | f037d48e29000554abcd117445c4249071bb9fb3 (diff) |
remove unused MakeFromPixmap
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2158913004
TBR=robertphilips@google.com
Review-Url: https://codereview.chromium.org/2158913004
-rw-r--r-- | src/core/SkSpecialImage.cpp | 26 | ||||
-rw-r--r-- | src/core/SkSpecialImage.h | 5 | ||||
-rw-r--r-- | tests/SpecialImageTest.cpp | 19 |
3 files changed, 0 insertions, 50 deletions
diff --git a/src/core/SkSpecialImage.cpp b/src/core/SkSpecialImage.cpp index f903270dff..8875d2248f 100644 --- a/src/core/SkSpecialImage.cpp +++ b/src/core/SkSpecialImage.cpp @@ -335,19 +335,6 @@ public: } } - SkSpecialImage_Raster(const SkIRect& subset, - const SkPixmap& pixmap, - RasterReleaseProc releaseProc, - ReleaseContext context, - const SkSurfaceProps* props) - : INHERITED(subset, kNeedNewImageUniqueID_SpecialImage, props) { - fBitmap.installPixels(pixmap.info(), pixmap.writable_addr(), - pixmap.rowBytes(), pixmap.ctable(), - releaseProc, context); - } - - ~SkSpecialImage_Raster() override { } - bool isOpaque() const override { return fBitmap.isOpaque(); } size_t getSize() const override { return fBitmap.getSize(); } @@ -428,19 +415,6 @@ sk_sp<SkSpecialImage> SkSpecialImage::MakeFromRaster(const SkIRect& subset, return sk_make_sp<SkSpecialImage_Raster>(subset, bm, props); } -sk_sp<SkSpecialImage> SkSpecialImage::MakeFromPixmap(const SkIRect& subset, - const SkPixmap& src, - RasterReleaseProc releaseProc, - ReleaseContext context, - const SkSurfaceProps* props) { - if (!src.addr()) { - return nullptr; - } - - return sk_make_sp<SkSpecialImage_Raster>(subset, src, releaseProc, context, props); -} - - #if SK_SUPPORT_GPU /////////////////////////////////////////////////////////////////////////////// #include "GrTexture.h" diff --git a/src/core/SkSpecialImage.h b/src/core/SkSpecialImage.h index 6771f257e3..5dae05e245 100644 --- a/src/core/SkSpecialImage.h +++ b/src/core/SkSpecialImage.h @@ -80,11 +80,6 @@ public: const SkSurfaceProps* = nullptr, SkAlphaType at = kPremul_SkAlphaType); #endif - static sk_sp<SkSpecialImage> MakeFromPixmap(const SkIRect& subset, - const SkPixmap&, - RasterReleaseProc, - ReleaseContext, - const SkSurfaceProps* = nullptr); /** * Create a new special surface with a backend that is compatible with this special image. diff --git a/tests/SpecialImageTest.cpp b/tests/SpecialImageTest.cpp index 06c852d511..d7eb34089b 100644 --- a/tests/SpecialImageTest.cpp +++ b/tests/SpecialImageTest.cpp @@ -177,25 +177,6 @@ DEF_TEST(SpecialImage_Image, reporter) { } } -DEF_TEST(SpecialImage_Pixmap, reporter) { - SkAutoPixmapStorage pixmap; - - const SkImageInfo info = SkImageInfo::MakeN32(kFullSize, kFullSize, kOpaque_SkAlphaType); - pixmap.alloc(info); - pixmap.erase(SK_ColorGREEN); - - const SkIRect& subset = SkIRect::MakeXYWH(kPad, kPad, kSmallerSize, kSmallerSize); - - pixmap.erase(SK_ColorRED, subset); - - { - sk_sp<SkSpecialImage> img(SkSpecialImage::MakeFromPixmap(subset, pixmap, - nullptr, nullptr)); - test_image(img, reporter, nullptr, false, kPad, kFullSize); - } -} - - #if SK_SUPPORT_GPU static void test_texture_backed(skiatest::Reporter* reporter, |