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

Sanitizing source files in Skia_Periodic_House_Keeping

Browse Source 
git-svn-id: http://skia.googlecode.com/svn/trunk@6258 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
skia.committer@gmail.com 2012-11-02 02:01:24 +00:00
parent e41fee9767
commit 760f2d95dd
6 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gyp/nacl.gyp
View File

@ -16,4 +16,4 @@
], ],
}, },
], ],
} }

2
src/core/SkPicture.cpp
View File

@ -208,7 +208,7 @@ SkCanvas* SkPicture::beginRecording(int width, int height,
} }
SkBBoxHierarchy* SkPicture::createBBoxHierarchy() const { SkBBoxHierarchy* SkPicture::createBBoxHierarchy() const {
// These values were empirically determined to produce reasonable // These values were empirically determined to produce reasonable
// performance in most cases. // performance in most cases.
static const int kRTreeMinChildren = 6; static const int kRTreeMinChildren = 6;
static const int kRTreeMaxChildren = 11; static const int kRTreeMaxChildren = 11;

2
src/effects/SkBlendImageFilter.cpp
View File

@ -295,7 +295,7 @@ void GrGLBlendEffect::setData(const GrGLUniformManager& uman, const GrEffectStag
GrGLEffect::EffectKey GrGLBlendEffect::GenKey(const GrEffectStage& stage, const GrGLCaps&) { GrGLEffect::EffectKey GrGLBlendEffect::GenKey(const GrEffectStage& stage, const GrGLCaps&) {
const GrBlendEffect& blend = static_cast<const GrBlendEffect&>(*stage.getEffect()); const GrBlendEffect& blend = static_cast<const GrBlendEffect&>(*stage.getEffect());
EffectKey key = EffectKey key =
GrGLEffectMatrix::GenKey(blend.getMatrix(), stage.getCoordChangeMatrix(), blend.texture(0)); GrGLEffectMatrix::GenKey(blend.getMatrix(), stage.getCoordChangeMatrix(), blend.texture(0));
key |= (blend.mode() << GrGLEffectMatrix::kKeyBits); key |= (blend.mode() << GrGLEffectMatrix::kKeyBits);
return key; return key;

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

@ -704,7 +704,7 @@ void GrGLGradientEffect::setData(const GrGLUniformManager& uman, const GrEffectS
GrGLEffect::EffectKey GrGLGradientEffect::GenMatrixKey(const GrEffectStage& s) { GrGLEffect::EffectKey GrGLGradientEffect::GenMatrixKey(const GrEffectStage& s) {
const GrGradientEffect& e = static_cast<const GrGradientEffect&>(*s.getEffect()); const GrGradientEffect& e = static_cast<const GrGradientEffect&>(*s.getEffect());
const GrTexture* texture = e.texture(0); const GrTexture* texture = e.texture(0);
return GrGLEffectMatrix::GenKey(e.getMatrix(), s.getCoordChangeMatrix(), texture); return GrGLEffectMatrix::GenKey(e.getMatrix(), s.getCoordChangeMatrix(), texture);
} }
void GrGLGradientEffect::setupMatrix(GrGLShaderBuilder* builder, void GrGLGradientEffect::setupMatrix(GrGLShaderBuilder* builder,

2
src/gpu/gl/GrGLEffectMatrix.cpp
View File

@ -134,7 +134,7 @@ void GrGLEffectMatrix::emitCodeMakeFSCoords2D(GrGLShaderBuilder* builder,
GrSLType* vsVaryingType, GrSLType* vsVaryingType,
const char* suffix) { const char* suffix) {
const char* fsVaryingName; const char* fsVaryingName;
GrSLType varyingType = this->emitCode(builder, GrSLType varyingType = this->emitCode(builder,
key, key,
vertexCoords, vertexCoords,

2
tools/render_pdfs_main.cpp
View File

@ -66,7 +66,7 @@ static bool replace_filename_extension(SkString* path,
return false; return false;
} }
/** Builds the output filename. path = dir/name, and it replaces expected /** Builds the output filename. path = dir/name, and it replaces expected
* .skp extension with .pdf extention. * .skp extension with .pdf extention.
* @param path Output filename. * @param path Output filename.
* @param name The name of the file. * @param name The name of the file.