AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Sanitizing source files in Housekeeper-Nightly

Browse Source 
git-svn-id: http://skia.googlecode.com/svn/trunk@14264 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
skia.committer@gmail.com 2014-04-19 03:04:56 +00:00
parent d15b4537b4
commit 8a777a5e6a
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gm/gradients_no_texture.cpp
View File

@ -212,11 +212,11 @@ class GradientsManyColorsGM : public GM {
typedef void (*Proc)(ColorPos*); typedef void (*Proc)(ColorPos*);
public: public:
GradientsManyColorsGM() {} GradientsManyColorsGM() {}
protected: protected:
SkString onShortName() SK_OVERRIDE { return SkString("gradients_many"); } SkString onShortName() SK_OVERRIDE { return SkString("gradients_many"); }
virtual SkISize onISize() SK_OVERRIDE { return SkISize::Make(850, 100); } virtual SkISize onISize() SK_OVERRIDE { return SkISize::Make(850, 100); }
virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE { virtual void onDraw(SkCanvas* canvas) SK_OVERRIDE {
const Proc procs[] = { const Proc procs[] = {
make0, make1, make2, make0, make1, make2,
@ -228,9 +228,9 @@ protected:
const SkRect r = SkRect::MakeWH(SkIntToScalar(W), 30); const SkRect r = SkRect::MakeWH(SkIntToScalar(W), 30);
SkPaint paint; SkPaint paint;
canvas->translate(20, 20); canvas->translate(20, 20);
for (int i = 0; i <= 8; ++i) { for (int i = 0; i <= 8; ++i) {
SkScalar x = r.width() * i / 8; SkScalar x = r.width() * i / 8;
canvas->drawLine(x, 0, x, 10000, paint); canvas->drawLine(x, 0, x, 10000, paint);
@ -246,7 +246,7 @@ protected:
canvas->translate(0, r.height() + 20); canvas->translate(0, r.height() + 20);
} }
} }
private: private:
typedef GM INHERITED; typedef GM INHERITED;
}; };

2
src/effects/gradients/SkGradientShader.cpp
View File

@ -1020,7 +1020,7 @@ GrGradientEffect::GrGradientEffect(GrContext* ctx,
if (SkGradientShaderBase::kTwo_GpuColorType == fColorType || if (SkGradientShaderBase::kTwo_GpuColorType == fColorType ||
SkGradientShaderBase::kThree_GpuColorType == fColorType) { SkGradientShaderBase::kThree_GpuColorType == fColorType) {
fRow = -1; fRow = -1;
if (SkGradientShader::kInterpolateColorsInPremul_Flag & shader.getFlags()) { if (SkGradientShader::kInterpolateColorsInPremul_Flag & shader.getFlags()) {
fPremulType = kBeforeInterp_PremulType; fPremulType = kBeforeInterp_PremulType;
} else { } else {

2
src/effects/gradients/SkGradientShaderPriv.h
View File

@ -139,7 +139,7 @@ public:
// also be filled with the gradient colors // also be filled with the gradient colors
GpuColorType getGpuColorType(SkColor colors[3]) const; GpuColorType getGpuColorType(SkColor colors[3]) const;
uint32_t getFlags() const { return fGradFlags; } uint32_t getFlags() const { return fGradFlags; }
protected: protected:
SkGradientShaderBase(SkReadBuffer& ); SkGradientShaderBase(SkReadBuffer& );