commit 6c5aea2f10033d527b7785dd0d7b7d5ca65bccda
author commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> Tue Apr 22 16:25:15 2014 +0000
committer commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> Tue Apr 22 16:25:15 2014 +0000
tree 6ef5a6cf4d12f28d6a3ec48107e3271b0f624c83
parent aec143824c9be4e4af6e2cb7cce3d2d2268c0b15

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

src/effects/gradients/SkGradientShader.cpp

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;

src/effects/gradients/SkGradientShaderPriv.h

diff --git a/src/effects/gradients/SkGradientShaderPriv.h b/src/effects/gradients/SkGradientShaderPriv.h
index 47e46ac..02bb50b 100644
--- a/src/effects/gradients/SkGradientShaderPriv.h
+++ b/src/effects/gradients/SkGradientShaderPriv.h
@@ -94,7 +94,7 @@
         int                 fCount;
         SkShader::TileMode  fTileMode;
         SkUnitMapper*       fMapper;
-        uint32_t            fFlags;
+        uint32_t            fGradFlags;
     };
 
 public:
@@ -139,7 +139,7 @@
     // 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& );