commit f2ebdd91bfa0b6922b47874c6e1b5193dac4e3b7
author Brian Salomon <bsalomon@google.com> Mon Sep 30 12:15:30 2019 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Mon Sep 30 17:10:18 2019 +0000
tree c37ca3fde9638910f88cdd797cdb5fbbe708c8d6
parent 5c41f3676effd563cb610a24f3b30cae0adabaf8

Rename GrPixelInfo to GrImageInfo.

Give it its own header file.

Make it store SkISize rather than separate int w/h.

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

src/gpu/GrResourceProvider.cpp

diff --git a/src/gpu/GrResourceProvider.cpp b/src/gpu/GrResourceProvider.cpp
index c2e62f9..9ba9505 100644
--- a/src/gpu/GrResourceProvider.cpp
+++ b/src/gpu/GrResourceProvider.cpp
@@ -17,6 +17,7 @@
 #include "src/gpu/GrContextPriv.h"
 #include "src/gpu/GrGpu.h"
 #include "src/gpu/GrGpuBuffer.h"
+#include "src/gpu/GrImageInfo.h"
 #include "src/gpu/GrPath.h"
 #include "src/gpu/GrPathRendering.h"
 #include "src/gpu/GrProxyProvider.h"
@@ -524,8 +525,8 @@
     data->reset(new char[tempRB * size.fHeight]);
     outLevel->fPixels = data->get();
     outLevel->fRowBytes = tempRB;
-    GrPixelInfo srcInfo(origColorType,    kUnpremul_SkAlphaType, nullptr, size);
-    GrPixelInfo dstInfo(allowedColorType, kUnpremul_SkAlphaType, nullptr, size);
+    GrImageInfo srcInfo(origColorType,    kUnpremul_SkAlphaType, nullptr, size);
+    GrImageInfo dstInfo(allowedColorType, kUnpremul_SkAlphaType, nullptr, size);
     return GrConvertPixels(dstInfo, data->get(), tempRB, srcInfo, inLevel.fPixels, actualRB);
 }