commit 65f533af95a067c0ec99e23cfd4c3a9c7e108412
author Brian Salomon <bsalomon@google.com> Tue Oct 01 09:59:02 2019 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Oct 01 14:26:30 2019 +0000
tree 719bc4e13f1b4da2b962ad682c34cad93e2cff38
parent a7914a8726575d0deffbe89a1a6ffd2d0e653c78

SkColorInfo: It's SkImageInfo minus the dimensions.

Change-Id: Idea9530028428c1a9d42e08a655457938b284b84
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/245261
Reviewed-by: Brian Osman <brianosman@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>

src/gpu/GrBitmapTextureMaker.cpp

diff --git a/src/gpu/GrBitmapTextureMaker.cpp b/src/gpu/GrBitmapTextureMaker.cpp
index 42eaa41..5fbfcf1 100644
--- a/src/gpu/GrBitmapTextureMaker.cpp
+++ b/src/gpu/GrBitmapTextureMaker.cpp
@@ -17,14 +17,9 @@
 #include "src/gpu/GrSurfaceContext.h"
 #include "src/gpu/SkGr.h"
 
-static GrColorInfo make_info(const SkBitmap& bm) {
-    return GrColorInfo(SkColorTypeToGrColorType(bm.colorType()), bm.alphaType(),
-                       bm.refColorSpace());
-}
-
 GrBitmapTextureMaker::GrBitmapTextureMaker(GrRecordingContext* context, const SkBitmap& bitmap,
                                            bool useDecal)
-        : INHERITED(context, bitmap.width(), bitmap.height(), make_info(bitmap), useDecal)
+        : INHERITED(context, bitmap.width(), bitmap.height(), bitmap.info().colorInfo(), useDecal)
         , fBitmap(bitmap) {
     if (!bitmap.isVolatile()) {
         SkIPoint origin = bitmap.pixelRefOrigin();