Use SkImageCacherator in SkImages

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"
 
 class GrContext;
 class SkBitmap;
 
 /*
  *  Internal class to manage caching the output of an ImageGenerator.
  */
 class SkImageCacherator {
 public:
     // Takes ownership of the generator
@@ skipping 11 matching lines @@
     bool lockAsBitmap(SkBitmap*);
 
     /**
      *  Returns a ref() on the texture produced by this generator. The caller must call unref()
      *  when it is done. Will return NULL on failure.
      *
      *  The caller is responsible for calling texture->unref() when they are done.
      */
     GrTexture* lockAsTexture(GrContext*, SkImageUsageType);
 
+    /**
+     *  If the underlying src naturally is represented by an encoded blob (in SkData), this returns
+     *  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*);
     GrTexture* tryLockAsTexture(GrContext*, SkImageUsageType);
 
-    SkImageGenerator*   fGenerator;
+    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;
+    SkImageGenerator*   fNotThreadSafeGenerator;
     const SkImageInfo   fInfo;
     const SkIPoint      fOrigin;
     const uint32_t      fUniqueID;
 };
 
 #endif