Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(51)

Unified Diff: gm/coloremoji.cpp

Issue 1776973003: partial switch over to sp usage of shaders (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: move into lua container Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « gm/colorcube.cpp ('k') | gm/colorfilterimagefilter.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gm/coloremoji.cpp
diff --git a/gm/coloremoji.cpp b/gm/coloremoji.cpp
index 6dddc0fdc6181dafe98ceb3d0f15a4c015b37526..78c347c079655442cafa65903fd6656fb24b5773 100644
--- a/gm/coloremoji.cpp
+++ b/gm/coloremoji.cpp
@@ -19,12 +19,12 @@
/*
* Spits out a dummy gradient to test blur with shader on paint
*/
-static SkShader* MakeLinear() {
+static sk_sp<SkShader> MakeLinear() {
static const SkPoint kPts[] = { { 0, 0 }, { 32, 32 } };
static const SkScalar kPos[] = { 0, SK_Scalar1/2, SK_Scalar1 };
static const SkColor kColors[] = {0x80F00080, 0xF0F08000, 0x800080F0 };
- return SkGradientShader::CreateLinear(kPts, kColors, kPos,
- SK_ARRAY_COUNT(kColors), SkShader::kClamp_TileMode);
+ return SkGradientShader::MakeLinear(kPts, kColors, kPos, SK_ARRAY_COUNT(kColors),
+ SkShader::kClamp_TileMode);
}
static SkImageFilter* make_grayscale(SkImageFilter* input = nullptr) {
@@ -94,7 +94,7 @@ protected:
SkPaint shaderPaint;
shaderPaint.setTypeface(paint.getTypeface());
if (SkToBool(makeLinear)) {
- shaderPaint.setShader(MakeLinear())->unref();
+ shaderPaint.setShader(MakeLinear());
}
if (SkToBool(makeBlur) && SkToBool(makeGray)) {
« no previous file with comments | « gm/colorcube.cpp ('k') | gm/colorfilterimagefilter.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698