commit d628747dfb546a92e5aa0968f1f11c01939c7de6
author Brian Salomon <bsalomon@google.com> Mon Jun 24 15:50:07 2019 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Jun 25 14:29:09 2019 +0000
tree 6abe38fa680433d85edb60e0f609ccb2b523b0aa
parent 8b23d0ee5355b2d6e5898ec43adcdfe7d982e78c

Make GrColorSpaceInfo store GrColorType.

This is largely redundant with GrPixelConfig. However, we intend to
remove GrPixelConfig.

Bug: skia:7580

Change-Id: I03d92303be832711f7821f8a97d36387c9b04a9f
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/222883
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>

src/gpu/GrClipStackClip.cpp

diff --git a/src/gpu/GrClipStackClip.cpp b/src/gpu/GrClipStackClip.cpp
index b7be58a..2acb5a8 100644
--- a/src/gpu/GrClipStackClip.cpp
+++ b/src/gpu/GrClipStackClip.cpp
@@ -359,10 +359,21 @@
 
     GrBackendFormat format =
             context->priv().caps()->getBackendFormatFromColorType(kAlpha_8_SkColorType);
-    sk_sp<GrRenderTargetContext> rtc(context->priv().makeDeferredRenderTargetContextWithFallback(
-            format, SkBackingFit::kApprox, reducedClip.width(), reducedClip.height(),
-            kAlpha_8_GrPixelConfig, nullptr, 1, GrMipMapped::kNo, kTopLeft_GrSurfaceOrigin, nullptr,
-            SkBudgeted::kYes, proxy->isProtected() ? GrProtected::kYes : GrProtected::kNo));
+    auto isProtected = proxy->isProtected() ? GrProtected::kYes : GrProtected::kNo;
+    sk_sp<GrRenderTargetContext> rtc(
+            context->priv().makeDeferredRenderTargetContextWithFallback(format,
+                                                                        SkBackingFit::kApprox,
+                                                                        reducedClip.width(),
+                                                                        reducedClip.height(),
+                                                                        kAlpha_8_GrPixelConfig,
+                                                                        GrColorType::kAlpha_8,
+                                                                        nullptr,
+                                                                        1,
+                                                                        GrMipMapped::kNo,
+                                                                        kTopLeft_GrSurfaceOrigin,
+                                                                        nullptr,
+                                                                        SkBudgeted::kYes,
+                                                                        isProtected));
     if (!rtc) {
         return nullptr;
     }