From 802acec1876bb647aaab1bbcfd97748bba54da8f Mon Sep 17 00:00:00 2001 From: egdaniel Date: Fri, 17 Jun 2016 15:11:45 -0700 Subject: Revert of More removal of SkColorProfileType... (patchset #2 id:20001 of https://codereview.chromium.org/2071393002/ ) Reason for revert: This was still used in chrome Original issue's description: > 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 > > Committed: https://skia.googlesource.com/skia/+/944876f2745a62a839e49275daf93a0329372e67 TBR=msarett@google.com,reed@google.com,bsalomon@google.com,brianosman@google.com # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=skia: Review-Url: https://codereview.chromium.org/2074103004 --- src/gpu/SkGrPriv.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/gpu/SkGrPriv.h') diff --git a/src/gpu/SkGrPriv.h b/src/gpu/SkGrPriv.h index ab77dc1e79..266cfff61c 100644 --- a/src/gpu/SkGrPriv.h +++ b/src/gpu/SkGrPriv.h @@ -102,7 +102,7 @@ bool SkPaintToGrPaintWithTexture(GrContext* context, GrSurfaceDesc GrImageInfoToSurfaceDesc(const SkImageInfo&, const GrCaps&); -bool GrPixelConfigToColorAndColorSpace(GrPixelConfig, SkColorType*, sk_sp*); +bool GrPixelConfig2ColorAndProfileType(GrPixelConfig, SkColorType*, SkColorProfileType*); /** * If the compressed data in the SkData is supported (as a texture format, this returns -- cgit v1.2.3