Style bikeshed - remove extraneous whitespace
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1842753002
Review URL: https://codereview.chromium.org/1842753002
diff --git a/tests/AAClipTest.cpp b/tests/AAClipTest.cpp
index 1ea8506..42c320c 100644
--- a/tests/AAClipTest.cpp
+++ b/tests/AAClipTest.cpp
@@ -334,7 +334,7 @@
// This rect should intersect the clip, but slice-out all of the "soft" parts,
// leaving just a rect.
const SkIRect ir = SkIRect::MakeLTRB(10, -10, 50, 90);
-
+
clip.op(ir, SkRegion::kIntersect_Op);
REPORTER_ASSERT(reporter, clip.getBounds() == SkIRect::MakeLTRB(10, 0, 50, 90));
diff --git a/tests/AnnotationTest.cpp b/tests/AnnotationTest.cpp
index 4f904bd..d9d971a 100644
--- a/tests/AnnotationTest.cpp
+++ b/tests/AnnotationTest.cpp
@@ -1,4 +1,3 @@
-
/*
* Copyright 2011 Google Inc.
*
diff --git a/tests/BitmapCopyTest.cpp b/tests/BitmapCopyTest.cpp
index 5793284..216e042 100644
--- a/tests/BitmapCopyTest.cpp
+++ b/tests/BitmapCopyTest.cpp
@@ -608,7 +608,7 @@
gRec[i].fRequestedDstSize.height());
bool success = srcBM.readPixels(dstInfo, dstPixels, rowBytes,
gRec[i].fRequestedSrcLoc.x(), gRec[i].fRequestedSrcLoc.y());
-
+
REPORTER_ASSERT(reporter, gRec[i].fExpectedSuccess == success);
if (success) {
const SkIRect srcR = gRec[i].fExpectedSrcR;
@@ -695,7 +695,7 @@
refData = (kRGBA_8888_SkColorType == dstBmp.colorType()) ? kData : swizData;
#elif defined(SK_PMCOLOR_IS_BGRA)
refData = (kBGRA_8888_SkColorType == dstBmp.colorType()) ? kData : swizData;
-#else
+#else
#error "PM Color must be BGRA or RGBA to use GPU backend."
#endif
bool foundError = false;
diff --git a/tests/BlurTest.cpp b/tests/BlurTest.cpp
index dc3d6c7..8c726e9 100644
--- a/tests/BlurTest.cpp
+++ b/tests/BlurTest.cpp
@@ -559,7 +559,7 @@
#if SK_SUPPORT_GPU
-// This exercises the problem discovered in crbug.com/570232. The return value from
+// This exercises the problem discovered in crbug.com/570232. The return value from
// SkBlurMask::BoxBlur wasn't being checked in SkBlurMaskFilter.cpp::GrRRectBlurEffect::Create
DEF_GPUTEST_FOR_RENDERING_CONTEXTS(SmallBoxBlurBug, reporter, ctx) {
diff --git a/tests/CachedDataTest.cpp b/tests/CachedDataTest.cpp
index 6c44161..2502480 100644
--- a/tests/CachedDataTest.cpp
+++ b/tests/CachedDataTest.cpp
@@ -41,22 +41,22 @@
static SkCachedData* test_locking(skiatest::Reporter* reporter,
size_t size, SkDiscardableMemoryPool* pool) {
SkCachedData* data = make_data(size, pool);
-
+
memset(data->writable_data(), 0x80, size); // just to use writable_data()
check_data(reporter, data, 1, kNotInCache, kLocked);
-
+
data->ref();
check_data(reporter, data, 2, kNotInCache, kLocked);
data->unref();
check_data(reporter, data, 1, kNotInCache, kLocked);
-
+
data->attachToCacheAndRef();
check_data(reporter, data, 2, kInCache, kLocked);
-
+
data->unref();
check_data(reporter, data, 1, kInCache, kUnlocked);
-
+
data->ref();
check_data(reporter, data, 2, kInCache, kLocked);
@@ -92,4 +92,3 @@
data->detachFromCacheAndUnref();
}
}
-
diff --git a/tests/CanvasTest.cpp b/tests/CanvasTest.cpp
index 05ce604..02b875e 100644
--- a/tests/CanvasTest.cpp
+++ b/tests/CanvasTest.cpp
@@ -700,7 +700,7 @@
n = canvas.saveLayer(nullptr, nullptr);
REPORTER_ASSERT(reporter, 2 == n);
REPORTER_ASSERT(reporter, 3 == canvas.getSaveCount());
-
+
canvas.restore();
REPORTER_ASSERT(reporter, 2 == canvas.getSaveCount());
canvas.restore();
diff --git a/tests/ClipBoundsTest.cpp b/tests/ClipBoundsTest.cpp
index b5b9cae..2f9e13d 100644
--- a/tests/ClipBoundsTest.cpp
+++ b/tests/ClipBoundsTest.cpp
@@ -1,4 +1,3 @@
-
/*
* Copyright 2015 Google Inc.
*
diff --git a/tests/CodexTest.cpp b/tests/CodexTest.cpp
index be25dc3..bdb5e77 100644
--- a/tests/CodexTest.cpp
+++ b/tests/CodexTest.cpp
@@ -637,7 +637,7 @@
return;
}
SkAutoTDelete<SkCodec> decoder(SkCodec::NewFromStream(stream.release()));
-
+
// This should return kSuccess because kIndex8 is supported.
SkPMColor colorStorage[256];
int colorCount;
diff --git a/tests/ColorFilterTest.cpp b/tests/ColorFilterTest.cpp
index 822fb0b..cf542db 100644
--- a/tests/ColorFilterTest.cpp
+++ b/tests/ColorFilterTest.cpp
@@ -165,17 +165,17 @@
matrix[1] = 0.7152f - 0.7152f * amount;
matrix[2] = 1.f - (matrix[0] + matrix[1]);
matrix[3] = matrix[4] = 0.f;
-
+
matrix[5] = 0.2126f - 0.2126f * amount;
matrix[6] = 0.7152f + 0.2848f * amount;
matrix[7] = 1.f - (matrix[5] + matrix[6]);
matrix[8] = matrix[9] = 0.f;
-
+
matrix[10] = 0.2126f - 0.2126f * amount;
matrix[11] = 0.7152f - 0.7152f * amount;
matrix[12] = 1.f - (matrix[10] + matrix[11]);
matrix[13] = matrix[14] = 0.f;
-
+
matrix[15] = matrix[16] = matrix[17] = matrix[19] = 0.f;
matrix[18] = 1.f;
}
diff --git a/tests/DataRefTest.cpp b/tests/DataRefTest.cpp
index a474019..03b80fb 100644
--- a/tests/DataRefTest.cpp
+++ b/tests/DataRefTest.cpp
@@ -271,7 +271,7 @@
static void check_alphabet_buffer(skiatest::Reporter* reporter, const SkROBuffer* reader) {
size_t size = reader->size();
REPORTER_ASSERT(reporter, size % 26 == 0);
-
+
SkAutoTMalloc<char> storage(size);
SkROBuffer::Iter iter(reader);
size_t offset = 0;
diff --git a/tests/FloatingPointTextureTest.cpp b/tests/FloatingPointTextureTest.cpp
index 3a8d63c..a20b8a2 100644
--- a/tests/FloatingPointTextureTest.cpp
+++ b/tests/FloatingPointTextureTest.cpp
@@ -62,7 +62,7 @@
DEF_GPUTEST_FOR_RENDERING_CONTEXTS(FloatingPointTextureTest, reporter, context) {
runFPTest<float>(reporter, context, FLT_MIN, FLT_MAX, FLT_EPSILON,
- kMaxIntegerRepresentableInSPFloatingPoint,
+ kMaxIntegerRepresentableInSPFloatingPoint,
FP_CONTROL_ARRAY_SIZE, kRGBA_float_GrPixelConfig);
}
diff --git a/tests/FontMgrAndroidParserTest.cpp b/tests/FontMgrAndroidParserTest.cpp
index a56331e..5f6ff06 100644
--- a/tests/FontMgrAndroidParserTest.cpp
+++ b/tests/FontMgrAndroidParserTest.cpp
@@ -213,4 +213,3 @@
SkDebugf("---- Resource files missing for FontConfigParser test\n");
}
}
-
diff --git a/tests/GLProgramsTest.cpp b/tests/GLProgramsTest.cpp
index 6b8efeb..03938fb 100644
--- a/tests/GLProgramsTest.cpp
+++ b/tests/GLProgramsTest.cpp
@@ -1,4 +1,3 @@
-
/*
* Copyright 2011 Google Inc.
*
diff --git a/tests/GeometryTest.cpp b/tests/GeometryTest.cpp
index f89914f..17e4644 100644
--- a/tests/GeometryTest.cpp
+++ b/tests/GeometryTest.cpp
@@ -58,7 +58,7 @@
SkEvalQuadAt(pts, t, &r0);
SkPoint r1 = SkEvalQuadAt(pts, t);
check_pairs(reporter, i, t, "quad-pos", r0.fX, r0.fY, r1.fX, r1.fY);
-
+
SkVector v0;
SkEvalQuadAt(pts, t, nullptr, &v0);
SkVector v1 = SkEvalQuadTangentAt(pts, t);
diff --git a/tests/GpuColorFilterTest.cpp b/tests/GpuColorFilterTest.cpp
index 714555a..186f8c6 100644
--- a/tests/GpuColorFilterTest.cpp
+++ b/tests/GpuColorFilterTest.cpp
@@ -1,4 +1,3 @@
-
/*
* Copyright 2013 Google Inc.
*
diff --git a/tests/GrDrawTargetTest.cpp b/tests/GrDrawTargetTest.cpp
index bbc2b91..30fc0a2 100644
--- a/tests/GrDrawTargetTest.cpp
+++ b/tests/GrDrawTargetTest.cpp
@@ -1,4 +1,3 @@
-
/*
* Copyright 2013 Google Inc.
*
diff --git a/tests/GrPorterDuffTest.cpp b/tests/GrPorterDuffTest.cpp
index f738c97..54fcfc1 100644
--- a/tests/GrPorterDuffTest.cpp
+++ b/tests/GrPorterDuffTest.cpp
@@ -286,9 +286,9 @@
}
static void test_color_unknown_with_coverage(skiatest::Reporter* reporter, const GrCaps& caps) {
GrPipelineOptimizations optimizations;
- optimizations.fColorPOI.calcWithInitialValues(nullptr, 0, 0, kNone_GrColorComponentFlags,
+ optimizations.fColorPOI.calcWithInitialValues(nullptr, 0, 0, kNone_GrColorComponentFlags,
false);
- optimizations.fCoveragePOI.calcWithInitialValues(nullptr, 0, 0, kNone_GrColorComponentFlags,
+ optimizations.fCoveragePOI.calcWithInitialValues(nullptr, 0, 0, kNone_GrColorComponentFlags,
true);
SkASSERT(!optimizations.fColorPOI.isOpaque());
@@ -482,7 +482,7 @@
GrPipelineOptimizations optimizations;
optimizations.fColorPOI.calcWithInitialValues(nullptr, 0, GrColorPackRGBA(229, 0, 154, 0),
kR_GrColorComponentFlag | kB_GrColorComponentFlag, false);
- optimizations.fCoveragePOI.calcWithInitialValues(nullptr, 0, GrColorPackA4(255),
+ optimizations.fCoveragePOI.calcWithInitialValues(nullptr, 0, GrColorPackA4(255),
kRGBA_GrColorComponentFlags, true);
SkASSERT(!optimizations.fColorPOI.isOpaque());
@@ -684,9 +684,9 @@
static void test_color_opaque_with_coverage(skiatest::Reporter* reporter, const GrCaps& caps) {
GrPipelineOptimizations optimizations;
- optimizations.fColorPOI.calcWithInitialValues(nullptr, 0, GrColorPackA4(255),
+ optimizations.fColorPOI.calcWithInitialValues(nullptr, 0, GrColorPackA4(255),
kA_GrColorComponentFlag, false);
- optimizations.fCoveragePOI.calcWithInitialValues(nullptr, 0, 0, kNone_GrColorComponentFlags,
+ optimizations.fCoveragePOI.calcWithInitialValues(nullptr, 0, 0, kNone_GrColorComponentFlags,
true);
SkASSERT(optimizations.fColorPOI.isOpaque());
@@ -885,7 +885,7 @@
GrPipelineOptimizations optimizations;
optimizations.fColorPOI.calcWithInitialValues(nullptr, 0, GrColorPackRGBA(0, 82, 0, 255),
kG_GrColorComponentFlag | kA_GrColorComponentFlag, false);
- optimizations.fCoveragePOI.calcWithInitialValues(nullptr, 0, GrColorPackA4(255),
+ optimizations.fCoveragePOI.calcWithInitialValues(nullptr, 0, GrColorPackA4(255),
kRGBA_GrColorComponentFlags, true);
SkASSERT(optimizations.fColorPOI.isOpaque());
@@ -1098,7 +1098,7 @@
TestLCDCoverageBatch() : INHERITED(ClassID()) {}
private:
- void computePipelineOptimizations(GrInitInvariantOutput* color,
+ void computePipelineOptimizations(GrInitInvariantOutput* color,
GrInitInvariantOutput* coverage,
GrBatchToXPOverrides* overrides) const override {
color->setKnownFourComponents(GrColorPackRGBA(123, 45, 67, 221));
@@ -1186,11 +1186,11 @@
for (size_t c = 0; c < SK_ARRAY_COUNT(testColors); c++) {
GrPipelineOptimizations optimizations;
- optimizations.fColorPOI.calcWithInitialValues(nullptr, 0, testColors[c], testColorFlags[c],
+ optimizations.fColorPOI.calcWithInitialValues(nullptr, 0, testColors[c], testColorFlags[c],
false);
for (int f = 0; f <= 1; f++) {
if (!f) {
- optimizations.fCoveragePOI.calcWithInitialValues(nullptr, 0, 0,
+ optimizations.fCoveragePOI.calcWithInitialValues(nullptr, 0, 0,
kNone_GrColorComponentFlags, true);
} else {
optimizations.fCoveragePOI.calcWithInitialValues(nullptr, 0, GrColorPackA4(255),
@@ -1217,4 +1217,3 @@
}
#endif
-
diff --git a/tests/GrTRecorderTest.cpp b/tests/GrTRecorderTest.cpp
index cef870f..0be0f68 100644
--- a/tests/GrTRecorderTest.cpp
+++ b/tests/GrTRecorderTest.cpp
@@ -40,7 +40,7 @@
for (int i = 0; i < 100; ++i) {
if (data) {
- REPORTER_ASSERT(reporter, i == *GrNEW_APPEND_TO_RECORDER(recorder,
+ REPORTER_ASSERT(reporter, i == *GrNEW_APPEND_TO_RECORDER(recorder,
IntWrapper, (i)));
} else {
REPORTER_ASSERT(reporter, i ==
diff --git a/tests/GradientTest.cpp b/tests/GradientTest.cpp
index 0014089..ac55d99 100644
--- a/tests/GradientTest.cpp
+++ b/tests/GradientTest.cpp
@@ -34,7 +34,7 @@
SkMatrix matrix;
matrix.setAffine(affine);
c.concat(matrix);
-
+
c.drawPaint(paint);
}
diff --git a/tests/ImageCacheTest.cpp b/tests/ImageCacheTest.cpp
index 89d2f8d..c2cf2d9 100644
--- a/tests/ImageCacheTest.cpp
+++ b/tests/ImageCacheTest.cpp
@@ -32,7 +32,7 @@
static bool Visitor(const SkResourceCache::Rec& baseRec, void* context) {
const TestingRec& rec = static_cast<const TestingRec&>(baseRec);
intptr_t* result = (intptr_t*)context;
-
+
*result = rec.fValue;
return true;
}
diff --git a/tests/ImageFilterCacheTest.cpp b/tests/ImageFilterCacheTest.cpp
index 938c048..89c6dcf 100644
--- a/tests/ImageFilterCacheTest.cpp
+++ b/tests/ImageFilterCacheTest.cpp
@@ -233,4 +233,3 @@
test_explicit_purging(reporter, fullImg, subsetImg);
}
#endif
-
diff --git a/tests/ImageFilterTest.cpp b/tests/ImageFilterTest.cpp
index 8268f95..e4ab1ac 100644
--- a/tests/ImageFilterTest.cpp
+++ b/tests/ImageFilterTest.cpp
@@ -1,4 +1,3 @@
-
/*
* Copyright 2013 Google Inc.
*
@@ -567,7 +566,7 @@
SkAutoTUnref<SkGpuDevice> device(SkGpuDevice::Create(context,
SkBudgeted::kNo,
- SkImageInfo::MakeN32Premul(widthHeight,
+ SkImageInfo::MakeN32Premul(widthHeight,
widthHeight),
0,
&props,
diff --git a/tests/MatrixTest.cpp b/tests/MatrixTest.cpp
index f08613f..1399bf2 100644
--- a/tests/MatrixTest.cpp
+++ b/tests/MatrixTest.cpp
@@ -93,10 +93,10 @@
SkMatrix m;
m.reset();
assert9(reporter, m, 1, 0, 0, 0, 1, 0, 0, 0, 1);
-
+
m.setScale(2, 3);
assert9(reporter, m, 2, 0, 0, 0, 3, 0, 0, 0, 1);
-
+
m.postTranslate(4, 5);
assert9(reporter, m, 2, 0, 4, 0, 3, 5, 0, 0, 1);
diff --git a/tests/MemsetTest.cpp b/tests/MemsetTest.cpp
index 854b3c5..e1f844e 100644
--- a/tests/MemsetTest.cpp
+++ b/tests/MemsetTest.cpp
@@ -22,7 +22,7 @@
REPORTER_ASSERT(reporter, alloc->contains(ptr));
return ptr;
}
-
+
static void test_chunkalloc(skiatest::Reporter* reporter) {
static const size_t kMin = 1024;
SkChunkAlloc alloc(kMin);
diff --git a/tests/PaintTest.cpp b/tests/PaintTest.cpp
index 0e92e65..945c8a1 100644
--- a/tests/PaintTest.cpp
+++ b/tests/PaintTest.cpp
@@ -367,4 +367,3 @@
paint.setColorFilter(SkColorFilter::MakeMatrixFilterRowMajor255(cm.fMat));
REPORTER_ASSERT(r, !paint.nothingToDraw());
}
-
diff --git a/tests/PathOpsBattles.cpp b/tests/PathOpsBattles.cpp
index 6e0d3a4..32ba96c 100644
--- a/tests/PathOpsBattles.cpp
+++ b/tests/PathOpsBattles.cpp
@@ -400,7 +400,7 @@
SkPath path2(path);
testPathOp(reporter, path1, path2, (SkPathOp) 2, filename);
}
-// ../../third_party/tcmalloc/chromium/src/free_list.h:118] Memory corruption detected.
+// ../../third_party/tcmalloc/chromium/src/free_list.h:118] Memory corruption detected.
static void battleOp13(skiatest::Reporter* reporter, const char* filename) {
SkPath path;
diff --git a/tests/PathOpsBuilderConicTest.cpp b/tests/PathOpsBuilderConicTest.cpp
index 6bb5c70..65adcf0 100644
--- a/tests/PathOpsBuilderConicTest.cpp
+++ b/tests/PathOpsBuilderConicTest.cpp
@@ -111,7 +111,7 @@
}
}
setupOne(reporter, col, row, rot, trial);
- skipTest:
+ skipTest:
;
}
}
@@ -403,7 +403,7 @@
path.moveTo(306.588f, -227.984f);
path.conicTo(212.465f, -262.242f, 95.5512f, 58.9764f, 0.707107f);
path.lineTo(306.588f, -227.984f);
-path.close();
+path.close();
testSimplify(reporter, path, __FUNCTION__);
}
diff --git a/tests/PathOpsConicIntersectionTest.cpp b/tests/PathOpsConicIntersectionTest.cpp
index 889a41c..624a68a 100644
--- a/tests/PathOpsConicIntersectionTest.cpp
+++ b/tests/PathOpsConicIntersectionTest.cpp
@@ -13,7 +13,7 @@
manually compute the intersection of a pair of circles and see if the conic intersection matches
given two circles
construct a line connecting their centers
-
+
*/
static const SkDConic testSet[] = {
@@ -21,10 +21,10 @@
{{{{377.218994,-141.981003}, {40.578701,-201.339996}, {23.1854992,-102.697998}}}, 0.707107008f},
{{{{5.1114602088928223, 628.77813720703125},
- {10.834027290344238, 988.964111328125},
+ {10.834027290344238, 988.964111328125},
{163.40835571289062, 988.964111328125}}}, 0.72944212f},
- {{{{163.40835571289062, 988.964111328125},
- {5, 988.964111328125},
+ {{{{163.40835571289062, 988.964111328125},
+ {5, 988.964111328125},
{5, 614.7423095703125}}}, 0.707106769f},
{{{{11.17222976684570312, -8.103978157043457031},
@@ -116,8 +116,8 @@
static void writeDPng(const SkDConic& dC, const char* name) {
const int scale = 5;
- SkDConic dConic = {{{ {dC.fPts[0].fX * scale, dC.fPts[0].fY * scale },
- {dC.fPts[1].fX * scale, dC.fPts[1].fY * scale },
+ SkDConic dConic = {{{ {dC.fPts[0].fX * scale, dC.fPts[0].fY * scale },
+ {dC.fPts[1].fX * scale, dC.fPts[1].fY * scale },
{dC.fPts[2].fX * scale, dC.fPts[2].fY * scale }}}, dC.fWeight };
SkBitmap bitmap;
SkDRect bounds;
@@ -226,7 +226,7 @@
};
const SkDConic* frames[] = {
- frame0, frame1, frame2, frame3, frame4, frame5, frame6
+ frame0, frame1, frame2, frame3, frame4, frame5, frame6
};
const int frameSizes[] = { (int) SK_ARRAY_COUNT(frame0), (int) SK_ARRAY_COUNT(frame1),
@@ -244,8 +244,8 @@
int frameSize = frameSizes[index];
for (int fIndex = 0; fIndex < frameSize; ++fIndex) {
const SkDConic& dC = frames[index][fIndex];
- SkDConic dConic = {{{ {dC.fPts[0].fX * scale, dC.fPts[0].fY * scale },
- {dC.fPts[1].fX * scale, dC.fPts[1].fY * scale },
+ SkDConic dConic = {{{ {dC.fPts[0].fX * scale, dC.fPts[0].fY * scale },
+ {dC.fPts[1].fX * scale, dC.fPts[1].fY * scale },
{dC.fPts[2].fX * scale, dC.fPts[2].fY * scale }}}, dC.fWeight };
SkDRect dBounds;
dBounds.setBounds(dConic);
@@ -273,8 +273,8 @@
canvas.drawColor(SK_ColorWHITE);
for (int fIndex = 0; fIndex < frameSize; ++fIndex) {
const SkDConic& dC = frames[index][fIndex];
- SkDConic dConic = {{{ {dC.fPts[0].fX * scale, dC.fPts[0].fY * scale },
- {dC.fPts[1].fX * scale, dC.fPts[1].fY * scale },
+ SkDConic dConic = {{{ {dC.fPts[0].fX * scale, dC.fPts[0].fY * scale },
+ {dC.fPts[1].fX * scale, dC.fPts[1].fY * scale },
{dC.fPts[2].fX * scale, dC.fPts[2].fY * scale }}}, dC.fWeight };
SkPath path;
path.moveTo(dConic.fPts[0].asSkPoint());
diff --git a/tests/PathOpsConicLineIntersectionTest.cpp b/tests/PathOpsConicLineIntersectionTest.cpp
index 2a958ed..6219506 100644
--- a/tests/PathOpsConicLineIntersectionTest.cpp
+++ b/tests/PathOpsConicLineIntersectionTest.cpp
@@ -21,7 +21,7 @@
{
{{{{30.6499996,25.6499996}, {30.6499996,20.6499996}, {25.6499996,20.6499996}}}, 0.707107008f},
{{{25.6499996,20.6499996}, {45.6500015,20.6499996}}},
- 1,
+ 1,
{{25.6499996,20.6499996}, {0,0}}
},
};
@@ -100,7 +100,7 @@
const SkDLine& line = lineConicTests[index].line;
SkASSERT(ValidLine(line));
SkReduceOrder reducer;
- SkPoint pts[3] = { conic.fPts.fPts[0].asSkPoint(), conic.fPts.fPts[1].asSkPoint(),
+ SkPoint pts[3] = { conic.fPts.fPts[0].asSkPoint(), conic.fPts.fPts[1].asSkPoint(),
conic.fPts.fPts[2].asSkPoint() };
SkPoint reduced[3];
SkPath::Verb order1 = SkReduceOrder::Conic(pts, conic.fWeight, reduced);
diff --git a/tests/PathOpsOpTest.cpp b/tests/PathOpsOpTest.cpp
index 7de910c..1443198 100644
--- a/tests/PathOpsOpTest.cpp
+++ b/tests/PathOpsOpTest.cpp
@@ -3846,7 +3846,7 @@
static void complex_to_quads(const SkPoint pts[], SkPath* path) {
SkScalar loopT;
if (SkDCubic::ComplexBreak(pts, &loopT)) {
- SkPoint cubicPair[7];
+ SkPoint cubicPair[7];
SkChopCubicAt(pts, cubicPair, loopT);
SkDCubic c1, c2;
c1.set(cubicPair);
diff --git a/tests/PathOpsTSectDebug.h b/tests/PathOpsTSectDebug.h
index 68ef4b7..4e04db7 100644
--- a/tests/PathOpsTSectDebug.h
+++ b/tests/PathOpsTSectDebug.h
@@ -195,7 +195,7 @@
dumpID();
SkDebugf(" bounds=(%1.9g,%1.9g, %1.9g,%1.9g) boundsMax=%1.9g%s\n",
fBounds.fLeft, fBounds.fTop, fBounds.fRight, fBounds.fBottom, fBoundsMax,
- fCollapsed ? " collapsed" : "");
+ fCollapsed ? " collapsed" : "");
}
template<typename TCurve, typename OppCurve>
diff --git a/tests/PathOpsTestCommon.cpp b/tests/PathOpsTestCommon.cpp
index f685225..8cc8fe8 100644
--- a/tests/PathOpsTestCommon.cpp
+++ b/tests/PathOpsTestCommon.cpp
@@ -237,7 +237,7 @@
lo = hi;
}
break;
- }
+ }
case SkPath::kClose_Verb:
simplePath->close();
break;
diff --git a/tests/Point3Test.cpp b/tests/Point3Test.cpp
index bf3b902..2dedd6b 100644
--- a/tests/Point3Test.cpp
+++ b/tests/Point3Test.cpp
@@ -76,7 +76,7 @@
REPORTER_ASSERT(reporter, SkScalarNearlyEqual(dot, SK_ScalarRoot2Over2));
}
-static void test_length(skiatest::Reporter* reporter,
+static void test_length(skiatest::Reporter* reporter,
SkScalar x, SkScalar y, SkScalar z, SkScalar expectedLen) {
SkPoint3 point = SkPoint3::Make(x, y, z);
@@ -115,7 +115,7 @@
SkScalar fX;
SkScalar fY;
SkScalar fZ;
- SkScalar fLength;
+ SkScalar fLength;
} gRec[] = {
{ 0.0f, 0.0f, 0.0f, 0.0f },
{ 0.3f, 0.4f, 0.5f, SK_ScalarRoot2Over2 },
diff --git a/tests/PointTest.cpp b/tests/PointTest.cpp
index 84ea865..c0d1f26 100644
--- a/tests/PointTest.cpp
+++ b/tests/PointTest.cpp
@@ -1,4 +1,3 @@
-
/*
* Copyright 2011 Google Inc.
*
diff --git a/tests/PremulAlphaRoundTripTest.cpp b/tests/PremulAlphaRoundTripTest.cpp
index e0060d6..5cc7a49 100644
--- a/tests/PremulAlphaRoundTripTest.cpp
+++ b/tests/PremulAlphaRoundTripTest.cpp
@@ -114,4 +114,3 @@
test_premul_alpha_roundtrip(reporter, device);
}
#endif
-
diff --git a/tests/PrimitiveProcessorTest.cpp b/tests/PrimitiveProcessorTest.cpp
index 922b4fd..52210f2 100644
--- a/tests/PrimitiveProcessorTest.cpp
+++ b/tests/PrimitiveProcessorTest.cpp
@@ -1,4 +1,3 @@
-
/*
* Copyright 2016 Google Inc.
*
diff --git a/tests/ReadPixelsTest.cpp b/tests/ReadPixelsTest.cpp
index b538fc8..e6552108 100644
--- a/tests/ReadPixelsTest.cpp
+++ b/tests/ReadPixelsTest.cpp
@@ -52,7 +52,7 @@
}
return SkPremultiplyARGBInline(a, r, g, b);
}
-
+
static SkPMColor get_dst_bmp_init_color(int x, int y, int w) {
int n = y * w + x;
diff --git a/tests/RecordReplaceDrawTest.cpp b/tests/RecordReplaceDrawTest.cpp
index 73c6647..fe11106 100644
--- a/tests/RecordReplaceDrawTest.cpp
+++ b/tests/RecordReplaceDrawTest.cpp
@@ -137,7 +137,7 @@
if (doReplace) {
REPORTER_ASSERT(r, 0 == numLayers);
} else {
- REPORTER_ASSERT(r, 1 == numLayers);
+ REPORTER_ASSERT(r, 1 == numLayers);
}
}
diff --git a/tests/RecordTest.cpp b/tests/RecordTest.cpp
index 1b4077c..a67d7e8 100644
--- a/tests/RecordTest.cpp
+++ b/tests/RecordTest.cpp
@@ -116,4 +116,3 @@
REPORTER_ASSERT(r, is_aligned(record.alloc<uint64_t>()));
}
}
-
diff --git a/tests/RectangleTextureTest.cpp b/tests/RectangleTextureTest.cpp
index 2943c25..114207d 100644
--- a/tests/RectangleTextureTest.cpp
+++ b/tests/RectangleTextureTest.cpp
@@ -137,7 +137,7 @@
}
}
-DEF_GPUTEST_FOR_RENDERING_CONTEXTS(RectangleTexture, reporter, context, glContext) {
+DEF_GPUTEST_FOR_RENDERING_CONTEXTS(RectangleTexture, reporter, context, glContext) {
static const int kWidth = 13;
static const int kHeight = 13;
diff --git a/tests/RefDictTest.cpp b/tests/RefDictTest.cpp
index af30f86..f3ba657 100644
--- a/tests/RefDictTest.cpp
+++ b/tests/RefDictTest.cpp
@@ -10,7 +10,7 @@
class TestRC : public SkRefCnt {
public:
-
+
private:
typedef SkRefCnt INHERITED;
};
diff --git a/tests/RoundRectTest.cpp b/tests/RoundRectTest.cpp
index 02dad22..37f5318 100644
--- a/tests/RoundRectTest.cpp
+++ b/tests/RoundRectTest.cpp
@@ -693,7 +693,7 @@
}
}
-// Test out the case where an oval already off in space is translated/scaled
+// Test out the case where an oval already off in space is translated/scaled
// further off into space - yielding numerical issues when the rect & radii
// are transformed separatly
// BUG=skia:2696
@@ -715,9 +715,9 @@
SkScalar halfHeight = SkScalarHalf(dst.height());
for (int i = 0; i < 4; ++i) {
- REPORTER_ASSERT(reporter,
+ REPORTER_ASSERT(reporter,
SkScalarNearlyEqual(dst.radii((SkRRect::Corner)i).fX, halfWidth));
- REPORTER_ASSERT(reporter,
+ REPORTER_ASSERT(reporter,
SkScalarNearlyEqual(dst.radii((SkRRect::Corner)i).fY, halfHeight));
}
}
diff --git a/tests/SerializationTest.cpp b/tests/SerializationTest.cpp
index f8d6ea4..f6b1275 100644
--- a/tests/SerializationTest.cpp
+++ b/tests/SerializationTest.cpp
@@ -293,7 +293,7 @@
static SkBitmap draw_picture(SkPicture& picture) {
SkBitmap bitmap;
- bitmap.allocN32Pixels(SkScalarCeilToInt(picture.cullRect().width()),
+ bitmap.allocN32Pixels(SkScalarCeilToInt(picture.cullRect().width()),
SkScalarCeilToInt(picture.cullRect().height()));
SkCanvas canvas(bitmap);
picture.playback(&canvas);
@@ -333,8 +333,8 @@
// Paint some text.
SkPictureRecorder recorder;
SkIRect canvasRect = SkIRect::MakeWH(kBitmapSize, kBitmapSize);
- SkCanvas* canvas = recorder.beginRecording(SkIntToScalar(canvasRect.width()),
- SkIntToScalar(canvasRect.height()),
+ SkCanvas* canvas = recorder.beginRecording(SkIntToScalar(canvasRect.width()),
+ SkIntToScalar(canvasRect.height()),
nullptr, 0);
canvas->drawColor(SK_ColorWHITE);
canvas->drawText(text, 2, 24, 32, paint);
@@ -599,17 +599,17 @@
DEF_TEST(Annotations, reporter) {
SkPictureRecorder recorder;
SkCanvas* recordingCanvas = recorder.beginRecording(SkRect::MakeWH(100, 100));
-
+
const char* str0 = "rect-with-url";
const SkRect r0 = SkRect::MakeWH(10, 10);
SkAutoTUnref<SkData> d0(SkData::NewWithCString(str0));
SkAnnotateRectWithURL(recordingCanvas, r0, d0);
-
+
const char* str1 = "named-destination";
const SkRect r1 = SkRect::MakeXYWH(5, 5, 0, 0); // collapsed to a point
SkAutoTUnref<SkData> d1(SkData::NewWithCString(str1));
SkAnnotateNamedDestination(recordingCanvas, {r1.x(), r1.y()}, d1);
-
+
const char* str2 = "link-to-destination";
const SkRect r2 = SkRect::MakeXYWH(20, 20, 5, 6);
SkAutoTUnref<SkData> d2(SkData::NewWithCString(str2));
@@ -627,4 +627,3 @@
TestAnnotationCanvas canvas(reporter, recs, SK_ARRAY_COUNT(recs));
canvas.drawPicture(pict1);
}
-
diff --git a/tests/SpecialImageTest.cpp b/tests/SpecialImageTest.cpp
index bd07115..770810a 100644
--- a/tests/SpecialImageTest.cpp
+++ b/tests/SpecialImageTest.cpp
@@ -43,7 +43,7 @@
p.setAntiAlias(false);
temp.drawRect(SkRect::MakeXYWH(SkIntToScalar(kPad), SkIntToScalar(kPad),
- SkIntToScalar(kSmallerSize), SkIntToScalar(kSmallerSize)),
+ SkIntToScalar(kSmallerSize), SkIntToScalar(kSmallerSize)),
p);
return bm;
@@ -292,7 +292,7 @@
{
sk_sp<SkSpecialImage> subSImg1(SkSpecialImage::MakeFromGpu(
- nullptr, subset,
+ nullptr, subset,
kNeedNewImageUniqueID_SpecialImage,
texture));
test_image(subSImg1, reporter, false, true, kPad, kFullSize);
diff --git a/tests/StreamTest.cpp b/tests/StreamTest.cpp
index a3df8d7..fe4da0f 100644
--- a/tests/StreamTest.cpp
+++ b/tests/StreamTest.cpp
@@ -283,9 +283,9 @@
}
}
-// This test uses file system operations that don't work out of the
-// box on iOS. It's likely that we don't need them on iOS. Ignoring for now.
-// TODO(stephana): Re-evaluate if we need this in the future.
+// This test uses file system operations that don't work out of the
+// box on iOS. It's likely that we don't need them on iOS. Ignoring for now.
+// TODO(stephana): Re-evaluate if we need this in the future.
#ifndef SK_BUILD_FOR_IOS
DEF_TEST(StreamPeek, reporter) {
// Test a memory stream.
@@ -434,4 +434,3 @@
SkAutoTDelete<SkStreamAsset> asset(tmp.detachAsStream());
REPORTER_ASSERT(r, nullptr == asset->getMemoryBase());
}
-
diff --git a/tests/SubsetPath.h b/tests/SubsetPath.h
index 65067d1..9e4d231 100644
--- a/tests/SubsetPath.h
+++ b/tests/SubsetPath.h
@@ -11,15 +11,15 @@
#include "SkTDArray.h"
/* Given a path, generate a the desired minimal subset of the original.
-
+
This does a binary divide-and-conquer on the path, first splitting by
contours, and then by verbs. The caller passes whether the previous subset
behaved the same as the original. If not, the subset() call restores the
prior state before returning a new subset.
-
+
If a path fails a local test, this reduces the data to the
minimal set that fails using a pattern like:
-
+
bool testFailed = true;
SkPath minimal;
SubsetContours subsetContours(testPath);
diff --git a/tests/Test.h b/tests/Test.h
index 411ce11..4b19a85 100644
--- a/tests/Test.h
+++ b/tests/Test.h
@@ -1,4 +1,3 @@
-
/*
* Copyright 2011 Google Inc.
*
diff --git a/tests/TestTest.cpp b/tests/TestTest.cpp
index 2c303a7..890042e 100644
--- a/tests/TestTest.cpp
+++ b/tests/TestTest.cpp
@@ -72,4 +72,3 @@
REPORTER_ASSERT(reporter, glContext);
}
#endif
-
diff --git a/tests/TextureCompressionTest.cpp b/tests/TextureCompressionTest.cpp
index 0908660..e1992a0 100644
--- a/tests/TextureCompressionTest.cpp
+++ b/tests/TextureCompressionTest.cpp
@@ -58,7 +58,7 @@
SkAutoPixmapStorage pixmap;
pixmap.alloc(SkImageInfo::MakeA8(kWidth, kHeight));
// leaving the pixels uninitialized, as they don't affect the test...
-
+
for (int i = 0; i < SkTextureCompressor::kFormatCnt; ++i) {
const SkTextureCompressor::Format fmt = static_cast<SkTextureCompressor::Format>(i);
if (!compresses_a8(fmt)) {
diff --git a/tests/TopoSortTest.cpp b/tests/TopoSortTest.cpp
index 358cd8d..9cee485 100644
--- a/tests/TopoSortTest.cpp
+++ b/tests/TopoSortTest.cpp
@@ -121,7 +121,7 @@
for (size_t i = 0; i < SK_ARRAY_COUNT(tests); ++i) {
SkTDArray<sk_tool_utils::TopoTestNode*> graph;
-
+
(tests[i].fCreate)(&graph);
sk_tool_utils::TopoTestNode::Shuffle(&graph, &rand);
@@ -139,4 +139,3 @@
sk_tool_utils::TopoTestNode::DeallocNodes(&graph);
}
}
-
diff --git a/tests/UtilsTest.cpp b/tests/UtilsTest.cpp
index c431abc..b38bb9f 100644
--- a/tests/UtilsTest.cpp
+++ b/tests/UtilsTest.cpp
@@ -14,7 +14,7 @@
class RefClass : public SkRefCnt {
public:
-
+
RefClass(int n) : fN(n) {}
int get() const { return fN; }
diff --git a/tests/VkClearTests.cpp b/tests/VkClearTests.cpp
index 586d7e7..7cca4e4 100644
--- a/tests/VkClearTests.cpp
+++ b/tests/VkClearTests.cpp
@@ -1,4 +1,3 @@
-
/*
* Copyright 2015 Google Inc.
*
diff --git a/tests/VkUploadPixelsTests.cpp b/tests/VkUploadPixelsTests.cpp
index 9fc4952..53d9cfc 100644
--- a/tests/VkUploadPixelsTests.cpp
+++ b/tests/VkUploadPixelsTests.cpp
@@ -1,4 +1,3 @@
-
/*
* Copyright 2015 Google Inc.
*
diff --git a/tests/VkWrapTests.cpp b/tests/VkWrapTests.cpp
index fe954fa..472664b 100755
--- a/tests/VkWrapTests.cpp
+++ b/tests/VkWrapTests.cpp
@@ -1,4 +1,3 @@
-
/*
* Copyright 2016 Google Inc.
*
diff --git a/tests/Writer32Test.cpp b/tests/Writer32Test.cpp
index 67896f0..5c24259 100644
--- a/tests/Writer32Test.cpp
+++ b/tests/Writer32Test.cpp
@@ -288,14 +288,14 @@
SkWriter32::WriteDataSize(data0),
SkWriter32::WriteDataSize(data1),
};
-
+
SkSWriter32<1000> writer;
size_t sizeWritten = 0;
writer.writeData(nullptr);
sizeWritten += sizes[0];
REPORTER_ASSERT(reporter, sizeWritten == writer.bytesWritten());
-
+
writer.writeData(data0);
sizeWritten += sizes[1];
REPORTER_ASSERT(reporter, sizeWritten == writer.bytesWritten());
@@ -315,7 +315,7 @@
REPORTER_ASSERT(reporter, strlen(str)+1 == d1->size());
REPORTER_ASSERT(reporter, !memcmp(str, d1->data(), strlen(str)+1));
REPORTER_ASSERT(reporter, 0 == d2->size());
-
+
REPORTER_ASSERT(reporter, reader.offset() == sizeWritten);
REPORTER_ASSERT(reporter, reader.eof());
}