commit 22eb2f1aa09b0fb27c199c2cc96cd74b2098d502
author Mike Reed <reed@google.com> Tue Feb 21 22:48:21 2017 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed Feb 22 04:31:18 2017 +0000
tree e4eef8dae7fc011539ec626425cb4a0279894d81
parent ddbd37eb68fc2dbe125df5399f17fe0f091dba41

remove guard for SkImageGenerator api

BUG=skia:

Change-Id: I0c01fbf935be5d933aa2ef67a0fb2edba4941fa7
Reviewed-on: https://skia-review.googlesource.com/8835
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>

include/core/SkGraphics.h

diff --git a/include/core/SkGraphics.h b/include/core/SkGraphics.h
index bf8228b..4b62e55 100644
--- a/include/core/SkGraphics.h
+++ b/include/core/SkGraphics.h
@@ -169,13 +169,6 @@
      */
     static ImageGeneratorFromEncodedDataFactory
                     SetImageGeneratorFromEncodedDataFactory(ImageGeneratorFromEncodedDataFactory);
-
-#ifdef SK_SUPPORT_BARE_PTR_IMAGEGENERATOR
-    typedef SkImageGenerator* (*ImageGeneratorFromEncodedFactory)(SkData*);
-    static ImageGeneratorFromEncodedFactory
-                            SetImageGeneratorFromEncodedFactory(ImageGeneratorFromEncodedFactory);
-#endif
-
 };
 
 class SkAutoGraphics {

include/core/SkImage.h

diff --git a/include/core/SkImage.h b/include/core/SkImage.h
index 444ce68..cbd1b29 100644
--- a/include/core/SkImage.h
+++ b/include/core/SkImage.h
@@ -75,9 +75,6 @@
      */
     static sk_sp<SkImage> MakeFromGenerator(std::unique_ptr<SkImageGenerator>,
                                             const SkIRect* subset = nullptr);
-#ifdef SK_SUPPORT_BARE_PTR_IMAGEGENERATOR
-    static sk_sp<SkImage> MakeFromGenerator(SkImageGenerator*, const SkIRect* subset = nullptr);
-#endif
 
     /**
      *  Construct a new SkImage based on the specified encoded data. Returns NULL on failure,

include/core/SkImageGenerator.h

diff --git a/include/core/SkImageGenerator.h b/include/core/SkImageGenerator.h
index 44d5943..b193f48 100644
--- a/include/core/SkImageGenerator.h
+++ b/include/core/SkImageGenerator.h
@@ -160,13 +160,6 @@
 
     bool tryGenerateBitmap(SkBitmap* bm, const SkImageInfo& info, SkBitmap::Allocator* allocator);
 
-#ifdef SK_SUPPORT_BARE_PTR_IMAGEGENERATOR
-    static SkImageGenerator* NewFromPicture(const SkISize& size, const SkPicture* picture,
-                                            const SkMatrix* matrix, const SkPaint* paint,
-                                            SkImage::BitDepth depth, sk_sp<SkColorSpace> cs);
-    static SkImageGenerator* NewFromEncoded(SkData* data);
-#endif
-
 protected:
     enum {
         kNeedNewImageUniqueID = 0

src/core/SkImageGenerator.cpp

diff --git a/src/core/SkImageGenerator.cpp b/src/core/SkImageGenerator.cpp
index d4d42ba..77f2c38 100644
--- a/src/core/SkImageGenerator.cpp
+++ b/src/core/SkImageGenerator.cpp
@@ -184,17 +184,6 @@
     return prev;
 }
 
-#ifdef SK_SUPPORT_BARE_PTR_IMAGEGENERATOR
-static SkGraphics::ImageGeneratorFromEncodedFactory gLegacyFactory;
-SkGraphics::ImageGeneratorFromEncodedFactory
-SkGraphics::SetImageGeneratorFromEncodedFactory(ImageGeneratorFromEncodedFactory factory)
-{
-    ImageGeneratorFromEncodedFactory prev = gLegacyFactory;
-    gLegacyFactory = factory;
-    return prev;
-}
-#endif
-
 std::unique_ptr<SkImageGenerator> SkImageGenerator::MakeFromEncoded(sk_sp<SkData> data) {
     if (!data) {
         return nullptr;
@@ -204,27 +193,5 @@
             return generator;
         }
     }
-#ifdef SK_SUPPORT_BARE_PTR_IMAGEGENERATOR
-    if (gLegacyFactory) {
-        if (SkImageGenerator* generator = gLegacyFactory(data.get())) {
-            return std::unique_ptr<SkImageGenerator>(generator);
-        }
-    }
-#endif
     return SkImageGenerator::MakeFromEncodedImpl(std::move(data));
 }
-
-#ifdef SK_SUPPORT_BARE_PTR_IMAGEGENERATOR
-#include "SkPicture.h"
-
-SkImageGenerator* SkImageGenerator::NewFromPicture(const SkISize& size, const SkPicture* picture,
-                                                   const SkMatrix* matrix, const SkPaint* paint,
-                                                   SkImage::BitDepth depth,
-                                                   sk_sp<SkColorSpace> cs) {
-    return MakeFromPicture(size, sk_ref_sp(const_cast<SkPicture*>(picture)), matrix, paint,
-                           depth, std::move(cs)).release();
-}
-SkImageGenerator* SkImageGenerator::NewFromEncoded(SkData* data) {
-    return MakeFromEncoded(sk_ref_sp(data)).release();
-}
-#endif

src/image/SkImage_Generator.cpp

diff --git a/src/image/SkImage_Generator.cpp b/src/image/SkImage_Generator.cpp
index 7e47523..c38b7e4 100644
--- a/src/image/SkImage_Generator.cpp
+++ b/src/image/SkImage_Generator.cpp
@@ -100,9 +100,3 @@
 
     return validator ? sk_make_sp<SkImage_Generator>(&validator) : nullptr;
 }
-
-#ifdef SK_SUPPORT_BARE_PTR_IMAGEGENERATOR
-sk_sp<SkImage> SkImage::MakeFromGenerator(SkImageGenerator* gen, const SkIRect* subset) {
-    return MakeFromGenerator(std::unique_ptr<SkImageGenerator>(gen), subset);
-}
-#endif