src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp - Issue 318923005: SkShader::asNewEffect Refactoring

Unified Diff: src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp

Issue 318923005: SkShader::asNewEffect Refactoring (Closed) Base URL: https://skia.googlesource.com/skia.git@master

Patch Set: Style corrections Created 6 years, 6 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

« src/effects/gradients/SkTwoPointConicalGradient.cpp ('K') | « src/effects/gradients/SkTwoPointConicalGradient.cpp ('k') | src/effects/gradients/SkTwoPointRadialGradient.h » ('j') | src/effects/gradients/SkTwoPointRadialGradient.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp

diff --git a/src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp b/src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp

index 23fee850f5a3e4fda11937c00ce5ce9279b29d22..c7231a7283120fda04a14951e487432e73c53104 100644

--- a/src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp

+++ b/src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp

@@ -199,7 +199,10 @@ GrEffectRef* Edge2PtConicalEffect::TestCreate(SkRandom* random,

colors, stops, colorCount,

tm));

SkPaint paint;

- return shader->asNewEffect(context, paint, NULL);

+ GrEffectRef* effect;

+ GrColor grColor;

+ shader->asNewEffect(context, paint, &grColor, &effect, NULL);

+ return effect;

}

GLEdge2PtConicalEffect::GLEdge2PtConicalEffect(const GrBackendEffectFactory& factory,

@@ -470,7 +473,10 @@ GrEffectRef* FocalOutside2PtConicalEffect::TestCreate(SkRandom* random,

colors, stops, colorCount,

tm));

SkPaint paint;

- return shader->asNewEffect(context, paint, NULL);

+ GrEffectRef* effect;

+ GrColor grColor;

+ shader->asNewEffect(context, paint, &grColor, &effect, NULL);

+ return effect;

}

GLFocalOutside2PtConicalEffect::GLFocalOutside2PtConicalEffect(const GrBackendEffectFactory& factory,

@@ -679,7 +685,10 @@ GrEffectRef* FocalInside2PtConicalEffect::TestCreate(SkRandom* random,

colors, stops, colorCount,

tm));

SkPaint paint;

- return shader->asNewEffect(context, paint, NULL);

+ GrColor grColor;

+ GrEffectRef* grEffect;

+ shader->asNewEffect(context, paint, &grColor, &grEffect, NULL);

+ return grEffect;

}

GLFocalInside2PtConicalEffect::GLFocalInside2PtConicalEffect(const GrBackendEffectFactory& factory,

@@ -920,7 +929,10 @@ GrEffectRef* CircleInside2PtConicalEffect::TestCreate(SkRandom* random,

colors, stops, colorCount,

tm));

SkPaint paint;

- return shader->asNewEffect(context, paint, NULL);

+ GrColor grColor;

+ GrEffectRef* grEffect;

+ shader->asNewEffect(context, paint, &grColor, &grEffect, NULL);

+ return grEffect;

}

GLCircleInside2PtConicalEffect::GLCircleInside2PtConicalEffect(const GrBackendEffectFactory& factory,

@@ -1148,7 +1160,10 @@ GrEffectRef* CircleOutside2PtConicalEffect::TestCreate(SkRandom* random,

colors, stops, colorCount,

tm));

SkPaint paint;

- return shader->asNewEffect(context, paint, NULL);

+ GrColor grColor;

+ GrEffectRef* grEffect;

+ shader->asNewEffect(context, paint, &grColor, &grEffect, NULL);

+ return grEffect;

}

GLCircleOutside2PtConicalEffect::GLCircleOutside2PtConicalEffect(const GrBackendEffectFactory& factory,