Sanitizing source files in Skia_Periodic_House_Keeping
git-svn-id: http://skia.googlecode.com/svn/trunk@8249 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/include/gpu/GrEffectStage.h b/include/gpu/GrEffectStage.h
index 641135d..f4e46b0 100644
--- a/include/gpu/GrEffectStage.h
+++ b/include/gpu/GrEffectStage.h
@@ -179,7 +179,7 @@
fVertexAttribIndices[0] = -1;
fVertexAttribIndices[1] = -1;
-
+
return EffectRef;
}
@@ -187,13 +187,13 @@
GrAssert(0 == fSavedCoordChangeCnt);
GrSafeAssign(fEffectRef, EffectRef);
fCoordChangeMatrix.reset();
-
+
fVertexAttribIndices[0] = attr0;
fVertexAttribIndices[1] = attr1;
-
+
return EffectRef;
}
-
+
const GrEffectRef* getEffect() const { return fEffectRef; }
const int* getVertexAttribIndices() const { return fVertexAttribIndices; }
diff --git a/src/core/SkScalerContext.cpp b/src/core/SkScalerContext.cpp
index 109f632..1f04960 100644
--- a/src/core/SkScalerContext.cpp
+++ b/src/core/SkScalerContext.cpp
@@ -124,7 +124,7 @@
if (0 == newFace) {
return NULL;
}
-
+
SkAutoTUnref<SkTypeface> aur(newFace);
uint32_t newFontID = newFace->uniqueID();
@@ -784,5 +784,3 @@
}
return c;
}
-
-
diff --git a/src/core/SkScalerContext.h b/src/core/SkScalerContext.h
index fba3e1e..94371a4 100644
--- a/src/core/SkScalerContext.h
+++ b/src/core/SkScalerContext.h
@@ -217,7 +217,7 @@
private:
// never null
SkAutoTUnref<SkTypeface> fTypeface;
-
+
// optional object, which may be null
SkPathEffect* fPathEffect;
SkMaskFilter* fMaskFilter;
diff --git a/src/gpu/GrContext.cpp b/src/gpu/GrContext.cpp
index cf74c8e..4c18574 100644
--- a/src/gpu/GrContext.cpp
+++ b/src/gpu/GrContext.cpp
@@ -1044,7 +1044,7 @@
return false;
}
- // we can draw circles
+ // we can draw circles
*isCircle = SkScalarNearlyEqual(oval.width(), oval.height())
&& circleStaysCircle(this->getMatrix());
// and axis-aligned ellipses only
@@ -1235,7 +1235,7 @@
kEdgeEffectStage = GrPaint::kTotalStages,
};
drawState->setAttribBindings(GrDrawState::kDefault_AttribBindings);
-
+
GrEffectRef* effect = GrCircleEdgeEffect::Create(isStroked);
static const int kCircleEdgeAttrIndex = 1;
drawState->setEffect(kEdgeEffectStage, effect, kCircleEdgeAttrIndex)->unref();
diff --git a/src/gpu/GrDrawState.h b/src/gpu/GrDrawState.h
index 6ee6df5..2203e88 100644
--- a/src/gpu/GrDrawState.h
+++ b/src/gpu/GrDrawState.h
@@ -489,7 +489,7 @@
fStages[stageIdx].setEffect(effect);
return effect;
}
-
+
const GrEffectRef* setEffect(int stageIdx, const GrEffectRef* effect,
int attr0, int attr1 = -1) {
fStages[stageIdx].setEffect(effect, attr0, attr1);
diff --git a/src/gpu/effects/GrCircleEdgeEffect.cpp b/src/gpu/effects/GrCircleEdgeEffect.cpp
index e430464..ba73502 100644
--- a/src/gpu/effects/GrCircleEdgeEffect.cpp
+++ b/src/gpu/effects/GrCircleEdgeEffect.cpp
@@ -28,7 +28,7 @@
const char* inputColor,
const TextureSamplerArray& samplers) SK_OVERRIDE {
const GrCircleEdgeEffect& effect = GetEffectFromStage<GrCircleEdgeEffect>(stage);
-
+
const char *vsName, *fsName;
builder->addVarying(kVec4f_GrSLType, "CircleEdge", &vsName, &fsName);
diff --git a/src/gpu/effects/GrCircleEdgeEffect.h b/src/gpu/effects/GrCircleEdgeEffect.h
index 6bd892e..0452705 100644
--- a/src/gpu/effects/GrCircleEdgeEffect.h
+++ b/src/gpu/effects/GrCircleEdgeEffect.h
@@ -14,7 +14,7 @@
/**
* The output of this effect is a modulation of the input color and coverage for a circle,
- * specified as center_x, center_y, x_radius, inner radius and outer radius in window space
+ * specified as center_x, center_y, x_radius, inner radius and outer radius in window space
* (y-down).
*/
@@ -26,7 +26,7 @@
CreateEffectRef(AutoEffectUnref(SkNEW_ARGS(GrCircleEdgeEffect, (true)))));
static SkAutoTUnref<GrEffectRef> gCircleFillEdgeEffectRef(
CreateEffectRef(AutoEffectUnref(SkNEW_ARGS(GrCircleEdgeEffect, (false)))));
-
+
if (stroke) {
gCircleStrokeEdgeEffectRef.get()->ref();
return gCircleStrokeEdgeEffectRef;
@@ -45,7 +45,7 @@
typedef GrGLCircleEdgeEffect GLEffect;
virtual const GrBackendEffectFactory& getFactory() const SK_OVERRIDE;
-
+
inline bool isStroked() const { return fStroke; }
private:
@@ -54,7 +54,7 @@
virtual bool onIsEqual(const GrEffect& other) const SK_OVERRIDE {
return true;
}
-
+
bool fStroke;
GR_DECLARE_EFFECT_TEST;
diff --git a/src/gpu/effects/GrEllipseEdgeEffect.cpp b/src/gpu/effects/GrEllipseEdgeEffect.cpp
index f4965f7..37432f0 100644
--- a/src/gpu/effects/GrEllipseEdgeEffect.cpp
+++ b/src/gpu/effects/GrEllipseEdgeEffect.cpp
@@ -26,7 +26,7 @@
const char* inputColor,
const TextureSamplerArray& samplers) SK_OVERRIDE {
const GrEllipseEdgeEffect& effect = GetEffectFromStage<GrEllipseEdgeEffect>(stage);
-
+
const char *vsCenterName, *fsCenterName;
const char *vsEdgeName, *fsEdgeName;
@@ -49,16 +49,16 @@
builder->fsCodeAppend("\tfloat dOuter = length(outerOffset);\n");
// compare outer lengths against xOuterRadius
builder->fsCodeAppendf("\tfloat edgeAlpha = clamp(%s.x-dOuter, 0.0, 1.0);\n", fsEdgeName);
-
+
if (effect.isStroked()) {
builder->fsCodeAppendf("\tinnerOffset.y *= %s.w;\n", fsEdgeName);
builder->fsCodeAppend("\tfloat dInner = length(innerOffset);\n");
-
+
// compare inner lengths against xInnerRadius
builder->fsCodeAppendf("\tfloat innerAlpha = clamp(dInner-%s.z, 0.0, 1.0);\n", fsEdgeName);
builder->fsCodeAppend("\tedgeAlpha *= innerAlpha;\n");
}
-
+
SkString modulate;
GrGLSLModulate4f(&modulate, inputColor, "edgeAlpha");
builder->fsCodeAppendf("\t%s = %s;\n", outputColor, modulate.c_str());
@@ -82,7 +82,7 @@
GrEllipseEdgeEffect::GrEllipseEdgeEffect(bool stroke) : GrEffect() {
this->addVertexAttrib(kVec2f_GrSLType);
this->addVertexAttrib(kVec4f_GrSLType);
-
+
fStroke = stroke;
}
diff --git a/src/gpu/effects/GrEllipseEdgeEffect.h b/src/gpu/effects/GrEllipseEdgeEffect.h
index 5eada2c..cb335c8 100644
--- a/src/gpu/effects/GrEllipseEdgeEffect.h
+++ b/src/gpu/effects/GrEllipseEdgeEffect.h
@@ -25,7 +25,7 @@
CreateEffectRef(AutoEffectUnref(SkNEW_ARGS(GrEllipseEdgeEffect, (true)))));
static SkAutoTUnref<GrEffectRef> gEllipseFillEdgeEffectRef(
CreateEffectRef(AutoEffectUnref(SkNEW_ARGS(GrEllipseEdgeEffect, (false)))));
-
+
if (stroke) {
gEllipseStrokeEdgeEffectRef.get()->ref();
return gEllipseStrokeEdgeEffectRef;
@@ -46,7 +46,7 @@
virtual const GrBackendEffectFactory& getFactory() const SK_OVERRIDE;
inline bool isStroked() const { return fStroke; }
-
+
private:
GrEllipseEdgeEffect(bool stroke);
diff --git a/src/pdf/SkPDFDevice.cpp b/src/pdf/SkPDFDevice.cpp
index fa5904e..1985935 100644
--- a/src/pdf/SkPDFDevice.cpp
+++ b/src/pdf/SkPDFDevice.cpp
@@ -1195,7 +1195,7 @@
newResourceObjects->add(fGraphicStateResources[i]);
fGraphicStateResources[i]->ref();
if (recursive) {
- fGraphicStateResources[i]->getResources(knownResourceObjects,
+ fGraphicStateResources[i]->getResources(knownResourceObjects,
newResourceObjects);
}
}
@@ -1206,7 +1206,7 @@
newResourceObjects->add(fXObjectResources[i]);
fXObjectResources[i]->ref();
if (recursive) {
- fXObjectResources[i]->getResources(knownResourceObjects,
+ fXObjectResources[i]->getResources(knownResourceObjects,
newResourceObjects);
}
}
@@ -1217,7 +1217,7 @@
newResourceObjects->add(fFontResources[i]);
fFontResources[i]->ref();
if (recursive) {
- fFontResources[i]->getResources(knownResourceObjects,
+ fFontResources[i]->getResources(knownResourceObjects,
newResourceObjects);
}
}
@@ -1228,7 +1228,7 @@
newResourceObjects->add(fShaderResources[i]);
fShaderResources[i]->ref();
if (recursive) {
- fShaderResources[i]->getResources(knownResourceObjects,
+ fShaderResources[i]->getResources(knownResourceObjects,
newResourceObjects);
}
}
diff --git a/src/ports/SkFontConfigInterface_direct.cpp b/src/ports/SkFontConfigInterface_direct.cpp
index 16cde51..00ffe79 100644
--- a/src/ports/SkFontConfigInterface_direct.cpp
+++ b/src/ports/SkFontConfigInterface_direct.cpp
@@ -424,5 +424,3 @@
SkStream* SkFontConfigInterfaceDirect::openStream(const FontIdentity& identity) {
return SkStream::NewFromFile(identity.fString.c_str());
}
-
-
diff --git a/src/ports/SkFontHost_FreeType_common.h b/src/ports/SkFontHost_FreeType_common.h
index efc74be..fb8271c 100644
--- a/src/ports/SkFontHost_FreeType_common.h
+++ b/src/ports/SkFontHost_FreeType_common.h
@@ -32,11 +32,11 @@
// See http://freetype.sourceforge.net/freetype2/docs/reference/ft2-bitmap_handling.html#FT_Bitmap_Embolden
// This value was chosen by eyeballing the result in Firefox and trying to match it.
static const FT_Pos kBitmapEmboldenStrength = 1 << 6;
-
+
SkScalerContext_FreeType_Base(SkTypeface* typeface, const SkDescriptor *desc)
: INHERITED(typeface, desc)
{}
-
+
void generateGlyphImage(FT_Face face, const SkGlyph& glyph);
void generateGlyphPath(FT_Face face, SkPath* path);
void emboldenOutline(FT_Face face, FT_Outline* outline);