Cleanup of code that converts from GPU-backed resources to SkImageInfo

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 25 matching lines @@
         SkNotifyBitmapGenIDIsStale(this->uniqueID());
     }
 }
 
 extern void SkTextureImageApplyBudgetedDecision(SkImage* image) {
     if (image->isTextureBacked()) {
         ((SkImage_Gpu*)image)->applyBudgetDecision();
     }
 }
 
+SkImageInfo SkImage_Gpu::onImageInfo() const {
+    SkColorType ct;
+    if (!GrPixelConfigToColorType(fTexture->config(), &ct)) {
+        ct = kUnknown_SkColorType;
+    }
+    return SkImageInfo::Make(fTexture->width(), fTexture->height(), ct, fAlphaType, fColorSpace);

[Brian Osman, 2016/07/21 20:57:07]

This is now slightly different semantically - it used to call isOpaque
so the resulting info would only be opaque or premul. I see no reason
to keep that behavior.

+}
+
 static SkImageInfo make_info(int w, int h, bool isOpaque, sk_sp<SkColorSpace> colorSpace) {
     return SkImageInfo::MakeN32(w, h, isOpaque ? kOpaque_SkAlphaType : kPremul_SkAlphaType,
                                 std::move(colorSpace));
 }
 
 bool SkImage_Gpu::getROPixels(SkBitmap* dst, CachingHint chint) const {
     if (SkBitmapCache::Find(this->uniqueID(), dst)) {
         SkASSERT(dst->getGenerationID() == this->uniqueID());
         SkASSERT(dst->isImmutable());
         SkASSERT(dst->getPixels());
@@ skipping 253 matching lines @@
     }
     SkBitmap bmp;
     if (!this->asLegacyBitmap(&bmp, kRO_LegacyBitmapMode)) {
         return nullptr;
     }
     GrBitmapTextureMaker maker(context, bmp);
     return create_image_from_maker(&maker, at, this->uniqueID());
 }
 
 sk_sp<SkImage> SkImage::makeNonTextureImage() const {
-    GrTexture* texture = as_IB(this)->peekTexture();
-    if (!texture) {
+    if (!this->isTextureBacked()) {
         return sk_ref_sp(const_cast<SkImage*>(this));
     }
-    SkColorType ct;
-    sk_sp<SkColorSpace> cs;
-    if (!GrPixelConfigToColorAndColorSpace(texture->config(), &ct, &cs)) {
-        return nullptr;
-    }
-    SkAlphaType at = this->isOpaque() ? kOpaque_SkAlphaType : kPremul_SkAlphaType;
-    auto info = SkImageInfo::Make(this->width(), this->height(), ct, at, cs);
+    SkImageInfo info = as_IB(this)->onImageInfo();

[Brian Osman, 2016/07/21 20:57:07]

Similar to above. We already have the *correct* alpha type!

     size_t rowBytes = info.minRowBytes();
     size_t size = info.getSafeSize(rowBytes);
     auto data = SkData::MakeUninitialized(size);
     if (!data) {
         return nullptr;
     }
     SkPixmap pm(info, data->writable_data(), rowBytes);
     if (!this->readPixels(pm, 0, 0, kDisallow_CachingHint)) {
         return nullptr;
     }
@@ skipping 205 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);
 }