Use GradFlags for gradient Flags in SkGradientShader
This is done to avoid confusion with other Flag variable used for alpha
type in shader
BUG=skia:
R=bsalomon@google.com
Author: egdaniel@google.com
Review URL: https://codereview.chromium.org/247433002
git-svn-id: http://skia.googlecode.com/svn/trunk@14298 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/src/effects/gradients/SkGradientShader.cpp b/src/effects/gradients/SkGradientShader.cpp
index 957b0b2..2e92076 100644
--- a/src/effects/gradients/SkGradientShader.cpp
+++ b/src/effects/gradients/SkGradientShader.cpp
@@ -19,7 +19,7 @@
fMapper = desc.fMapper;
SkSafeRef(fMapper);
- fGradFlags = SkToU8(desc.fFlags);
+ fGradFlags = SkToU8(desc.fGradFlags);
SkASSERT((unsigned)desc.fTileMode < SkShader::kTileModeCount);
SkASSERT(SkShader::kTileModeCount == SK_ARRAY_COUNT(gTileProcs));
@@ -762,12 +762,12 @@
const SkScalar pos[], int colorCount,
SkShader::TileMode mode,
SkUnitMapper* mapper, uint32_t flags) {
- desc->fColors = colors;
- desc->fPos = pos;
- desc->fCount = colorCount;
- desc->fTileMode = mode;
- desc->fMapper = mapper;
- desc->fFlags = flags;
+ desc->fColors = colors;
+ desc->fPos = pos;
+ desc->fCount = colorCount;
+ desc->fTileMode = mode;
+ desc->fMapper = mapper;
+ desc->fGradFlags = flags;
}
SkShader* SkGradientShader::CreateLinear(const SkPoint pts[2],
@@ -1083,7 +1083,7 @@
SkGradientShaderBase::kThree_GpuColorType == fColorType) {
fRow = -1;
- if (SkGradientShader::kInterpolateColorsInPremul_Flag & shader.getFlags()) {
+ if (SkGradientShader::kInterpolateColorsInPremul_Flag & shader.getGradFlags()) {
fPremulType = kBeforeInterp_PremulType;
} else {
fPremulType = kAfterInterp_PremulType;