diff options
| author |  egdaniel <egdaniel@google.com> | 2016-06-17 15:11:45 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-06-17 15:11:46 -0700 |
| commit | 802acec1876bb647aaab1bbcfd97748bba54da8f (patch) | |
| tree | 0016427a547439bc8403ff92079c635607db869b /gm/dftext.cpp | |
| parent | 992a22d2e9f976f801c5de06c37f013293f11a82 (diff) | |
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
Diffstat (limited to 'gm/dftext.cpp')
| -rw-r--r-- | gm/dftext.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/gm/dftext.cpp b/gm/dftext.cpp index 42d650ed2f..05aef4c9d6 100644 --- a/gm/dftext.cpp +++ b/gm/dftext.cpp @@ -48,9 +48,8 @@ protected: // set up offscreen rendering with distance field text #if SK_SUPPORT_GPU GrContext* ctx = inputCanvas->getGrContext(); - SkISize size = onISize(); - SkImageInfo info = SkImageInfo::MakeN32(size.width(), size.height(), kPremul_SkAlphaType, - sk_ref_sp(inputCanvas->imageInfo().colorSpace())); + SkImageInfo info = SkImageInfo::MakeN32Premul(onISize(), + inputCanvas->imageInfo().profileType()); SkSurfaceProps canvasProps(SkSurfaceProps::kLegacyFontHost_InitType); uint32_t gammaCorrect = inputCanvas->getProps(&canvasProps) ? canvasProps.flags() & SkSurfaceProps::kGammaCorrect_Flag : 0; |