From 944876f2745a62a839e49275daf93a0329372e67 Mon Sep 17 00:00:00 2001 From: brianosman Date: Fri, 17 Jun 2016 13:43:27 -0700 Subject: More removal of SkColorProfileType... Scrub GMs. Remove the gDefaultProfile thing (it's unused now), along with the command line flag that was setting it in DM and nanobench. BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2071393002 Review-Url: https://codereview.chromium.org/2071393002 --- src/gpu/GrSurface.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'src/gpu/GrSurface.cpp') diff --git a/src/gpu/GrSurface.cpp b/src/gpu/GrSurface.cpp index 886945c710..47fa394788 100644 --- a/src/gpu/GrSurface.cpp +++ b/src/gpu/GrSurface.cpp @@ -118,12 +118,11 @@ bool GrSurface::readPixels(int left, int top, int width, int height, SkImageInfo GrSurface::info(SkAlphaType alphaType) const { SkColorType colorType; - SkColorProfileType profileType; - if (!GrPixelConfig2ColorAndProfileType(this->config(), &colorType, &profileType)) { + sk_sp colorSpace; + if (!GrPixelConfigToColorAndColorSpace(this->config(), &colorType, &colorSpace)) { sk_throw(); } - return SkImageInfo::Make(this->width(), this->height(), colorType, alphaType, - profileType); + return SkImageInfo::Make(this->width(), this->height(), colorType, alphaType, colorSpace); } // TODO: This should probably be a non-member helper function. It might only be needed in -- cgit v1.2.3