aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar skia.committer@gmail.com <skia.committer@gmail.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2014-03-05 03:02:06 +0000
committerGravatar skia.committer@gmail.com <skia.committer@gmail.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2014-03-05 03:02:06 +0000
commitf1f66c0c8623805fdb88f09c0d87cbdd1745e12b (patch)
tree42465865038f6aed09759cfc097719dff7393adb
parentfab349c0bf3a305b7a7388b77bab13b0f7b37393 (diff)
Sanitizing source files in Housekeeper-Nightly
git-svn-id: http://skia.googlecode.com/svn/trunk@13665 2bbb7eff-a529-9590-31e7-b0007b416f81
-rw-r--r--gm/rrects.cpp8
-rw-r--r--include/core/SkRRect.h2
-rw-r--r--src/gpu/effects/GrRRectEffect.cpp6
-rw-r--r--src/gpu/effects/GrRRectEffect.h4
-rw-r--r--tests/DynamicHashTest.cpp1
5 files changed, 10 insertions, 11 deletions
diff --git a/gm/rrects.cpp b/gm/rrects.cpp
index 289aa13aa4..d92fb5a912 100644
--- a/gm/rrects.cpp
+++ b/gm/rrects.cpp
@@ -85,7 +85,7 @@ protected:
if (kAA_Draw_Type == fType) {
paint.setAntiAlias(true);
}
-
+
static const SkRect kMaxTileBound = SkRect::MakeWH(SkIntToScalar(kTileX), SkIntToScalar(kTileY));
int curRRect = 0;
@@ -108,7 +108,7 @@ protected:
return;
}
GrDrawState* drawState = tt.target()->drawState();
-
+
SkRRect rrect = fRRects[rrectIdx];
rrect.offset(SkIntToScalar(x), SkIntToScalar(y));
GrRRectEffect::EdgeType edgeType = (GrRRectEffect::EdgeType)
@@ -122,7 +122,7 @@ protected:
SkRect bounds = rrect.getBounds();
bounds.outset(2.f, 2.f);
-
+
tt.target()->drawSimpleRect(bounds);
}
#endif
@@ -162,7 +162,7 @@ protected:
private:
Type fType;
-
+
static const int kImageWidth = 640;
static const int kImageHeight = 480;
diff --git a/include/core/SkRRect.h b/include/core/SkRRect.h
index 257c8236e2..c996346442 100644
--- a/include/core/SkRRect.h
+++ b/include/core/SkRRect.h
@@ -224,7 +224,7 @@ public:
void outset(SkScalar dx, SkScalar dy) {
this->inset(-dx, -dy, this);
}
-
+
/**
* Translate the rrect by (dx, dy).
*/
diff --git a/src/gpu/effects/GrRRectEffect.cpp b/src/gpu/effects/GrRRectEffect.cpp
index 583e385869..a59018673e 100644
--- a/src/gpu/effects/GrRRectEffect.cpp
+++ b/src/gpu/effects/GrRRectEffect.cpp
@@ -21,7 +21,7 @@ class RRectEffect : public GrEffect {
public:
// This effect only supports circular corner rrects where the radius is >= kRadiusMin.
static const SkScalar kRadiusMin;
-
+
/// The types of circular corner rrects supported
enum RRectType {
kCircleCorner_RRectType, //<! All four corners have the same circular radius.
@@ -39,7 +39,7 @@ public:
const SkRRect& getRRect() const { return fRRect; }
RRectType getType() const { return fRRectType; }
-
+
EdgeType getEdgeType() const { return fEdgeType; }
typedef GLRRectEffect GLEffect;
@@ -221,7 +221,7 @@ void GLRRectEffect::emitCode(GrGLShaderBuilder* builder,
radiusPlusHalfName);
break;
}
-
+
if (kInverseFillAA_EdgeType == rre.getEdgeType()) {
builder->fsCodeAppend("\t\talpha = 1.0 - alpha;\n");
}
diff --git a/src/gpu/effects/GrRRectEffect.h b/src/gpu/effects/GrRRectEffect.h
index 7df7e6f076..aadd8c293e 100644
--- a/src/gpu/effects/GrRRectEffect.h
+++ b/src/gpu/effects/GrRRectEffect.h
@@ -17,10 +17,10 @@ namespace GrRRectEffect {
enum EdgeType {
kFillAA_EdgeType,
kInverseFillAA_EdgeType,
-
+
kLastEdgeType = kInverseFillAA_EdgeType,
};
-
+
static const int kEdgeTypeCnt = kLastEdgeType + 1;
/**
diff --git a/tests/DynamicHashTest.cpp b/tests/DynamicHashTest.cpp
index 14ecf7a5be..b2d0f0382c 100644
--- a/tests/DynamicHashTest.cpp
+++ b/tests/DynamicHashTest.cpp
@@ -183,4 +183,3 @@ DEF_TEST(DynamicHash_iterator, reporter) {
ASSERT(2 == count);
ASSERT(keys[0] != keys[1]);
}
-