aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar skia.committer@gmail.com <skia.committer@gmail.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-05-04 07:01:15 +0000
committerGravatar skia.committer@gmail.com <skia.committer@gmail.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-05-04 07:01:15 +0000
commitecc9d28072142ab503a237726748ec2dc4ff842f (patch)
treeb0dfd34086f7dc426a9c8446eea97af4e9737bf9
parent1125d39de8ec64b26746b07ea0f1360aa473779c (diff)
Sanitizing source files in Housekeeper-Nightly
git-svn-id: http://skia.googlecode.com/svn/trunk@9002 2bbb7eff-a529-9590-31e7-b0007b416f81
-rw-r--r--bench/MathBench.cpp18
-rw-r--r--bench/XfermodeBench.cpp1
-rw-r--r--src/gpu/gl/GrGLCaps.h2
-rw-r--r--tests/PointTest.cpp6
4 files changed, 13 insertions, 14 deletions
diff --git a/bench/MathBench.cpp b/bench/MathBench.cpp
index 1e4f2818e3..8092f13823 100644
--- a/bench/MathBench.cpp
+++ b/bench/MathBench.cpp
@@ -440,28 +440,28 @@ class NormalizeBench : public SkBenchmark {
};
SkVector fVec[ARRAY];
bool fUsePortable;
-
+
public:
NormalizeBench(void* param, bool usePortable)
: INHERITED(param)
, fUsePortable(usePortable) {
-
+
SkRandom rand;
for (int i = 0; i < ARRAY; ++i) {
fVec[i].set(rand.nextSScalar1(), rand.nextSScalar1());
}
-
+
fName = "point_normalize";
fIsRendering = false;
}
-
+
// just so the compiler doesn't remove our loops
virtual void process(int) {}
-
+
protected:
virtual void onDraw(SkCanvas*) {
int accum = 0;
-
+
for (int j = 0; j < LOOP; ++j) {
for (int i = 0; i < ARRAY; ++i) {
accum += fVec[i].normalize();
@@ -469,14 +469,14 @@ protected:
this->process(accum);
}
}
-
+
virtual const char* onGetName() {
return fName;
}
-
+
private:
const char* fName;
-
+
typedef SkBenchmark INHERITED;
};
diff --git a/bench/XfermodeBench.cpp b/bench/XfermodeBench.cpp
index a1e5a3d776..0d85fefe1f 100644
--- a/bench/XfermodeBench.cpp
+++ b/bench/XfermodeBench.cpp
@@ -117,4 +117,3 @@ static BenchRegistry gReg25(Fact25);
static BenchRegistry gReg26(Fact26);
static BenchRegistry gReg27(Fact27);
static BenchRegistry gReg28(Fact28);
-
diff --git a/src/gpu/gl/GrGLCaps.h b/src/gpu/gl/GrGLCaps.h
index 23c53c68f1..01fbceee04 100644
--- a/src/gpu/gl/GrGLCaps.h
+++ b/src/gpu/gl/GrGLCaps.h
@@ -78,7 +78,7 @@ public:
*/
kES_EXT_MsToTexture_MSFBOType,
- kLast_MSFBOType = kES_EXT_MsToTexture_MSFBOType
+ kLast_MSFBOType = kES_EXT_MsToTexture_MSFBOType
};
enum FBFetchType {
diff --git a/tests/PointTest.cpp b/tests/PointTest.cpp
index f8a39630f6..0b183c245e 100644
--- a/tests/PointTest.cpp
+++ b/tests/PointTest.cpp
@@ -46,7 +46,7 @@ static void test_length(skiatest::Reporter* reporter, SkScalar x, SkScalar y,
//See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=323
REPORTER_ASSERT(reporter, SkScalarNearlyEqual(s1, s2));
REPORTER_ASSERT(reporter, SkScalarNearlyEqual(s1, expectedLength));
-
+
test_Normalize(reporter, x, y);
}
@@ -66,7 +66,7 @@ template <typename T> T get_value(skiatest::Reporter* reporter, T value) {
static void test_overflow(skiatest::Reporter* reporter) {
SkScalar bigFloat = get_value(reporter, SkFloatToScalar(3.4e38f));
SkPoint pt = { bigFloat, bigFloat };
-
+
SkScalar length = pt.length();
// expect this to be non-finite, but dump the results if not.
if (SkScalarIsFinite(length)) {
@@ -106,7 +106,7 @@ static void PointTest(skiatest::Reporter* reporter) {
{ SkIntToScalar(3), SkIntToScalar(4), SkIntToScalar(5) },
{ SkFloatToScalar(0.6f), SkFloatToScalar(0.8f), SK_Scalar1 },
};
-
+
for (size_t i = 0; i < SK_ARRAY_COUNT(gRec); ++i) {
test_length(reporter, gRec[i].fX, gRec[i].fY, gRec[i].fLength);
}