aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/effects/gradients/SkGradientShaderPriv.h
diff options
context:
space:
mode:
authorGravatar bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2012-11-01 17:12:34 +0000
committerGravatar bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2012-11-01 17:12:34 +0000
commit81712883419f76e25d2ffec38a9438284a45a48d (patch)
treed9b6eb86b01ae7e7117f56dc2d6ca4f95879b56f /src/effects/gradients/SkGradientShaderPriv.h
parent35ac048e357aefa6289485c8f6a50fadce23c0d2 (diff)
Remove GrScalar, replace with SkScalar.
Review URL: https://codereview.appspot.com/6812064 git-svn-id: http://skia.googlecode.com/svn/trunk@6243 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/effects/gradients/SkGradientShaderPriv.h')
-rw-r--r--src/effects/gradients/SkGradientShaderPriv.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/effects/gradients/SkGradientShaderPriv.h b/src/effects/gradients/SkGradientShaderPriv.h
index 24379110ee..792cf6640f 100644
--- a/src/effects/gradients/SkGradientShaderPriv.h
+++ b/src/effects/gradients/SkGradientShaderPriv.h
@@ -237,7 +237,7 @@ public:
virtual const GrTextureAccess& textureAccess(int index) const SK_OVERRIDE;
bool useAtlas() const { return SkToBool(-1 != fRow); }
- GrScalar getYCoord() const { return fYCoord; };
+ SkScalar getYCoord() const { return fYCoord; };
const SkMatrix& getMatrix() const { return fMatrix;}
virtual bool isEqual(const GrEffect& effect) const SK_OVERRIDE {
@@ -263,7 +263,7 @@ protected:
private:
GrTextureAccess fTextureAccess;
- GrScalar fYCoord;
+ SkScalar fYCoord;
GrTextureStripAtlas* fAtlas;
int fRow;
SkMatrix fMatrix;
@@ -327,7 +327,7 @@ protected:
const GrGLShaderBuilder::TextureSampler&);
private:
- GrScalar fCachedYCoord;
+ SkScalar fCachedYCoord;
GrGLUniformManager::UniformHandle fFSYUni;
GrGLEffectMatrix fEffectMatrix;