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@13665 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
skia.committer@gmail.com 2014-03-05 03:02:06 +00:00
parent fab349c0bf
commit f1f66c0c86
5 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gm/rrects.cpp
View File

@ -85,7 +85,7 @@ protected:
if (kAA_Draw_Type == fType) { if (kAA_Draw_Type == fType) {
paint.setAntiAlias(true); paint.setAntiAlias(true);
} }
static const SkRect kMaxTileBound = SkRect::MakeWH(SkIntToScalar(kTileX), SkIntToScalar(kTileY)); static const SkRect kMaxTileBound = SkRect::MakeWH(SkIntToScalar(kTileX), SkIntToScalar(kTileY));
int curRRect = 0; int curRRect = 0;
@ -108,7 +108,7 @@ protected:
return; return;
} }
GrDrawState* drawState = tt.target()->drawState(); GrDrawState* drawState = tt.target()->drawState();
SkRRect rrect = fRRects[rrectIdx]; SkRRect rrect = fRRects[rrectIdx];
rrect.offset(SkIntToScalar(x), SkIntToScalar(y)); rrect.offset(SkIntToScalar(x), SkIntToScalar(y));
GrRRectEffect::EdgeType edgeType = (GrRRectEffect::EdgeType) GrRRectEffect::EdgeType edgeType = (GrRRectEffect::EdgeType)
@ -122,7 +122,7 @@ protected:
SkRect bounds = rrect.getBounds(); SkRect bounds = rrect.getBounds();
bounds.outset(2.f, 2.f); bounds.outset(2.f, 2.f);
tt.target()->drawSimpleRect(bounds); tt.target()->drawSimpleRect(bounds);
} }
#endif #endif
@ -162,7 +162,7 @@ protected:
private: private:
Type fType; Type fType;
static const int kImageWidth = 640; static const int kImageWidth = 640;
static const int kImageHeight = 480; static const int kImageHeight = 480;

2
include/core/SkRRect.h
View File

@ -224,7 +224,7 @@ public:
void outset(SkScalar dx, SkScalar dy) { void outset(SkScalar dx, SkScalar dy) {
this->inset(-dx, -dy, this); this->inset(-dx, -dy, this);
} }
/** /**
* Translate the rrect by (dx, dy). * Translate the rrect by (dx, dy).
*/ */

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

@ -21,7 +21,7 @@ class RRectEffect : public GrEffect {
public: public:
// This effect only supports circular corner rrects where the radius is >= kRadiusMin. // This effect only supports circular corner rrects where the radius is >= kRadiusMin.
static const SkScalar kRadiusMin; static const SkScalar kRadiusMin;
/// The types of circular corner rrects supported /// The types of circular corner rrects supported
enum RRectType { enum RRectType {
kCircleCorner_RRectType, //<! All four corners have the same circular radius. kCircleCorner_RRectType, //<! All four corners have the same circular radius.
@ -39,7 +39,7 @@ public:
const SkRRect& getRRect() const { return fRRect; } const SkRRect& getRRect() const { return fRRect; }
RRectType getType() const { return fRRectType; } RRectType getType() const { return fRRectType; }
EdgeType getEdgeType() const { return fEdgeType; } EdgeType getEdgeType() const { return fEdgeType; }
typedef GLRRectEffect GLEffect; typedef GLRRectEffect GLEffect;
@ -221,7 +221,7 @@ void GLRRectEffect::emitCode(GrGLShaderBuilder* builder,
radiusPlusHalfName); radiusPlusHalfName);
break; break;
} }
if (kInverseFillAA_EdgeType == rre.getEdgeType()) { if (kInverseFillAA_EdgeType == rre.getEdgeType()) {
builder->fsCodeAppend("\t\talpha = 1.0 - alpha;\n"); builder->fsCodeAppend("\t\talpha = 1.0 - alpha;\n");
} }

4
src/gpu/effects/GrRRectEffect.h
View File

@ -17,10 +17,10 @@ namespace GrRRectEffect {
enum EdgeType { enum EdgeType {
kFillAA_EdgeType, kFillAA_EdgeType,
kInverseFillAA_EdgeType, kInverseFillAA_EdgeType,
kLastEdgeType = kInverseFillAA_EdgeType, kLastEdgeType = kInverseFillAA_EdgeType,
}; };
static const int kEdgeTypeCnt = kLastEdgeType + 1; static const int kEdgeTypeCnt = kLastEdgeType + 1;
/** /**

1
tests/DynamicHashTest.cpp
View File

@ -183,4 +183,3 @@ DEF_TEST(DynamicHash_iterator, reporter) {
ASSERT(2 == count); ASSERT(2 == count);
ASSERT(keys[0] != keys[1]); ASSERT(keys[0] != keys[1]);
} }