AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Sanitizing source files in Housekeeper-Nightly

Browse Source 
git-svn-id: http://skia.googlecode.com/svn/trunk@10886 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
skia.committer@gmail.com 2013-08-23 07:01:29 +00:00
parent 4020acfa7e
commit 44a77c8158
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gpu/GrAAHairLinePathRenderer.cpp
View File

@ -961,7 +961,7 @@ bool GrAAHairLinePathRenderer::onDrawPath(const SkPath& path,
GrEffectRef* hairConicEffect = GrConicEffect::Create(kHairAA_GrBezierEdgeType,
*target->caps());
SkASSERT(hairQuadEffect && hairConicEffect);
// Check devBounds
SkASSERT(check_bounds<BezierVertex>(drawState, devBounds, arg.vertices(),
kVertsPerQuad * quadCnt + kVertsPerQuad * conicCnt));

6
src/gpu/effects/GrBezierEffect.cpp
View File

@ -31,7 +31,7 @@ private:
typedef GrGLEffect INHERITED;
};
GrGLConicEffect::GrGLConicEffect(const GrBackendEffectFactory& factory,
const GrDrawEffect& drawEffect)
: INHERITED (factory) {
@ -171,7 +171,7 @@ private:
typedef GrGLEffect INHERITED;
};
GrGLQuadEffect::GrGLQuadEffect(const GrBackendEffectFactory& factory,
const GrDrawEffect& drawEffect)
: INHERITED (factory) {
@ -300,7 +300,7 @@ private:
typedef GrGLEffect INHERITED;
};
GrGLCubicEffect::GrGLCubicEffect(const GrBackendEffectFactory& factory,
const GrDrawEffect& drawEffect)
: INHERITED (factory) {

20
src/gpu/effects/GrBezierEffect.h
View File

@ -6,7 +6,7 @@
*/
#ifndef GrBezierEffect_DEFINED
#define GrBezierEffect_DEFINED
#define GrBezierEffect_DEFINED
#include "GrEffect.h"
#include "GrDrawTargetCaps.h"
@ -85,7 +85,7 @@ public:
}
gConicHairAA->ref();
return gConicHairAA;
} else {
} else {
gConicFillNoAA->ref();
return gConicFillNoAA;
}
@ -106,12 +106,12 @@ public:
*validFlags = 0;
}
virtual const GrBackendEffectFactory& getFactory() const SK_OVERRIDE;
virtual const GrBackendEffectFactory& getFactory() const SK_OVERRIDE;
private:
GrConicEffect(GrBezierEdgeType);
virtual bool onIsEqual(const GrEffect& other) const SK_OVERRIDE;
virtual bool onIsEqual(const GrEffect& other) const SK_OVERRIDE;
GrBezierEdgeType fEdgeType;
@ -149,7 +149,7 @@ public:
}
gQuadHairAA->ref();
return gQuadHairAA;
} else {
} else {
gQuadFillNoAA->ref();
return gQuadFillNoAA;
}
@ -170,12 +170,12 @@ public:
*validFlags = 0;
}
virtual const GrBackendEffectFactory& getFactory() const SK_OVERRIDE;
virtual const GrBackendEffectFactory& getFactory() const SK_OVERRIDE;
private:
GrQuadEffect(GrBezierEdgeType);
virtual bool onIsEqual(const GrEffect& other) const SK_OVERRIDE;
virtual bool onIsEqual(const GrEffect& other) const SK_OVERRIDE;
GrBezierEdgeType fEdgeType;
@ -215,7 +215,7 @@ public:
}
gCubicHairAA->ref();
return gCubicHairAA;
} else {
} else {
gCubicFillNoAA->ref();
return gCubicFillNoAA;
}
@ -236,12 +236,12 @@ public:
*validFlags = 0;
}
virtual const GrBackendEffectFactory& getFactory() const SK_OVERRIDE;
virtual const GrBackendEffectFactory& getFactory() const SK_OVERRIDE;
private:
GrCubicEffect(GrBezierEdgeType);
virtual bool onIsEqual(const GrEffect& other) const SK_OVERRIDE;
virtual bool onIsEqual(const GrEffect& other) const SK_OVERRIDE;
GrBezierEdgeType fEdgeType;