Sanitizing source files in Skia_Periodic_House_Keeping
git-svn-id: http://skia.googlecode.com/svn/trunk@8477 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/src/gpu/GrDrawState.cpp b/src/gpu/GrDrawState.cpp
index aa9e692..21bff8b 100644
--- a/src/gpu/GrDrawState.cpp
+++ b/src/gpu/GrDrawState.cpp
@@ -146,7 +146,7 @@
int slVecCount = GrSLTypeVectorCount(effectSLType);
int attribVecCount = GrVertexAttribTypeVectorCount(attribType);
if (slVecCount != attribVecCount ||
- (static_cast<GrSLType>(-1) != slTypes[attribIndex] &&
+ (static_cast<GrSLType>(-1) != slTypes[attribIndex] &&
slTypes[attribIndex] != effectSLType)) {
return false;
}
diff --git a/src/gpu/GrDrawState.h b/src/gpu/GrDrawState.h
index 3ed9fea..024dfd0 100644
--- a/src/gpu/GrDrawState.h
+++ b/src/gpu/GrDrawState.h
@@ -423,7 +423,7 @@
}
}
}
-
+
/**
* Checks whether any of the effects will read the dst pixel color.
*/
diff --git a/src/gpu/GrDrawTarget.cpp b/src/gpu/GrDrawTarget.cpp
index ea77871..e9f5be5 100644
--- a/src/gpu/GrDrawTarget.cpp
+++ b/src/gpu/GrDrawTarget.cpp
@@ -435,7 +435,7 @@
//GrPrintf("No dev bounds when dst copy is made.\n");
#endif
}
-
+
GrDrawTarget::AutoGeometryAndStatePush agasp(this, kReset_ASRInit);
// The draw will resolve dst if it has MSAA. Two things to consider in the future:
@@ -462,12 +462,12 @@
SkMatrix matrix;
matrix.setIDiv(rt->width(), rt->height());
this->drawState()->createTextureEffect(kTextureStage, rt->asTexture(), matrix);
-
+
SkRect srcRect = SkRect::MakeFromIRect(copyRect);
SkRect dstRect = SkRect::MakeWH(SkIntToScalar(copyRect.width()),
SkIntToScalar(copyRect.height()));
this->drawRect(dstRect, NULL, &srcRect, NULL);
-
+
info->fDstCopy.setTexture(ast.texture());
info->fDstCopy.setOffset(copyRect.fLeft, copyRect.fTop);
return true;
diff --git a/src/gpu/GrDrawTarget.h b/src/gpu/GrDrawTarget.h
index df3f31b..e4394e6 100644
--- a/src/gpu/GrDrawTarget.h
+++ b/src/gpu/GrDrawTarget.h
@@ -654,7 +654,7 @@
fDevBounds = &fDevBoundsStorage;
}
const SkRect* getDevBounds() const { return fDevBounds; }
-
+
bool getDevIBounds(SkIRect* bounds) const {
if (NULL != fDevBounds) {
fDevBounds->roundOut(bounds);
diff --git a/src/gpu/gl/GrGLProgram.h b/src/gpu/gl/GrGLProgram.h
index 4b5dfea..4221d73 100644
--- a/src/gpu/gl/GrGLProgram.h
+++ b/src/gpu/gl/GrGLProgram.h
@@ -61,8 +61,8 @@
/**
* Some GL state that is relevant to programs is not stored per-program. In particular color
- * and coverage attributes can be global state. This struct is read and updated by
- * GrGLProgram::setColor and GrGLProgram::setCoverage to allow us to avoid setting this state
+ * and coverage attributes can be global state. This struct is read and updated by
+ * GrGLProgram::setColor and GrGLProgram::setCoverage to allow us to avoid setting this state
* redundantly.
*/
struct SharedGLState {
diff --git a/src/gpu/gl/GrGLProgramDesc.h b/src/gpu/gl/GrGLProgramDesc.h
index a77ed71..d2167c7 100644
--- a/src/gpu/gl/GrGLProgramDesc.h
+++ b/src/gpu/gl/GrGLProgramDesc.h
@@ -80,11 +80,11 @@
/** Non-zero if this stage has an effect */
GrGLEffect::EffectKey fEffectKeys[GrDrawState::kNumStages];
- // To enable experimental geometry shader code (not for use in
- // production)
-#if GR_GL_EXPERIMENTAL_GS
- bool fExperimentalGS;
-#endif
+ // To enable experimental geometry shader code (not for use in
+ // production)
+#if GR_GL_EXPERIMENTAL_GS
+ bool fExperimentalGS;
+#endif
GrGLShaderBuilder::DstReadKey fDstRead; // set by GrGLShaderBuilder if there
// are effects that must read the dst.