test,tools: whitespace changes for clang-format
Change-Id: I67529f6c0ac26da603f60af22c620f8f603d8a19
Reviewed-on: https://skia-review.googlesource.com/155564
Commit-Queue: Ben Wagner <bungeman@google.com>
Reviewed-by: Ben Wagner <bungeman@google.com>
Auto-Submit: Hal Canary <halcanary@google.com>
diff --git a/tests/ColorSpaceTest.cpp b/tests/ColorSpaceTest.cpp
index 20e3fcb..9e92b32 100644
--- a/tests/ColorSpaceTest.cpp
+++ b/tests/ColorSpaceTest.cpp
@@ -16,8 +16,9 @@
#include "SkStream.h"
#include "SkTypes.h"
#include "Test.h"
-#include "png.h"
+
#include "../third_party/skcms/skcms.h"
+#include "png.h"
#include <memory>
#include <utility>
diff --git a/tests/DeviceTest.cpp b/tests/DeviceTest.cpp
index a9e21e6..5b1676c 100644
--- a/tests/DeviceTest.cpp
+++ b/tests/DeviceTest.cpp
@@ -5,8 +5,11 @@
* found in the LICENSE file.
*/
+#include "GrContextFactory.h"
+#include "GrTypes.h"
#include "SkBitmap.h"
#include "SkDevice.h"
+#include "SkGpuDevice.h"
#include "SkImage.h"
#include "SkImageInfo.h"
#include "SkRect.h"
@@ -14,11 +17,8 @@
#include "SkSpecialImage.h"
#include "SkTypes.h"
#include "Test.h"
-class SkColorSpace;
-#include "GrContextFactory.h"
-#include "GrTypes.h"
-#include "SkGpuDevice.h"
+class SkColorSpace;
class GrContext;
class DeviceTestingAccess {
diff --git a/tests/FloatingPointTextureTest.cpp b/tests/FloatingPointTextureTest.cpp
index 178392a..a2bc1e9 100644
--- a/tests/FloatingPointTextureTest.cpp
+++ b/tests/FloatingPointTextureTest.cpp
@@ -12,7 +12,6 @@
* have been selected to require 32 bits of precision and full IEEE conformance
*/
-#include <float.h>
#include "Test.h"
#include "GrContext.h"
@@ -22,6 +21,8 @@
#include "ProxyUtils.h"
#include "SkHalf.h"
+#include <float.h>
+
static const int DEV_W = 100, DEV_H = 100;
template <typename T>
diff --git a/tests/FontMgrFontConfigTest.cpp b/tests/FontMgrFontConfigTest.cpp
index 0ecca63..f2c868c 100644
--- a/tests/FontMgrFontConfigTest.cpp
+++ b/tests/FontMgrFontConfigTest.cpp
@@ -5,7 +5,6 @@
* found in the LICENSE file.
*/
-#include <fontconfig/fontconfig.h>
#include "Resources.h"
#include "SkCanvas.h"
#include "SkFontMgr.h"
@@ -13,6 +12,8 @@
#include "SkTypeface.h"
#include "Test.h"
+#include <fontconfig/fontconfig.h>
+
static bool bitmap_compare(const SkBitmap& ref, const SkBitmap& test) {
for (int y = 0; y < test.height(); ++y) {
for (int x = 0; x < test.width(); ++x) {
@@ -92,4 +93,4 @@
bool success = bitmap_compare(bitmapStream, bitmapClone);
REPORTER_ASSERT(reporter, success);
}
-}
\ No newline at end of file
+}
diff --git a/tests/GeometryTest.cpp b/tests/GeometryTest.cpp
index cef02d6..4b15e5f 100644
--- a/tests/GeometryTest.cpp
+++ b/tests/GeometryTest.cpp
@@ -9,6 +9,7 @@
#include "SkPointPriv.h"
#include "SkRandom.h"
#include "Test.h"
+
#include <array>
#include <numeric>
diff --git a/tests/GlyphRunTest.cpp b/tests/GlyphRunTest.cpp
index 10db2e8..2e99c47 100644
--- a/tests/GlyphRunTest.cpp
+++ b/tests/GlyphRunTest.cpp
@@ -7,13 +7,12 @@
#include "SkGlyphRun.h"
+#include "SkTextBlob.h"
+#include "Test.h"
+
#include <algorithm>
#include <memory>
-#include "SkTextBlob.h"
-
-#include "Test.h"
-
DEF_TEST(GlyphRunGlyphIDSetBasic, reporter) {
SkGlyphID glyphs[] = {100, 3, 240, 3, 234};
auto glyphIDs = SkSpan<const SkGlyphID>(glyphs, SK_ARRAY_COUNT(glyphs));
diff --git a/tests/GrCCPRTest.cpp b/tests/GrCCPRTest.cpp
index 864d29b..7ab8310 100644
--- a/tests/GrCCPRTest.cpp
+++ b/tests/GrCCPRTest.cpp
@@ -24,6 +24,7 @@
#include "sk_tool_utils.h"
#include "ccpr/GrCoverageCountingPathRenderer.h"
#include "mock/GrMockTypes.h"
+
#include <cmath>
static constexpr int kCanvasSize = 100;
diff --git a/tests/GrShapeTest.cpp b/tests/GrShapeTest.cpp
index 81afbb9..f9e2659 100644
--- a/tests/GrShapeTest.cpp
+++ b/tests/GrShapeTest.cpp
@@ -5,8 +5,6 @@
* found in the LICENSE file.
*/
-#include <initializer_list>
-#include <functional>
#include "Test.h"
#include "GrShape.h"
#include "SkCanvas.h"
@@ -17,6 +15,8 @@
#include "SkSurface.h"
#include "SkClipOpPriv.h"
+#include <initializer_list>
+#include <functional>
#include <utility>
uint32_t GrShape::testingOnly_getOriginalGenerationID() const {
diff --git a/tests/ICCTest.cpp b/tests/ICCTest.cpp
index d8f5a35..f82bfa4 100644
--- a/tests/ICCTest.cpp
+++ b/tests/ICCTest.cpp
@@ -12,6 +12,7 @@
#include "SkICC.h"
#include "SkString.h"
#include "Test.h"
+
#include "../third_party/skcms/skcms.h"
DEF_TEST(WriteICCProfile, r) {
diff --git a/tests/PathOpsOpCircleThreadedTest.cpp b/tests/PathOpsOpCircleThreadedTest.cpp
index f1f7df1..b6c19d5 100644
--- a/tests/PathOpsOpCircleThreadedTest.cpp
+++ b/tests/PathOpsOpCircleThreadedTest.cpp
@@ -8,6 +8,7 @@
#include "PathOpsExtendedTest.h"
#include "PathOpsThreadedCommon.h"
#include "SkString.h"
+
#include <atomic>
static int loopNo = 4;
diff --git a/tests/PathOpsOpCubicThreadedTest.cpp b/tests/PathOpsOpCubicThreadedTest.cpp
index 21e38d7..b087cbe 100644
--- a/tests/PathOpsOpCubicThreadedTest.cpp
+++ b/tests/PathOpsOpCubicThreadedTest.cpp
@@ -8,6 +8,7 @@
#include "PathOpsExtendedTest.h"
#include "PathOpsThreadedCommon.h"
#include "SkString.h"
+
#include <atomic>
static int loopNo = 158;
diff --git a/tests/PathOpsOpLoopThreadedTest.cpp b/tests/PathOpsOpLoopThreadedTest.cpp
index db2e9ff..496bc8c 100644
--- a/tests/PathOpsOpLoopThreadedTest.cpp
+++ b/tests/PathOpsOpLoopThreadedTest.cpp
@@ -8,6 +8,7 @@
#include "PathOpsExtendedTest.h"
#include "PathOpsThreadedCommon.h"
#include "SkString.h"
+
#include <atomic>
static int loopNo = 17;
diff --git a/tests/PathOpsTigerTest.cpp b/tests/PathOpsTigerTest.cpp
index 9068b03..99af9b9 100644
--- a/tests/PathOpsTigerTest.cpp
+++ b/tests/PathOpsTigerTest.cpp
@@ -7,6 +7,7 @@
#include "PathOpsDebug.h"
#include "PathOpsExtendedTest.h"
#include "PathOpsThreadedCommon.h"
+
#include <atomic>
#define TEST(name) { name, #name }
diff --git a/tests/ProcessorTest.cpp b/tests/ProcessorTest.cpp
index 18b3302..cc35f90 100644
--- a/tests/ProcessorTest.cpp
+++ b/tests/ProcessorTest.cpp
@@ -8,7 +8,6 @@
#include "SkTypes.h"
#include "Test.h"
-#include <random>
#include "GrClip.h"
#include "GrContext.h"
#include "GrContextPriv.h"
@@ -23,6 +22,8 @@
#include "ops/GrMeshDrawOp.h"
#include "ops/GrRectOpFactory.h"
+#include <random>
+
namespace {
class TestOp : public GrMeshDrawOp {
public:
diff --git a/tests/RecordTest.cpp b/tests/RecordTest.cpp
index 6474eb2..165532c 100644
--- a/tests/RecordTest.cpp
+++ b/tests/RecordTest.cpp
@@ -12,8 +12,8 @@
#include "SkRecords.h"
#include "SkShader.h"
#include "Test.h"
-#include <new>
+#include <new>
// Sums the area of any DrawRect command it sees.
class AreaSummer {
diff --git a/tests/RecordingXfermodeTest.cpp b/tests/RecordingXfermodeTest.cpp
index 87a8f80..41c1469 100644
--- a/tests/RecordingXfermodeTest.cpp
+++ b/tests/RecordingXfermodeTest.cpp
@@ -14,6 +14,7 @@
#include "../include/core/SkString.h"
#include "../include/core/SkPictureRecorder.h"
#include "../src/core/SkBlendModePriv.h"
+
#include <cstring>
// Verify that replay of a recording into a clipped canvas
diff --git a/tests/RefCntTest.cpp b/tests/RefCntTest.cpp
index 1a100b5..7ea0b33 100644
--- a/tests/RefCntTest.cpp
+++ b/tests/RefCntTest.cpp
@@ -9,6 +9,7 @@
#include "SkTypes.h"
#include "SkWeakRefCnt.h"
#include "Test.h"
+
#include <thread>
static void bounce_ref(void* data) {
diff --git a/tests/ResourceCacheTest.cpp b/tests/ResourceCacheTest.cpp
index bd989cd..26fab1f 100644
--- a/tests/ResourceCacheTest.cpp
+++ b/tests/ResourceCacheTest.cpp
@@ -7,7 +7,6 @@
#include "SkTypes.h"
-#include <thread>
#include "GrContext.h"
#include "GrContextPriv.h"
#include "GrContextFactory.h"
@@ -27,6 +26,8 @@
#include "SkSurface.h"
#include "Test.h"
+#include <thread>
+
static const int gWidth = 640;
static const int gHeight = 480;
diff --git a/tests/SRGBTest.cpp b/tests/SRGBTest.cpp
index 83d6d36..7ca1d86 100644
--- a/tests/SRGBTest.cpp
+++ b/tests/SRGBTest.cpp
@@ -9,9 +9,10 @@
#include "SkRasterPipeline.h"
#include "SkTypes.h"
#include "Test.h"
-#include <math.h>
#include "../src/jumper/SkJumper.h"
+#include <math.h>
+
DEF_TEST(sk_pipeline_srgb_roundtrip, r) {
uint32_t reds[256];
for (int i = 0; i < 256; i++) {
diff --git a/tests/ScaleToSidesTest.cpp b/tests/ScaleToSidesTest.cpp
index 430bb8c..79391c1 100644
--- a/tests/ScaleToSidesTest.cpp
+++ b/tests/ScaleToSidesTest.cpp
@@ -7,9 +7,10 @@
#include "SkScaleToSides.h"
-#include <algorithm>
#include "Test.h"
+#include <algorithm>
+
DEF_TEST(ScaleToSides, reporter) {
double interestingValues[] = {
// From sample app - PathFuzzer
diff --git a/tests/StringTest.cpp b/tests/StringTest.cpp
index 503dbb8..ca0c698 100644
--- a/tests/StringTest.cpp
+++ b/tests/StringTest.cpp
@@ -7,13 +7,13 @@
#include "Test.h"
+#include "SkString.h"
+#include "SkStringUtils.h"
+
#include <stdarg.h>
#include <stdio.h>
#include <thread>
-#include "SkString.h"
-#include "SkStringUtils.h"
-
static const char* gThirtyWideDecimal = "%30d";
DEF_TEST(String, reporter) {
diff --git a/tests/SurfaceTest.cpp b/tests/SurfaceTest.cpp
index 32fe639..2f6205c 100644
--- a/tests/SurfaceTest.cpp
+++ b/tests/SurfaceTest.cpp
@@ -5,9 +5,6 @@
* found in the LICENSE file.
*/
-#include <functional>
-#include <initializer_list>
-#include <vector>
#include "GrBackendSurface.h"
#include "GrContext.h"
#include "GrContextPriv.h"
@@ -30,6 +27,10 @@
#include "SkUtils.h"
#include "Test.h"
+#include <functional>
+#include <initializer_list>
+#include <vector>
+
#include "sk_tool_utils.h"