aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--gm/gmmain.cpp10
-rw-r--r--src/gpu/GrAAConvexPathRenderer.cpp12
-rw-r--r--src/gpu/GrAAHairLinePathRenderer.cpp24
-rw-r--r--src/gpu/GrOvalRenderer.cpp10
-rw-r--r--src/sfnt/SkOTTable_name.h2
-rw-r--r--tools/win_lcid.cpp2
6 files changed, 30 insertions, 30 deletions
diff --git a/gm/gmmain.cpp b/gm/gmmain.cpp
index bc53cc5237..0a8d1331ac 100644
--- a/gm/gmmain.cpp
+++ b/gm/gmmain.cpp
@@ -422,7 +422,7 @@ public:
// Generate the result image by rendering to tiles and accumulating
// the results in 'bitmap'
- // This 16x16 tiling matches the settings applied to 'pict' in
+ // This 16x16 tiling matches the settings applied to 'pict' in
// 'generate_new_picture'
SkISize tileSize = SkISize::Make(16, 16);
@@ -439,14 +439,14 @@ public:
for (int xTile = 0; xTile < (size.width()+15)/16; ++xTile) {
int saveCount = tileCanvas.save();
SkMatrix mat(tileCanvas.getTotalMatrix());
- mat.postTranslate(SkIntToScalar(-xTile*tileSize.width()),
+ mat.postTranslate(SkIntToScalar(-xTile*tileSize.width()),
SkIntToScalar(-yTile*tileSize.height()));
tileCanvas.setMatrix(mat);
pict->draw(&tileCanvas);
tileCanvas.flush();
tileCanvas.restoreToCount(saveCount);
- bmpCanvas.drawBitmap(tileBM,
- SkIntToScalar(xTile * tileSize.width()),
+ bmpCanvas.drawBitmap(tileBM,
+ SkIntToScalar(xTile * tileSize.width()),
SkIntToScalar(yTile * tileSize.height()),
&bmpPaint);
}
@@ -1359,7 +1359,7 @@ ErrorCombination run_multiple_modes(GMMain &gmmain, GM *gm, const ConfigData &co
// We cannot yet pass 'true' to generate_image_from_picture to
// perform actual tiled rendering (see Issue 1198 -
// https://code.google.com/p/skia/issues/detail?id=1198)
- gmmain.generate_image_from_picture(gm, compareConfig, pict, &bitmap,
+ gmmain.generate_image_from_picture(gm, compareConfig, pict, &bitmap,
replayScale /*, true */);
SkString suffix("-tilegrid");
if (SK_Scalar1 != replayScale) {
diff --git a/src/gpu/GrAAConvexPathRenderer.cpp b/src/gpu/GrAAConvexPathRenderer.cpp
index 1ef991ef59..d011db25f1 100644
--- a/src/gpu/GrAAConvexPathRenderer.cpp
+++ b/src/gpu/GrAAConvexPathRenderer.cpp
@@ -442,8 +442,8 @@ void create_vertices(const SegmentArray& segments,
* distance with negative being inside, positive outside. The edge is specified in
* window space (y-down). If either the third or fourth component of the interpolated
* vertex coord is > 0 then the pixel is considered outside the edge. This is used to
- * attempt to trim to a portion of the infinite quad.
- * Requires shader derivative instruction support.
+ * attempt to trim to a portion of the infinite quad.
+ * Requires shader derivative instruction support.
*/
class QuadEdgeEffect : public GrEffect {
@@ -462,7 +462,7 @@ public:
static const char* Name() { return "QuadEdge"; }
- virtual void getConstantColorComponents(GrColor* color,
+ virtual void getConstantColorComponents(GrColor* color,
uint32_t* validFlags) const SK_OVERRIDE {
*validFlags = 0;
}
@@ -523,10 +523,10 @@ public:
private:
typedef GrGLEffect INHERITED;
};
-
+
private:
- QuadEdgeEffect() {
- this->addVertexAttrib(kVec4f_GrSLType);
+ QuadEdgeEffect() {
+ this->addVertexAttrib(kVec4f_GrSLType);
}
virtual bool onIsEqual(const GrEffect& other) const SK_OVERRIDE {
diff --git a/src/gpu/GrAAHairLinePathRenderer.cpp b/src/gpu/GrAAHairLinePathRenderer.cpp
index 343fca0dc1..8280d94539 100644
--- a/src/gpu/GrAAHairLinePathRenderer.cpp
+++ b/src/gpu/GrAAHairLinePathRenderer.cpp
@@ -501,8 +501,8 @@ void add_line(const SkPoint p[2],
* The output of this effect is a hairline edge for quadratics.
* Quadratic specified by 0=u^2-v canonical coords. u and v are the first
* two components of the vertex attribute. Uses unsigned distance.
- * Coverage is min(0, 1-distance). 3rd & 4th component unused.
- * Requires shader derivative instruction support.
+ * Coverage is min(0, 1-distance). 3rd & 4th component unused.
+ * Requires shader derivative instruction support.
*/
class HairQuadEdgeEffect : public GrEffect {
public:
@@ -511,7 +511,7 @@ public:
// we go through this so we only have one copy of each effect
static SkAutoTUnref<GrEffectRef> gHairQuadEdgeEffectRef(
CreateEffectRef(AutoEffectUnref(SkNEW(HairQuadEdgeEffect))));
-
+
gHairQuadEdgeEffectRef.get()->ref();
return gHairQuadEdgeEffectRef;
}
@@ -520,7 +520,7 @@ public:
static const char* Name() { return "HairQuadEdge"; }
- virtual void getConstantColorComponents(GrColor* color,
+ virtual void getConstantColorComponents(GrColor* color,
uint32_t* validFlags) const SK_OVERRIDE {
*validFlags = 0;
}
@@ -577,8 +577,8 @@ public:
};
private:
- HairQuadEdgeEffect() {
- this->addVertexAttrib(kVec4f_GrSLType);
+ HairQuadEdgeEffect() {
+ this->addVertexAttrib(kVec4f_GrSLType);
}
virtual bool onIsEqual(const GrEffect& other) const SK_OVERRIDE {
@@ -602,8 +602,8 @@ GrEffectRef* HairQuadEdgeEffect::TestCreate(SkMWCRandom* random,
///////////////////////////////////////////////////////////////////////////////
/**
- * The output of this effect is a 1-pixel wide line.
- * Input is 2D implicit device coord line eq (a*x + b*y +c = 0). 4th component unused.
+ * The output of this effect is a 1-pixel wide line.
+ * Input is 2D implicit device coord line eq (a*x + b*y +c = 0). 4th component unused.
*/
class HairLineEdgeEffect : public GrEffect {
public:
@@ -612,7 +612,7 @@ public:
// we go through this so we only have one copy of each effect
static SkAutoTUnref<GrEffectRef> gHairLineEdgeEffectRef(
CreateEffectRef(AutoEffectUnref(SkNEW(HairLineEdgeEffect))));
-
+
gHairLineEdgeEffectRef.get()->ref();
return gHairLineEdgeEffectRef;
}
@@ -621,7 +621,7 @@ public:
static const char* Name() { return "HairLineEdge"; }
- virtual void getConstantColorComponents(GrColor* color,
+ virtual void getConstantColorComponents(GrColor* color,
uint32_t* validFlags) const SK_OVERRIDE {
*validFlags = 0;
}
@@ -670,8 +670,8 @@ public:
};
private:
- HairLineEdgeEffect() {
- this->addVertexAttrib(kVec4f_GrSLType);
+ HairLineEdgeEffect() {
+ this->addVertexAttrib(kVec4f_GrSLType);
}
virtual bool onIsEqual(const GrEffect& other) const SK_OVERRIDE {
diff --git a/src/gpu/GrOvalRenderer.cpp b/src/gpu/GrOvalRenderer.cpp
index 65715f8a5b..61f27f4b90 100644
--- a/src/gpu/GrOvalRenderer.cpp
+++ b/src/gpu/GrOvalRenderer.cpp
@@ -68,7 +68,7 @@ public:
}
}
- virtual void getConstantColorComponents(GrColor* color,
+ virtual void getConstantColorComponents(GrColor* color,
uint32_t* validFlags) const SK_OVERRIDE {
*validFlags = 0;
}
@@ -179,7 +179,7 @@ public:
}
}
- virtual void getConstantColorComponents(GrColor* color,
+ virtual void getConstantColorComponents(GrColor* color,
uint32_t* validFlags) const SK_OVERRIDE {
*validFlags = 0;
}
@@ -228,7 +228,7 @@ public:
builder->fsCodeAppendf("\touterOffset.y *= %s.y;\n", fsEdgeName);
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",
+ builder->fsCodeAppendf("\tfloat edgeAlpha = clamp(%s.x-dOuter, 0.0, 1.0);\n",
fsEdgeName);
if (ellipseEffect.isStroked()) {
@@ -236,14 +236,14 @@ public:
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",
+ 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());
+ builder->fsCodeAppendf("\t%s = %s;\n", outputColor, modulate.c_str());
}
static inline EffectKey GenKey(const GrDrawEffect& drawEffect, const GrGLCaps&) {
diff --git a/src/sfnt/SkOTTable_name.h b/src/sfnt/SkOTTable_name.h
index d9d4e3fe9c..8dde1a4fc7 100644
--- a/src/sfnt/SkOTTable_name.h
+++ b/src/sfnt/SkOTTable_name.h
@@ -551,7 +551,7 @@ struct SkOTTableName {
public:
Iterator(const SkOTTableName& name) : fName(name), fIndex(0), fType(-1) { }
Iterator(const SkOTTableName& name, SkOTTableName::Record::NameID::Predefined::Value type)
- : fName(name), fIndex(0), fType(type)
+ : fName(name), fIndex(0), fType(type)
{ }
struct Record {
diff --git a/tools/win_lcid.cpp b/tools/win_lcid.cpp
index b1f8237f5a..f4901719ec 100644
--- a/tools/win_lcid.cpp
+++ b/tools/win_lcid.cpp
@@ -17,7 +17,7 @@ BOOL CALLBACK MyFuncLocaleEx(LPWSTR pStr, DWORD dwFlags, LPARAM lparam) {
wprintf(L"Error %d getting LCID\n", GetLastError());
return (TRUE);
}
-
+
if (lcid > 0x8000) {
wprintf(L"//");
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-01 15:17:25 +0000