diff options
author | skia.committer@gmail.com <skia.committer@gmail.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-04-03 07:01:14 +0000 |
---|---|---|
committer | skia.committer@gmail.com <skia.committer@gmail.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-04-03 07:01:14 +0000 |
commit | 041e2dbc0614e3341e1349fd0e962744a45b6194 (patch) | |
tree | 077ae642c18b7d33e25ffef47bc69dbb097307be /src | |
parent | 0406b9e1faee06c6ecb2732a1bcf3b0e53104e07 (diff) |
Sanitizing source files in Skia_Periodic_House_Keeping
git-svn-id: http://skia.googlecode.com/svn/trunk@8503 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src')
-rw-r--r-- | src/gpu/GrAAConvexPathRenderer.cpp | 12 | ||||
-rw-r--r-- | src/gpu/GrAAHairLinePathRenderer.cpp | 24 | ||||
-rw-r--r-- | src/gpu/GrOvalRenderer.cpp | 10 | ||||
-rw-r--r-- | src/sfnt/SkOTTable_name.h | 2 |
4 files changed, 24 insertions, 24 deletions
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 { |