Create special surfaces according to original device (not always in N32)

src/core/SkSpecialImage.cpp

 /*
  * Copyright 2016 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file
  */
 
 #include "SkSpecialImage.h"
 #include "SkBitmap.h"
 #include "SkImage.h"
@@ skipping 34 matching lines @@
     virtual GrTexture* onPeekTexture() const { return nullptr; }
 
     virtual SkColorSpace* onGetColorSpace() const = 0;
 
 #if SK_SUPPORT_GPU
     virtual sk_sp<GrTexture> onAsTextureRef(GrContext* context) const = 0;
 #endif
 
     virtual sk_sp<SkSpecialImage> onMakeSubset(const SkIRect& subset) const = 0;
 
-    virtual sk_sp<SkSpecialSurface> onMakeSurface(const SkImageInfo& info) const = 0;
+    virtual sk_sp<SkSpecialSurface> onMakeSurface(const SkIRect& size, SkAlphaType at) const = 0;
 
     virtual sk_sp<SkImage> onMakeTightSubset(const SkIRect& subset) const = 0;
 
     virtual sk_sp<SkSurface> onMakeTightSurface(const SkImageInfo& info) const = 0;
 
 private:
     typedef SkSpecialImage INHERITED;
 };
 
 ///////////////////////////////////////////////////////////////////////////////
@@ skipping 78 matching lines @@
 SkColorSpace* SkSpecialImage::getColorSpace() const {
     return as_SIB(this)->onGetColorSpace();
 }
 
 #if SK_SUPPORT_GPU
 sk_sp<GrTexture> SkSpecialImage::asTextureRef(GrContext* context) const {
     return as_SIB(this)->onAsTextureRef(context);
 }
 #endif
 
-sk_sp<SkSpecialSurface> SkSpecialImage::makeSurface(const SkImageInfo& info) const {
-    return as_SIB(this)->onMakeSurface(info);
+sk_sp<SkSpecialSurface> SkSpecialImage::makeSurface(const SkIRect& size, SkAlphaType at) const {
+    return as_SIB(this)->onMakeSurface(size, at);
 }
 
 sk_sp<SkSurface> SkSpecialImage::makeTightSurface(const SkImageInfo& info) const {
     return as_SIB(this)->onMakeTightSurface(info);
 }
 
 sk_sp<SkSpecialImage> SkSpecialImage::makeSubset(const SkIRect& subset) const {
     return as_SIB(this)->onMakeSubset(subset);
 }
 
@@ skipping 79 matching lines @@
             return sk_ref_sp(GrRefCachedBitmapTexture(context,
                                                       fBitmap,
                                                       GrTextureParams::ClampNoFilter(),
                                                       SkSourceGammaTreatment::kRespect));
         }
 
         return nullptr;
     }
 #endif
 
-    sk_sp<SkSpecialSurface> onMakeSurface(const SkImageInfo& info) const override {
+    sk_sp<SkSpecialSurface> onMakeSurface(const SkIRect& size, SkAlphaType at) const override {
+        SkColorSpace* colorSpace = fBitmap.colorSpace();
+        SkColorType colorType = colorSpace && colorSpace->gammaIsLinear()
+            ? kRGBA_F16_SkColorType : kN32_SkColorType;
+        SkImageInfo info = SkImageInfo::Make(size.width(), size.height(), colorType, at,
+                                             sk_ref_sp(colorSpace));
         return SkSpecialSurface::MakeRaster(info, nullptr);
     }
 
     sk_sp<SkSpecialImage> onMakeSubset(const SkIRect& subset) const override {
         SkBitmap subsetBM;
 
         if (!fBitmap.extractSubset(&subsetBM, subset)) {
             return nullptr;
         }
 
@@ skipping 109 matching lines @@
         dst->pixelRef()->setImmutableWithID(this->uniqueID());
         SkBitmapCache::Add(this->uniqueID(), *dst);
         fAddedRasterVersionToCache.store(true);
         return true;
     }
 
     SkColorSpace* onGetColorSpace() const override {
         return fColorSpace.get();
     }
 
-    sk_sp<SkSpecialSurface> onMakeSurface(const SkImageInfo& info) const override {
+    sk_sp<SkSpecialSurface> onMakeSurface(const SkIRect& size, SkAlphaType at) const override {
         if (!fTexture->getContext()) {
             return nullptr;
         }
 
-        GrPixelConfig config = SkImageInfo2GrPixelConfig(info, *fTexture->getContext()->caps());
-
-        return SkSpecialSurface::MakeRenderTarget(fTexture->getContext(),
-                                                  info.width(), info.height(),
-                                                  config, sk_ref_sp(info.colorSpace()));
+        return SkSpecialSurface::MakeRenderTarget(
+            fTexture->getContext(), size.width(), size.height(),
+            GrRenderableConfigForColorSpace(fColorSpace.get()), fColorSpace);
     }
 
     sk_sp<SkSpecialImage> onMakeSubset(const SkIRect& subset) const override {
         return SkSpecialImage::MakeFromGpu(subset,
                                            this->uniqueID(),
                                            fTexture,
                                            fColorSpace,
                                            &this->props(),
                                            fAlphaType);
     }
@@ skipping 41 matching lines @@
                                                   sk_sp<GrTexture> tex,
                                                   sk_sp<SkColorSpace> colorSpace,
                                                   const SkSurfaceProps* props,
                                                   SkAlphaType at) {
     SkASSERT(rect_fits(subset, tex->width(), tex->height()));
     return sk_make_sp<SkSpecialImage_Gpu>(subset, uniqueID, std::move(tex), at,
                                           std::move(colorSpace), props);
 }
 
 #endif