Use SkImageCacherator in SkImages

src/image/SkImage_Generator.cpp

Index: src/image/SkImage_Generator.cpp
diff --git a/src/image/SkImage_Generator.cpp b/src/image/SkImage_Generator.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..b200ce5c6f566f5885d0e3ea1869be1094b97fc7
--- /dev/null
+++ b/src/image/SkImage_Generator.cpp
@@ -0,0 +1,97 @@
+/*
+ * Copyright 2015 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "SkImage_Base.h"
+#include "SkBitmap.h"

[robertphillips, 2015/09/10 17:33:30]

Do we need SkCanvas.h ?

[reed1, 2015/09/10 21:21:31]

Done.

+#include "SkCanvas.h"

[robertphillips, 2015/09/10 17:33:30]

Do we need SkColorTable.h ?

[reed1, 2015/09/10 21:21:32]

Done.

+#include "SkColorTable.h"
+#include "SkData.h"
+#include "SkImageCacherator.h"
+#include "SkImagePriv.h"
+#include "SkPixelRef.h"
+#include "SkSurface.h"
+
+class SkImage_Generator : public SkImage_Base {
+public:
+    SkImage_Generator(SkImageCacherator* cache)
+        : INHERITED(cache->info().width(), cache->info().height(), kNeedNewImageUniqueID, NULL)
+        , fCache(cache) // take ownership
+    {}
+
+    SkSurface* onNewSurface(const SkImageInfo&, const SkSurfaceProps&) const override;
+    bool onReadPixels(const SkImageInfo&, void*, size_t, int srcX, int srcY) const override;
+    const void* onPeekPixels(SkImageInfo*, size_t* /*rowBytes*/) const override;
+    SkData* onRefEncoded() const override;
+    bool isOpaque() const override { return fCache->info().isOpaque(); }
+
+    bool getROPixels(SkBitmap*) const override;
+    GrTexture* asTextureRef(GrContext*, SkImageUsageType) const override;
+
+    SkShader* onNewShader(SkShader::TileMode,
+                          SkShader::TileMode,
+                          const SkMatrix* localMatrix) const override;
+
+    bool onIsLazyGenerated() const override { return true; }
+
+private:
+    SkAutoTDelete<SkImageCacherator> fCache;
+
+    typedef SkImage_Base INHERITED;
+};
+
+///////////////////////////////////////////////////////////////////////////////
+
+SkShader* SkImage_Generator::onNewShader(SkShader::TileMode tileX, SkShader::TileMode tileY,

[robertphillips, 2015/09/10 17:33:30]

line this up ?

[reed1, 2015/09/10 21:21:32]

Done.

+                                      const SkMatrix* localMatrix) const {

[robertphillips, 2015/09/10 17:33:30]

so we can _____ native textures ?

[reed1, 2015/09/10 21:21:32]

Done.

+    // TODO: need a native Shader that takes Cacherator (or this image) so we can native
+    // textures as output from the shader.
+    SkBitmap bm;
+    if (this->getROPixels(&bm)) {
+        return SkShader::CreateBitmapShader(bm, tileX, tileY, localMatrix);
+    }
+    return nullptr;
+}
+
+SkSurface* SkImage_Generator::onNewSurface(const SkImageInfo& info,
+                                           const SkSurfaceProps& props) const {
+    return SkSurface::NewRaster(info, &props);
+}
+
+bool SkImage_Generator::onReadPixels(const SkImageInfo& dstInfo, void* dstPixels, size_t dstRB,
+                                     int srcX, int srcY) const {
+    SkBitmap bm;
+    if (this->getROPixels(&bm)) {
+        return bm.readPixels(dstInfo, dstPixels, dstRB, srcX, srcY);
+    }
+    return false;
+}
+
+const void* SkImage_Generator::onPeekPixels(SkImageInfo* infoPtr, size_t* rowBytesPtr) const {
+    return NULL;
+}
+
+SkData* SkImage_Generator::onRefEncoded() const {
+    return fCache->refEncoded();
+}
+
+bool SkImage_Generator::getROPixels(SkBitmap* bitmap) const {
+    return fCache->lockAsBitmap(bitmap);
+}
+
+GrTexture* SkImage_Generator::asTextureRef(GrContext* ctx, SkImageUsageType usage) const {
+    return fCache->lockAsTexture(ctx, usage);
+}
+
+#ifndef SK_SUPPORT_LEGACY_NEWFROMGENERATOR
+SkImage* SkImage::NewFromGenerator(SkImageGenerator* generator, const SkIRect* subset) {
+    SkImageCacherator* cache = SkImageCacherator::NewFromGenerator(generator, subset);
+    if (!cache) {
+        return nullptr;
+    }
+    return SkNEW_ARGS(SkImage_Generator, (cache));
+}
+#endif