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

src/gpu/SkGpuDevice.h

 /*
  * Copyright 2010 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkGpuDevice_DEFINED
 #define SkGpuDevice_DEFINED
 
 #include "SkGr.h"
+#include "SkGrPriv.h"
 #include "SkBitmap.h"
 #include "SkDevice.h"
 #include "SkPicture.h"
 #include "SkRegion.h"
 #include "SkSurface.h"
 #include "GrDrawContext.h"
 #include "GrContext.h"
 #include "GrSurfacePriv.h"
 #include "GrTypes.h"
 
@@ skipping 53 matching lines @@
     GrContext* context() const override { return fContext; }
 
     // set all pixels to 0
     void clearAll();
 
     void replaceDrawContext(bool shouldRetainContent);
 
     GrDrawContext* accessDrawContext() override;
 
     SkImageInfo imageInfo() const override {
-        SkAlphaType at = fOpaque ? kOpaque_SkAlphaType : kPremul_SkAlphaType;
-        SkImageInfo info = fRenderTarget->surfacePriv().info(at).makeWH(fSize.fWidth, 
-                                                                        fSize.fHeight);
-        return info;
+        SkColorType colorType;
+        if (!GrPixelConfigToColorType(fRenderTarget->config(), &colorType)) {
+            colorType = kUnknown_SkColorType;
+        }
+        return SkImageInfo::Make(fSize.fWidth, fSize.fHeight, colorType,
+                                 fOpaque ? kOpaque_SkAlphaType : kPremul_SkAlphaType,
+                                 sk_ref_sp(fDrawContext->getColorSpace()));
     }
 
     void drawPaint(const SkDraw&, const SkPaint& paint) override;
     virtual void drawPoints(const SkDraw&, SkCanvas::PointMode mode, size_t count,
                             const SkPoint[], const SkPaint& paint) override;
     virtual void drawRect(const SkDraw&, const SkRect& r,
                           const SkPaint& paint) override;
     virtual void drawRRect(const SkDraw&, const SkRRect& r,
                            const SkPaint& paint) override;
     virtual void drawDRRect(const SkDraw& draw, const SkRRect& outer,
@@ skipping 171 matching lines @@
                                                   const SkImageInfo&,
                                                   int sampleCount,
                                                   const SkSurfaceProps*);
 
     friend class GrAtlasTextContext;
     friend class SkSurface_Gpu;      // for access to surfaceProps
     typedef SkBaseDevice INHERITED;
 };
 
 #endif