diff options
author | skia.committer@gmail.com <skia.committer@gmail.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-03-13 07:01:04 +0000 |
---|---|---|
committer | skia.committer@gmail.com <skia.committer@gmail.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-03-13 07:01:04 +0000 |
commit | 91274b99722d9be62e077ab979c630c23cdd04b1 (patch) | |
tree | e53b67d2dd8d809520cbf9cd7ef63b35362c87f3 /include | |
parent | c19c19111c79f6a0cadcc1ec00527c0f940edd60 (diff) |
Sanitizing source files in Skia_Periodic_House_Keeping
git-svn-id: http://skia.googlecode.com/svn/trunk@8120 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'include')
-rw-r--r-- | include/core/SkFontLCDConfig.h | 1 | ||||
-rw-r--r-- | include/gpu/GrEffect.h | 8 | ||||
-rw-r--r-- | include/gpu/GrEffectStage.h | 4 | ||||
-rw-r--r-- | include/gpu/GrTBackendEffectFactory.h | 2 |
4 files changed, 7 insertions, 8 deletions
diff --git a/include/core/SkFontLCDConfig.h b/include/core/SkFontLCDConfig.h index 009e7cde0b..03ee09f8b5 100644 --- a/include/core/SkFontLCDConfig.h +++ b/include/core/SkFontLCDConfig.h @@ -56,4 +56,3 @@ public: }; #endif - diff --git a/include/gpu/GrEffect.h b/include/gpu/GrEffect.h index 2792476a6d..1b2604114d 100644 --- a/include/gpu/GrEffect.h +++ b/include/gpu/GrEffect.h @@ -177,15 +177,15 @@ public: protected: /** - * Subclasses call this from their constructor to register GrTextureAccesses. The effect - * subclass manages the lifetime of the accesses (this function only stores a pointer). This + * Subclasses call this from their constructor to register GrTextureAccesses. The effect + * subclass manages the lifetime of the accesses (this function only stores a pointer). This * must only be called from the constructor because GrEffects are immutable. */ void addTextureAccess(const GrTextureAccess* textureAccess); /** - * Subclasses call this from their constructor to register vertex attributes (at most - * kMaxVertexAttribs). This must only be called from the constructor because GrEffects are + * Subclasses call this from their constructor to register vertex attributes (at most + * kMaxVertexAttribs). This must only be called from the constructor because GrEffects are * immutable. */ void addVertexAttrib(GrSLType type); diff --git a/include/gpu/GrEffectStage.h b/include/gpu/GrEffectStage.h index 05bf40c4bc..ff118c384c 100644 --- a/include/gpu/GrEffectStage.h +++ b/include/gpu/GrEffectStage.h @@ -145,8 +145,8 @@ public: return false; } - if (!(*stage.getEffect())->isEqual(*fEffect)) { - return false; + if (!(*stage.getEffect())->isEqual(*fEffect)) { + return false; } return fCoordChangeMatrix == stage.fCoordChangeMatrix; diff --git a/include/gpu/GrTBackendEffectFactory.h b/include/gpu/GrTBackendEffectFactory.h index 72b2aeaa27..1b6f8167bf 100644 --- a/include/gpu/GrTBackendEffectFactory.h +++ b/include/gpu/GrTBackendEffectFactory.h @@ -46,7 +46,7 @@ public: static const EffectKey kIllegalAttribKeyMask = (uint16_t) (~((1U << kAttribKeyBits) - 1)); GrAssert(!(kIllegalAttribKeyMask & textureKey)); #endif - return fEffectClassID | (attribKey << (kEffectKeyBits+kTextureKeyBits)) | + return fEffectClassID | (attribKey << (kEffectKeyBits+kTextureKeyBits)) | (textureKey << kEffectKeyBits) | effectKey; } |