commit cc58664e4063a44f9cd7921db86133ed84fffe30
author Florin Malita <fmalita@chromium.org> Tue Oct 24 16:18:59 2017 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed Oct 25 17:53:25 2017 +0000
tree a9f7abf98a4d42cd1a1e932d7434f78bdbd78435
parent 87ce15e131aca6213529dc3a3c285b65cbbb7d38

Remove GradientShaderCache dither and paint alpha support

The gradient cache is only used for complex GPU gradients, and is
always initialized with no dithering and opaque alpha.

Remove the (now-dead) code supporing ditherning and non-opaque alpha.

Change-Id: Iad694fa760e9a236efadd4cf92fbc7f8bcacadbe
Reviewed-on: https://skia-review.googlesource.com/63520
Reviewed-by: Brian Osman <brianosman@google.com>
Commit-Queue: Florin Malita <fmalita@chromium.org>

src/shaders/gradients/SkGradientShaderPriv.h

diff --git a/src/shaders/gradients/SkGradientShaderPriv.h b/src/shaders/gradients/SkGradientShaderPriv.h
index 1fd5ca9..1310589 100644
--- a/src/shaders/gradients/SkGradientShaderPriv.h
+++ b/src/shaders/gradients/SkGradientShaderPriv.h
@@ -122,26 +122,18 @@
     // The cache is initialized on-demand when getCache32 is called.
     class GradientShaderCache : public SkRefCnt {
     public:
-        GradientShaderCache(U8CPU alpha, bool dither, const SkGradientShaderBase& shader);
+        GradientShaderCache(const SkGradientShaderBase& shader);
         ~GradientShaderCache();
 
         const SkPMColor*    getCache32();
 
         SkPixelRef* getCache32PixelRef() const { return fCache32PixelRef.get(); }
 
-        unsigned getAlpha() const { return fCacheAlpha; }
-        bool getDither() const { return fCacheDither; }
-
     private:
         // Working pointer. If it's nullptr, we need to recompute the cache values.
         SkPMColor*  fCache32;
 
         sk_sp<SkPixelRef> fCache32PixelRef;
-        const unsigned    fCacheAlpha;        // The alpha value we used when we computed the cache.
-                                              // Larger than 8bits so we can store uninitialized
-                                              // value.
-        const bool        fCacheDither;       // The dither flag used when we computed the cache.
-
         const SkGradientShaderBase& fShader;
 
         // Make sure we only initialize the cache once.
@@ -150,7 +142,7 @@
         static void initCache32(GradientShaderCache* cache);
 
         static void Build32bitCache(SkPMColor[], SkColor c0, SkColor c1, int count,
-                                    U8CPU alpha, uint32_t gradFlags, bool dither);
+                                    uint32_t gradFlags);
     };
 
     class GradientShaderBaseContext : public Context {
@@ -166,7 +158,6 @@
         SkMatrixPriv::MapXYProc fDstToIndexProc;
         uint8_t     fDstToIndexClass;
         uint8_t     fFlags;
-        bool        fDither;
 
         sk_sp<GradientShaderCache> fCache;
 
@@ -262,7 +253,7 @@
 private:
     bool                fColorsAreOpaque;
 
-    sk_sp<GradientShaderCache> refCache(U8CPU alpha, bool dither) const;
+    sk_sp<GradientShaderCache> refCache() const;
     mutable SkMutex                    fCacheMutex;
     mutable sk_sp<GradientShaderCache> fCache;