use onPeekBitmap instead of asLegacyBitmap

src/image/SkImage_Gpu.cpp

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkAutoPixmapStorage.h"
 #include "GrCaps.h"
 #include "GrContext.h"
@@ skipping 297 matching lines @@
     if (GrTexture* peek = as_IB(this)->peekTexture()) {
         return peek->getContext() == context ? sk_ref_sp(const_cast<SkImage*>(this)) : nullptr;
     }
     // No way to check whether a image is premul or not?
     SkAlphaType at = this->isOpaque() ? kOpaque_SkAlphaType : kPremul_SkAlphaType;
 
     if (SkImageCacherator* cacher = as_IB(this)->peekCacherator()) {
         GrImageTextureMaker maker(context, cacher, this, kDisallow_CachingHint);
         return create_image_from_maker(&maker, at, this->uniqueID());
     }
-    SkBitmap bmp;
-    if (!this->asLegacyBitmap(&bmp, kRO_LegacyBitmapMode)) {
-        return nullptr;
+

[robertphillips, 2016/08/08 14:32:29]

How do we know we're not in the SkImage_Generator case?

[reed1, 2016/08/08 15:19:30]

Generator's have a cacherator (by definition), so they will be caught on line
314.

That said, I'll double check that we have a unittest for this API that covers
all of the image backing types [ texture, generator, raster ]

+    if (const SkBitmap* bmp = as_IB(this)->onPeekBitmap()) {
+        GrBitmapTextureMaker maker(context, *bmp);
+        return create_image_from_maker(&maker, at, this->uniqueID());
     }
-    GrBitmapTextureMaker maker(context, bmp);
-    return create_image_from_maker(&maker, at, this->uniqueID());
+    return nullptr;
 }
 
 sk_sp<SkImage> SkImage::makeNonTextureImage() const {
     if (!this->isTextureBacked()) {
         return sk_ref_sp(const_cast<SkImage*>(this));
     }
     SkImageInfo info = as_IB(this)->onImageInfo();
     size_t rowBytes = info.minRowBytes();
     size_t size = info.getSafeSize(rowBytes);
     auto data = SkData::MakeUninitialized(size);
@@ skipping 236 matching lines @@
         return nullptr;
     }
     SkAutoTUnref<GrTexture> texture(GrUploadMipMapToTexture(ctx, info, texels, mipLevelCount));
     if (!texture) {
         return nullptr;
     }
     return sk_make_sp<SkImage_Gpu>(texture->width(), texture->height(), kNeedNewImageUniqueID,
                                    info.alphaType(), texture, sk_ref_sp(info.colorSpace()),
                                    budgeted);
 }