commit 627d0539136ffc1ce556568a065d768d45a2f744
author Greg Daniel <egdaniel@google.com> Mon Jul 08 16:48:14 2019 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Jul 09 13:29:07 2019 +0000
tree 5656843dc4c42e706b7184208faf83a2573b179d
parent 5f1108ce4669f3eae133fe015b2b843ec1c5fbec

Move uses of functions taking SkColorType to GrColorType versions in GrCaps.

Change-Id: I4feda6277cf14be0d32a8ce22257902483d7ae1a
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/225734
Commit-Queue: Greg Daniel <egdaniel@google.com>
Reviewed-by: Robert Phillips <robertphillips@google.com>

src/gpu/GrProxyProvider.cpp

diff --git a/src/gpu/GrProxyProvider.cpp b/src/gpu/GrProxyProvider.cpp
index 24bcb0a..25d8839 100644
--- a/src/gpu/GrProxyProvider.cpp
+++ b/src/gpu/GrProxyProvider.cpp
@@ -213,7 +213,7 @@
     SkColorType ct = info.colorType();
     GrColorType grCT = SkColorTypeToGrColorType(ct);
 
-    GrBackendFormat format = this->caps()->getBackendFormatFromColorType(ct);
+    GrBackendFormat format = this->caps()->getBackendFormatFromColorType(grCT);
     if (!format.isValid()) {
         return nullptr;
     }
@@ -227,7 +227,8 @@
         copy8888.setImmutable();
         srcImage = SkMakeImageFromRasterBitmap(copy8888, kNever_SkCopyPixelsMode);
         ct = kRGBA_8888_SkColorType;
-        format = this->caps()->getBackendFormatFromColorType(ct);
+        grCT = GrColorType::kRGBA_8888;
+        format = this->caps()->getBackendFormatFromColorType(grCT);
         if (!format.isValid()) {
             return nullptr;
         }
@@ -331,9 +332,8 @@
                                         SkBudgeted::kYes, SkBackingFit::kExact);
     }
 
-    SkColorType colorType = bitmap.info().colorType();
-    GrColorType grColorType = SkColorTypeToGrColorType(colorType);
-    GrBackendFormat format = this->caps()->getBackendFormatFromColorType(colorType);
+    GrColorType grColorType = SkColorTypeToGrColorType(bitmap.info().colorType());
+    GrBackendFormat format = this->caps()->getBackendFormatFromColorType(grColorType);
     if (!format.isValid()) {
         return nullptr;
     }
@@ -348,8 +348,8 @@
         copy8888.setImmutable();
         baseLevel = SkMakeImageFromRasterBitmap(copy8888, kNever_SkCopyPixelsMode);
         desc.fConfig = kRGBA_8888_GrPixelConfig;
-        colorType = kRGBA_8888_SkColorType;
-        format = this->caps()->getBackendFormatFromColorType(colorType);
+        grColorType = GrColorType::kRGBA_8888;
+        format = this->caps()->getBackendFormatFromColorType(grColorType);
         if (!format.isValid()) {
             return nullptr;
         }