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

diff --git a/src/gpu/GrTestUtils.cpp b/src/gpu/GrTestUtils.cpp
index c6e95a3..42aba5e 100644
--- a/src/gpu/GrTestUtils.cpp
+++ b/src/gpu/GrTestUtils.cpp
@@ -13,7 +13,7 @@
 #include "include/gpu/GrContext.h"
 #include "src/core/SkMakeUnique.h"
 #include "src/core/SkRectPriv.h"
-#include "src/gpu/GrColorSpaceInfo.h"
+#include "src/gpu/GrColorInfo.h"
 #include "src/gpu/GrProcessorUnitTest.h"
 #include "src/gpu/GrStyle.h"
 #include "src/utils/SkDashPathPriv.h"
@@ -338,10 +338,10 @@
 
 TestAsFPArgs::TestAsFPArgs(GrProcessorTestData* d)
         : fViewMatrixStorage(TestMatrix(d->fRandom))
-        , fColorSpaceInfoStorage(skstd::make_unique<GrColorSpaceInfo>(
+        , fColorInfoStorage(skstd::make_unique<GrColorInfo>(
                   GrColorType::kRGBA_8888, kPremul_SkAlphaType, TestColorSpace(d->fRandom)))
-        , fArgs(d->context(), &fViewMatrixStorage, kNone_SkFilterQuality,
-                fColorSpaceInfoStorage.get()) {}
+        , fArgs(d->context(), &fViewMatrixStorage, kNone_SkFilterQuality, fColorInfoStorage.get()) {
+}
 
 TestAsFPArgs::~TestAsFPArgs() {}