From 0acd7954a9e654d7e9c11a532eeeeb2f18a76152 Mon Sep 17 00:00:00 2001 From: Mike Reed Date: Fri, 28 Apr 2017 11:12:19 -0400 Subject: add helper makeShader for the common Clamp case Bug: skia: Change-Id: I22cac56f35fed16daede0cf1b3e34dfa6f5ae3ea Reviewed-on: https://skia-review.googlesource.com/14625 Reviewed-by: Mike Reed Commit-Queue: Mike Reed --- gm/composeshader.cpp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'gm/composeshader.cpp') diff --git a/gm/composeshader.cpp b/gm/composeshader.cpp index ff525f4777..90fcedc970 100644 --- a/gm/composeshader.cpp +++ b/gm/composeshader.cpp @@ -247,13 +247,10 @@ DEF_SIMPLE_GM(composeshader_bitmap2, canvas, 200, 200) { SkColorType::kAlpha_8_SkColorType, kPremul_SkAlphaType); skMask.installPixels(imageInfo, dst8Storage.begin(), width, nullptr, nullptr, nullptr); sk_sp skSrc = SkImage::MakeFromBitmap(skBitmap); - sk_sp skSrcShader = - skSrc->makeShader(SkShader::kClamp_TileMode, SkShader::kClamp_TileMode); sk_sp skMaskImage = SkImage::MakeFromBitmap(skMask); - sk_sp skMaskShader = skMaskImage->makeShader( - SkShader::kClamp_TileMode, SkShader::kClamp_TileMode); paint.setShader( - SkShader::MakeComposeShader(skMaskShader, skSrcShader, SkBlendMode::kSrcIn)); + SkShader::MakeComposeShader(skMaskImage->makeShader(), skSrc->makeShader(), + SkBlendMode::kSrcIn)); canvas->drawRect(r, paint); } -- cgit v1.2.3