commit 5c96db88213d4042c53aa205e8da318512b83ac2
author Greg Daniel <egdaniel@google.com> Tue Jul 09 14:06:58 2019 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Jul 09 20:03:44 2019 +0000
tree b0596e8aa95a67499e7c8834038d625b8f40cc4e
parent a3ffaabcc4f2f0673ee423f45aa858599ed4fc4f

Move last few uses of SkColorType out of GrCaps.

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

src/gpu/GrContextThreadSafeProxy.cpp

diff --git a/src/gpu/GrContextThreadSafeProxy.cpp b/src/gpu/GrContextThreadSafeProxy.cpp
index f01e8d6..9a1a37a 100644
--- a/src/gpu/GrContextThreadSafeProxy.cpp
+++ b/src/gpu/GrContextThreadSafeProxy.cpp
@@ -59,7 +59,7 @@
         return SkSurfaceCharacterization(); // return an invalid characterization
     }
 
-    sampleCnt = this->caps()->getRenderTargetSampleCount(sampleCnt, ii.colorType(), backendFormat);
+    sampleCnt = this->caps()->getRenderTargetSampleCount(sampleCnt, grColorType, backendFormat);
     if (!sampleCnt) {
         return SkSurfaceCharacterization(); // return an invalid characterization
     }