commit 7f3ff208435e32f105174b37791d4c88ee1072fd
author reed <reed@google.com> Tue Jul 19 08:26:09 2016 -0700
committer Commit bot <commit-bot@chromium.org> Tue Jul 19 08:26:09 2016 -0700
tree fbc6fb3159d5ecac7221fcaba86dea454818d69b
parent f037d48e29000554abcd117445c4249071bb9fb3

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

src/core/SkSpecialImage.cpp

diff --git a/src/core/SkSpecialImage.cpp b/src/core/SkSpecialImage.cpp
index f903270..8875d22 100644
--- a/src/core/SkSpecialImage.cpp
+++ b/src/core/SkSpecialImage.cpp
@@ -335,19 +335,6 @@
         }
     }
 
-    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 @@
     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"

src/core/SkSpecialImage.h

diff --git a/src/core/SkSpecialImage.h b/src/core/SkSpecialImage.h
index 6771f25..5dae05e 100644
--- a/src/core/SkSpecialImage.h
+++ b/src/core/SkSpecialImage.h
@@ -80,11 +80,6 @@
                                              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.

tests/SpecialImageTest.cpp

diff --git a/tests/SpecialImageTest.cpp b/tests/SpecialImageTest.cpp
index 06c852d..d7eb340 100644
--- a/tests/SpecialImageTest.cpp
+++ b/tests/SpecialImageTest.cpp
@@ -177,25 +177,6 @@
     }
 }
 
-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,