commit 4bc0c1fc4b5023107059768e20b88ac08bb2fd41
author Brian Salomon <bsalomon@google.com> Mon Sep 30 15:12:27 2019 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Mon Sep 30 21:53:24 2019 +0000
tree 0124d825952f4a027f7cde691bbe7cafff2e76ad
parent d5a9422f32c6e7357d4561f44d162f476159a177

Rename GrColorSpaceInfo -> GrColorInfo

Add version SkImageInfo::Make() that takes SkISize instead of separate
width and height.

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

src/gpu/GrBitmapTextureMaker.cpp

diff --git a/src/gpu/GrBitmapTextureMaker.cpp b/src/gpu/GrBitmapTextureMaker.cpp
index 48ff321..42eaa41 100644
--- a/src/gpu/GrBitmapTextureMaker.cpp
+++ b/src/gpu/GrBitmapTextureMaker.cpp
@@ -17,9 +17,9 @@
 #include "src/gpu/GrSurfaceContext.h"
 #include "src/gpu/SkGr.h"
 
-static GrColorSpaceInfo make_info(const SkBitmap& bm) {
-    return GrColorSpaceInfo(SkColorTypeToGrColorType(bm.colorType()), bm.alphaType(),
-                            bm.refColorSpace());
+static GrColorInfo make_info(const SkBitmap& bm) {
+    return GrColorInfo(SkColorTypeToGrColorType(bm.colorType()), bm.alphaType(),
+                       bm.refColorSpace());
 }
 
 GrBitmapTextureMaker::GrBitmapTextureMaker(GrRecordingContext* context, const SkBitmap& bitmap,