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@11176 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
skia.committer@gmail.com 2013-09-10 07:01:44 +00:00
parent e9382aea71
commit 9a070f24f1
5 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gm/circles.cpp
View File

@ -205,4 +205,3 @@ static GM* MyFactory(void*) { return new CircleGM; }
static GMRegistry reg(MyFactory);
}

2
src/core/SkBitmapProcState.cpp
View File

@ -301,7 +301,7 @@ bool SkBitmapProcState::chooseProcs(const SkMatrix& inv, const SkPaint& paint) {
bool trivialMatrix = (fInvMatrix.getType() & ~SkMatrix::kTranslate_Mask) == 0;
bool clampClamp = SkShader::kClamp_TileMode == fTileModeX &&
SkShader::kClamp_TileMode == fTileModeY;
if (!(clampClamp || trivialMatrix)) {
fInvMatrix.postIDiv(fOrigBitmap.width(), fOrigBitmap.height());
}

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

@ -838,7 +838,7 @@ void GrGLGradientEffect::emitUniforms(GrGLShaderBuilder* builder, EffectKey key)
kVec4f_GrSLType, "GradientStartColor");
fColorEndUni = builder->addUniform(GrGLShaderBuilder::kFragment_Visibility,
kVec4f_GrSLType, "GradientEndColor");
} else if (GrGradientEffect::kThree_ColorType == ColorTypeFromKey(key)){ // 3 Color Case
fColorStartUni = builder->addUniform(GrGLShaderBuilder::kFragment_Visibility,
kVec4f_GrSLType, "GradientStartColor");
@ -907,7 +907,7 @@ void GrGLGradientEffect::setData(const GrGLUniformManager& uman,
} else {
const GrTexture* texture = e.texture(0);
fEffectMatrix.setData(uman, e.getMatrix(), drawEffect, texture);
SkScalar yCoord = e.getYCoord();
if (yCoord != fCachedYCoord) {
uman.set1f(fFSYUni, yCoord);
@ -920,11 +920,11 @@ void GrGLGradientEffect::setData(const GrGLUniformManager& uman,
GrGLEffect::EffectKey GrGLGradientEffect::GenBaseGradientKey(const GrDrawEffect& drawEffect) {
const GrGradientEffect& e = drawEffect.castEffect<GrGradientEffect>();
const GrTexture* texture = NULL;
if (GrGradientEffect::kTexture_ColorType == e.getColorType()){
texture = e.texture(0);
}
EffectKey key = GrGLEffectMatrix::GenKey(e.getMatrix(), drawEffect, kCoordsType, texture);
if (GrGradientEffect::kTwo_ColorType == e.getColorType()) {
@ -1050,7 +1050,7 @@ GrGradientEffect::GrGradientEffect(GrContext* ctx,
SkBitmap bitmap;
shader.getGradientTableBitmap(&bitmap);
fColorType = kTexture_ColorType;
GrTextureStripAtlas::Desc desc;
desc.fWidth = bitmap.width();
desc.fHeight = 32;
@ -1107,7 +1107,7 @@ bool GrGradientEffect::onIsEqual(const GrEffect& effect) const {
return false;
}
}
return fTextureAccess.getTexture() == s.fTextureAccess.getTexture() &&
fTextureAccess.getParams().getTileModeX() ==
s.fTextureAccess.getParams().getTileModeX() &&

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

@ -250,7 +250,7 @@ public:
const SkMatrix& getMatrix() const { return fMatrix;}
virtual void getConstantColorComponents(GrColor* color, uint32_t* validFlags) const SK_OVERRIDE;
enum ColorType {
kTwo_ColorType,
kThree_ColorType,

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

@ -477,7 +477,7 @@ void GrGLSweepGradient::emitCode(GrGLShaderBuilder* builder,
this->setupMatrix(builder, key, &coords);
SkString t;
t.printf("atan(- %s.y, - %s.x) * 0.1591549430918 + 0.5", coords.c_str(), coords.c_str());
this->emitColor(builder, t.c_str(), key,
this->emitColor(builder, t.c_str(), key,
outputColor, inputColor, samplers);
}