From 1aa90cf11e136a722bce71dd77f4bb03cc2b56f8 Mon Sep 17 00:00:00 2001 From: "skia.committer@gmail.com" Date: Tue, 6 Nov 2012 13:18:25 +0000 Subject: [PATCH] Sanitizing source files in Skia_Periodic_House_Keeping git-svn-id: http://skia.googlecode.com/svn/trunk@6306 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gm/blurrect.cpp | 2 +- include/gpu/GrBackendEffectFactory.h | 2 +- samplecode/SampleFatBits.cpp | 2 +- src/gpu/effects/GrTextureDomainEffect.cpp | 2 +- tools/bench_pictures_main.cpp | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gm/blurrect.cpp b/gm/blurrect.cpp index d6c3e7ba7..57e56792b 100644 --- a/gm/blurrect.cpp +++ b/gm/blurrect.cpp @@ -28,7 +28,7 @@ static void stroke_rect(SkCanvas* canvas, const SkRect& r, const SkPaint& p) { static void draw_donut(SkCanvas* canvas, const SkRect& r, const SkPaint& p) { SkRect rect; SkPath path; - + rect = r; rect.outset(STROKE_WIDTH/2, STROKE_WIDTH/2); path.addRect(rect); diff --git a/include/gpu/GrBackendEffectFactory.h b/include/gpu/GrBackendEffectFactory.h index 07467abd7..2bfefb93e 100644 --- a/include/gpu/GrBackendEffectFactory.h +++ b/include/gpu/GrBackendEffectFactory.h @@ -67,7 +67,7 @@ protected: static EffectKey GenID() { GR_DEBUGCODE(static const int32_t kClassIDBits = 8 * sizeof(EffectKey) - kTextureKeyBits - - kEffectKeyBits); + kEffectKeyBits); // fCurrEffectClassID has been initialized to kIllegalEffectClassID. The // atomic inc returns the old value not the incremented value. So we add // 1 to the returned value. diff --git a/samplecode/SampleFatBits.cpp b/samplecode/SampleFatBits.cpp index ccecb9e1e..e88a1d5aa 100644 --- a/samplecode/SampleFatBits.cpp +++ b/samplecode/SampleFatBits.cpp @@ -51,7 +51,7 @@ public: fShowSkeleton = true; fUseGPU = false; fUseClip = false; - + fClipRect.set(2, 2, 11, 8 ); } diff --git a/src/gpu/effects/GrTextureDomainEffect.cpp b/src/gpu/effects/GrTextureDomainEffect.cpp index d957d1cbe..823b0722a 100644 --- a/src/gpu/effects/GrTextureDomainEffect.cpp +++ b/src/gpu/effects/GrTextureDomainEffect.cpp @@ -93,7 +93,7 @@ void GrGLTextureDomainEffect::setData(const GrGLUniformManager& uman, const GrEf effect.getMatrix(), stage.getCoordChangeMatrix(), effect.texture(0)); -} +} GrGLEffect::EffectKey GrGLTextureDomainEffect::GenKey(const GrEffectStage& stage, const GrGLCaps&) { const GrTextureDomainEffect& effect = diff --git a/tools/bench_pictures_main.cpp b/tools/bench_pictures_main.cpp index 87149e9af..8b1de3c36 100644 --- a/tools/bench_pictures_main.cpp +++ b/tools/bench_pictures_main.cpp @@ -167,7 +167,7 @@ static void parse_commandline(int argc, char* const argv[], SkTArray* const char* heightString = NULL; bool isPowerOf2Mode = false; const char* mode = NULL; - sk_tools::PictureRenderer::BBoxHierarchyType bbhType = + sk_tools::PictureRenderer::BBoxHierarchyType bbhType = sk_tools::PictureRenderer::kNone_BBoxHierarchyType; for (++argv; argv < stop; ++argv) { if (0 == strcmp(*argv, "--repeat")) {