diff options
| author |  commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-04-22 16:25:15 +0000 |
|---|---|---|
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-04-22 16:25:15 +0000 |
| commit | 6c5aea2f10033d527b7785dd0d7b7d5ca65bccda (patch) | |
| tree | 6ef5a6cf4d12f28d6a3ec48107e3271b0f624c83 /src/effects/gradients | |
| parent | aec143824c9be4e4af6e2cb7cce3d2d2268c0b15 (diff) | |
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
Diffstat (limited to 'src/effects/gradients')
| -rw-r--r-- | src/effects/gradients/SkGradientShader.cpp | 16 | ||||
| -rw-r--r-- | src/effects/gradients/SkGradientShaderPriv.h | 4 |
2 files changed, 10 insertions, 10 deletions
diff --git a/src/effects/gradients/SkGradientShader.cpp b/src/effects/gradients/SkGradientShader.cpp index 957b0b232c..2e92076b3a 100644 --- a/src/effects/gradients/SkGradientShader.cpp +++ b/src/effects/gradients/SkGradientShader.cpp @@ -19,7 +19,7 @@ SkGradientShaderBase::SkGradientShaderBase(const Descriptor& desc) { 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 @@ static void desc_init(SkGradientShaderBase::Descriptor* desc, 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 @@ GrGradientEffect::GrGradientEffect(GrContext* ctx, 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; diff --git a/src/effects/gradients/SkGradientShaderPriv.h b/src/effects/gradients/SkGradientShaderPriv.h index 47e46acf84..02bb50bf5b 100644 --- a/src/effects/gradients/SkGradientShaderPriv.h +++ b/src/effects/gradients/SkGradientShaderPriv.h @@ -94,7 +94,7 @@ public: int fCount; SkShader::TileMode fTileMode; SkUnitMapper* fMapper; - uint32_t fFlags; + uint32_t fGradFlags; }; public: @@ -139,7 +139,7 @@ public: // also be filled with the gradient colors GpuColorType getGpuColorType(SkColor colors[3]) const; - uint32_t getFlags() const { return fGradFlags; } + uint32_t getGradFlags() const { return fGradFlags; } protected: SkGradientShaderBase(SkReadBuffer& ); |