From a3b532743dbb1d54a4c17a2574083ef93c949d50 Mon Sep 17 00:00:00 2001 From: "skia.committer@gmail.com" Date: Sat, 15 Feb 2014 03:02:15 +0000 Subject: [PATCH] Sanitizing source files in Housekeeper-Nightly git-svn-id: http://skia.googlecode.com/svn/trunk@13462 2bbb7eff-a529-9590-31e7-b0007b416f81 --- include/core/SkCanvas.h | 2 +- src/gpu/GrDistanceFieldTextContext.cpp | 2 +- src/gpu/effects/GrDistanceFieldTextureEffect.cpp | 10 +++++----- src/gpu/effects/GrDistanceFieldTextureEffect.h | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/include/core/SkCanvas.h b/include/core/SkCanvas.h index 4cd7adb..4be092a 100644 --- a/include/core/SkCanvas.h +++ b/include/core/SkCanvas.h @@ -494,7 +494,7 @@ public: // would cache the SkMatrix::hasPerspective result. Alternatively, have // the MC stack just set a hasPerspective boolean as it is updated. if (this->getTotalMatrix().hasPerspective()) { - // TODO: consider implementing some half-plane test between the + // TODO: consider implementing some half-plane test between the // two Y planes and the device-bounds (i.e., project the top and // bottom Y planes and then determine if the clip bounds is completely // outside either one). diff --git a/src/gpu/GrDistanceFieldTextContext.cpp b/src/gpu/GrDistanceFieldTextContext.cpp index 27323c4..c22807d 100755 --- a/src/gpu/GrDistanceFieldTextContext.cpp +++ b/src/gpu/GrDistanceFieldTextContext.cpp @@ -266,7 +266,7 @@ HAS_ATLAS: sy += dy; width *= scale; height *= scale; - + GrFixed tx = SkIntToFixed(glyph->fAtlasLocation.fX); GrFixed ty = SkIntToFixed(glyph->fAtlasLocation.fY); GrFixed tw = SkIntToFixed(glyph->fBounds.width()); diff --git a/src/gpu/effects/GrDistanceFieldTextureEffect.cpp b/src/gpu/effects/GrDistanceFieldTextureEffect.cpp index 88a36fd..2998a54 100755 --- a/src/gpu/effects/GrDistanceFieldTextureEffect.cpp +++ b/src/gpu/effects/GrDistanceFieldTextureEffect.cpp @@ -13,14 +13,14 @@ #include "GrTBackendEffectFactory.h" #include "GrTexture.h" -// The distance field is constructed as unsigned char values, so that the zero value is at 128, -// and the range is [-4, 4 - 1/255). Hence our multiplier is 8 - 1/32 and zero threshold is 128/255. +// The distance field is constructed as unsigned char values, so that the zero value is at 128, +// and the range is [-4, 4 - 1/255). Hence our multiplier is 8 - 1/32 and zero threshold is 128/255. #define MULTIPLIER "7.96875" #define THRESHOLD "0.50196078431" class GrGLDistanceFieldTextureEffect : public GrGLVertexEffect { public: - GrGLDistanceFieldTextureEffect(const GrBackendEffectFactory& factory, + GrGLDistanceFieldTextureEffect(const GrBackendEffectFactory& factory, const GrDrawEffect& drawEffect) : INHERITED (factory) , fTextureSize(SkSize::Make(-1.f,-1.f)) {} @@ -80,12 +80,12 @@ public: virtual void setData(const GrGLUniformManager& uman, const GrDrawEffect& drawEffect) SK_OVERRIDE { SkASSERT(fTextureSizeUni.isValid()); - const GrDistanceFieldTextureEffect& distanceFieldEffect = + const GrDistanceFieldTextureEffect& distanceFieldEffect = drawEffect.castEffect(); if (distanceFieldEffect.getSize().width() != fTextureSize.width() || distanceFieldEffect.getSize().height() != fTextureSize.height()) { fTextureSize = distanceFieldEffect.getSize(); - uman.set2f(fTextureSizeUni, + uman.set2f(fTextureSizeUni, distanceFieldEffect.getSize().width(), distanceFieldEffect.getSize().height()); } diff --git a/src/gpu/effects/GrDistanceFieldTextureEffect.h b/src/gpu/effects/GrDistanceFieldTextureEffect.h index e754bb2..1292c03 100755 --- a/src/gpu/effects/GrDistanceFieldTextureEffect.h +++ b/src/gpu/effects/GrDistanceFieldTextureEffect.h @@ -38,7 +38,7 @@ public: virtual const GrBackendEffectFactory& getFactory() const SK_OVERRIDE; private: - GrDistanceFieldTextureEffect(GrTexture* texture, const GrTextureParams& params, + GrDistanceFieldTextureEffect(GrTexture* texture, const GrTextureParams& params, const SkISize& textureSize); virtual bool onIsEqual(const GrEffect& other) const SK_OVERRIDE; -- 2.7.4