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/GrBlurUtils.cpp

diff --git a/src/gpu/GrBlurUtils.cpp b/src/gpu/GrBlurUtils.cpp
index 130d840..71a54bd 100644
--- a/src/gpu/GrBlurUtils.cpp
+++ b/src/gpu/GrBlurUtils.cpp
@@ -411,8 +411,8 @@
             if (maskRTC) {
                 filteredMask = maskFilter->filterMaskGPU(context,
                                                          maskRTC->asTextureProxyRef(),
-                                                         maskRTC->colorSpaceInfo().colorType(),
-                                                         maskRTC->colorSpaceInfo().alphaType(),
+                                                         maskRTC->colorInfo().colorType(),
+                                                         maskRTC->colorInfo().alphaType(),
                                                          viewMatrix,
                                                          maskRect);
                 SkASSERT(kTopLeft_GrSurfaceOrigin == filteredMask->origin());
@@ -459,8 +459,7 @@
     }
 
     GrPaint grPaint;
-    if (!SkPaintToGrPaint(context, renderTargetContext->colorSpaceInfo(), paint, viewMatrix,
-                          &grPaint)) {
+    if (!SkPaintToGrPaint(context, renderTargetContext->colorInfo(), paint, viewMatrix, &grPaint)) {
         return;
     }