diff options
author | skia.committer@gmail.com <skia.committer@gmail.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-04-19 03:04:56 +0000 |
---|---|---|
committer | skia.committer@gmail.com <skia.committer@gmail.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-04-19 03:04:56 +0000 |
commit | 8a777a5e6ad081f54ec169dcf714343c38517161 (patch) | |
tree | 2c3697fed9e6710e3412161442a3736b8b649474 | |
parent | d15b4537b4a67eb8844bda8b87b9c43ea74615e8 (diff) |
Sanitizing source files in Housekeeper-Nightly
git-svn-id: http://skia.googlecode.com/svn/trunk@14264 2bbb7eff-a529-9590-31e7-b0007b416f81
-rw-r--r-- | gm/gradients_no_texture.cpp | 10 | ||||
-rw-r--r-- | src/effects/gradients/SkGradientShader.cpp | 2 | ||||
-rw-r--r-- | src/effects/gradients/SkGradientShaderPriv.h | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/gm/gradients_no_texture.cpp b/gm/gradients_no_texture.cpp index cea1e8b382..931fea677e 100644 --- a/gm/gradients_no_texture.cpp +++ b/gm/gradients_no_texture.cpp @@ -212,11 +212,11 @@ class GradientsManyColorsGM : public GM { typedef void (*Proc)(ColorPos*); public: GradientsManyColorsGM() {} - + protected: SkString onShortName() SK_OVERRIDE { return SkString("gradients_many"); } virtual SkISize onISize() SK_OVERRIDE { return SkISize::Make(850, 100); } - + virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { const Proc procs[] = { make0, make1, make2, @@ -228,9 +228,9 @@ protected: const SkRect r = SkRect::MakeWH(SkIntToScalar(W), 30); SkPaint paint; - + canvas->translate(20, 20); - + for (int i = 0; i <= 8; ++i) { SkScalar x = r.width() * i / 8; canvas->drawLine(x, 0, x, 10000, paint); @@ -246,7 +246,7 @@ protected: canvas->translate(0, r.height() + 20); } } - + private: typedef GM INHERITED; }; diff --git a/src/effects/gradients/SkGradientShader.cpp b/src/effects/gradients/SkGradientShader.cpp index 504855a478..f155cc5eb7 100644 --- a/src/effects/gradients/SkGradientShader.cpp +++ b/src/effects/gradients/SkGradientShader.cpp @@ -1020,7 +1020,7 @@ GrGradientEffect::GrGradientEffect(GrContext* ctx, if (SkGradientShaderBase::kTwo_GpuColorType == fColorType || SkGradientShaderBase::kThree_GpuColorType == fColorType) { fRow = -1; - + if (SkGradientShader::kInterpolateColorsInPremul_Flag & shader.getFlags()) { fPremulType = kBeforeInterp_PremulType; } else { diff --git a/src/effects/gradients/SkGradientShaderPriv.h b/src/effects/gradients/SkGradientShaderPriv.h index 1ccd0491ba..6a24d0f15f 100644 --- a/src/effects/gradients/SkGradientShaderPriv.h +++ b/src/effects/gradients/SkGradientShaderPriv.h @@ -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 getFlags() const { return fGradFlags; } protected: SkGradientShaderBase(SkReadBuffer& ); |