Rewrite GrTextureMaker to disentangle bitmap case from base class and give GPU object a say in what…

src/core/SkImageCacherator.h

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkImageCacherator_DEFINED
 #define SkImageCacherator_DEFINED
 
 #include "SkImageGenerator.h"
 #include "SkMutex.h"
 #include "SkTemplates.h"
 
 class GrContext;
-class GrTextureParams; 
+class GrTextureParams;
+class GrUniqueKey;
 class SkBitmap;
 class SkImage;
 
 /*
  *  Internal class to manage caching the output of an ImageGenerator.
  */
 class SkImageCacherator {
 public:
     // Takes ownership of the generator
     static SkImageCacherator* NewFromGenerator(SkImageGenerator*, const SkIRect* subset = nullptr);
@@ skipping 26 matching lines @@
      *  a ref to that data. If not, it returns null.
      */
     SkData* refEncoded();
 
 private:
     SkImageCacherator(SkImageGenerator*, const SkImageInfo&, const SkIPoint&, uint32_t uniqueID);
 
     bool generateBitmap(SkBitmap*);
     bool tryLockAsBitmap(SkBitmap*, const SkImage*);
 #if SK_SUPPORT_GPU
-    GrTexture* lockUnstretchedTexture(GrContext*, const SkImage* client);
+    // Returns the texture. If the cacherator is generating the texture and wants to cache it,
+    // it should use the passed in key (if the key is valid).
+    GrTexture* lockTexture(GrContext*, const GrUniqueKey& key, const SkImage* client);
 #endif
 
     class ScopedGenerator {
         SkImageCacherator* fCacher;
     public:
         ScopedGenerator(SkImageCacherator* cacher) : fCacher(cacher) {
             fCacher->fMutexForGenerator.acquire();
         }
         ~ScopedGenerator() {
             fCacher->fMutexForGenerator.release();
         }
         SkImageGenerator* operator->() const { return fCacher->fNotThreadSafeGenerator; }
         operator SkImageGenerator*() const { return fCacher->fNotThreadSafeGenerator; }
     };
 
     SkMutex                         fMutexForGenerator;
     SkAutoTDelete<SkImageGenerator> fNotThreadSafeGenerator;
 
     const SkImageInfo   fInfo;
     const SkIPoint      fOrigin;
     const uint32_t      fUniqueID;
 
-    friend class Cacherator_GrTextureMaker;
+    friend class Cacherator_GrTextureParamsAdjuster;
 };
 
 #endif