aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar skia.committer@gmail.com <skia.committer@gmail.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2012-10-31 02:01:18 +0000
committerGravatar skia.committer@gmail.com <skia.committer@gmail.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2012-10-31 02:01:18 +0000
commite862d16162fd46ad9b2832c8844b00c81bedbac0 (patch)
treeb1ef6ce91c0a6aff627a14c92cc9f73f6c9b911f
parent6bb39782d0faf14ecb2a5cc4d2a3914366c753f0 (diff)
Sanitizing source files in Skia_Periodic_House_Keeping
git-svn-id: http://skia.googlecode.com/svn/trunk@6210 2bbb7eff-a529-9590-31e7-b0007b416f81
-rw-r--r--gm/fatpathfill.cpp4
-rw-r--r--src/effects/SkLightingImageFilter.cpp4
-rw-r--r--src/gpu/gl/GrGLProgram.cpp2
-rw-r--r--src/gpu/gl/GrGLShaderBuilder.cpp2
-rw-r--r--src/gpu/gl/GrGLTexture.cpp2
5 files changed, 7 insertions, 7 deletions
diff --git a/gm/fatpathfill.cpp b/gm/fatpathfill.cpp
index 4c5fee0f6d..3fea6f4f3d 100644
--- a/gm/fatpathfill.cpp
+++ b/gm/fatpathfill.cpp
@@ -29,7 +29,7 @@ static void draw_pixel_centers(SkCanvas* canvas) {
SkPaint paint;
paint.setColor(0xFF0088FF);
paint.setAntiAlias(true);
-
+
for (int y = 0; y < SMALL_H; ++y) {
for (int x = 0; x < SMALL_W; ++x) {
canvas->drawCircle(x + 0.5f, y + 0.5f, 1.5f / ZOOM, paint);
@@ -84,7 +84,7 @@ protected:
line.moveTo(1, 2); line.lineTo(4 + i, 1);
paint.getFillPath(line, &path);
draw_fatpath(canvas, surface, &path, 1);
-
+
canvas->translate(0, SMALL_H);
}
}
diff --git a/src/effects/SkLightingImageFilter.cpp b/src/effects/SkLightingImageFilter.cpp
index 82e1f22e4d..0aa90eff90 100644
--- a/src/effects/SkLightingImageFilter.cpp
+++ b/src/effects/SkLightingImageFilter.cpp
@@ -372,7 +372,7 @@ public:
*/
void emitLightColorUniform(GrGLShaderBuilder*);
- /**
+ /**
* These two functions are called from GrGLLightingEffect's emitCode() function.
* emitSurfaceToLight places an expression in param out that is the vector from the surface to
* the light. The expression will be used in the FS. emitLightColor writes an expression into
@@ -1421,7 +1421,7 @@ void GrGLSpotLight::emitLightColor(GrGLShaderBuilder* builder,
gLightColorArgs,
lightColorBody.c_str(),
&fLightColorFunc);
-
+
builder->fFSCode.appendf("%s(%s)", fLightColorFunc.c_str(), surfaceToLight);
}
diff --git a/src/gpu/gl/GrGLProgram.cpp b/src/gpu/gl/GrGLProgram.cpp
index 44502095d1..cd16d9e24f 100644
--- a/src/gpu/gl/GrGLProgram.cpp
+++ b/src/gpu/gl/GrGLProgram.cpp
@@ -566,7 +566,7 @@ bool GrGLProgram::genProgram(const GrEffectStage* stages[]) {
fUniforms.fViewMatrixUni = builder.addUniform(GrGLShaderBuilder::kVertex_ShaderType,
kMat33f_GrSLType, "ViewM", &viewMName);
-
+
builder.fVSCode.appendf("\tvec3 pos3 = %s * vec3(%s, 1);\n"
"\tgl_Position = vec4(pos3.xy, 0, pos3.z);\n",
viewMName, builder.positionAttribute().getName().c_str());
diff --git a/src/gpu/gl/GrGLShaderBuilder.cpp b/src/gpu/gl/GrGLShaderBuilder.cpp
index 463c0363eb..07cdbffb28 100644
--- a/src/gpu/gl/GrGLShaderBuilder.cpp
+++ b/src/gpu/gl/GrGLShaderBuilder.cpp
@@ -96,7 +96,7 @@ GrGLShaderBuilder::GrGLShaderBuilder(const GrGLContextInfo& ctx, GrGLUniformMana
, fSetupFragPosition(false)
, fRTHeightUniform(GrGLUniformManager::kInvalidUniformHandle)
, fTexCoordVaryingType(kVoid_GrSLType) {
-
+
fPositionVar = &fVSAttrs.push_back();
fPositionVar->set(kVec2f_GrSLType, GrGLShaderVar::kAttribute_TypeModifier, "aPosition");
}
diff --git a/src/gpu/gl/GrGLTexture.cpp b/src/gpu/gl/GrGLTexture.cpp
index c1821b2997..6c815e8a33 100644
--- a/src/gpu/gl/GrGLTexture.cpp
+++ b/src/gpu/gl/GrGLTexture.cpp
@@ -26,7 +26,7 @@ void GrGLTexture::init(GrGpuGL* gpu,
(GPUGL->glInterface(),
textureDesc.fTextureID,
textureDesc.fOwnsID));
-
+
if (NULL != rtDesc) {
GrAssert(kBottomLeft_Origin == textureDesc.fOrigin);
GrGLIRect vp;