Cleanup: Sanitize the order of includes under tests/
Initially this was to make sure Test.h appeared after the Sk*.h includes.
Patch generated by the following command line:
$ ~/chromium/src/tools/sort-headers.py tests/*.cpp
BUG=None
TEST=tests
R=robertphillips@google.com
Review URL: https://codereview.chromium.org/145313004
git-svn-id: http://skia.googlecode.com/svn/trunk@13177 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/tests/AAClipTest.cpp b/tests/AAClipTest.cpp
index cc5c17b..961d57a 100644
--- a/tests/AAClipTest.cpp
+++ b/tests/AAClipTest.cpp
@@ -5,12 +5,12 @@
* found in the LICENSE file.
*/
-#include "Test.h"
#include "SkAAClip.h"
#include "SkCanvas.h"
#include "SkMask.h"
#include "SkPath.h"
#include "SkRandom.h"
+#include "Test.h"
static bool operator==(const SkMask& a, const SkMask& b) {
if (a.fFormat != b.fFormat || a.fBounds != b.fBounds) {
diff --git a/tests/AndroidPaintTest.cpp b/tests/AndroidPaintTest.cpp
index 0c0f9db..49bab05 100644
--- a/tests/AndroidPaintTest.cpp
+++ b/tests/AndroidPaintTest.cpp
@@ -1,10 +1,10 @@
// SkPaints only have an SkPaintOptionsAndroid if SK_BUILD_FOR_ANDROID is true.
#ifdef SK_BUILD_FOR_ANDROID
-#include "SkPaintOptionsAndroid.h"
#include "SkOrderedReadBuffer.h"
#include "SkOrderedWriteBuffer.h"
#include "SkPaint.h"
+#include "SkPaintOptionsAndroid.h"
#include "Test.h"
static size_t Reconstruct(const SkPaint& src, SkPaint* dst) {
diff --git a/tests/AnnotationTest.cpp b/tests/AnnotationTest.cpp
index 6d3720d..3d14664 100644
--- a/tests/AnnotationTest.cpp
+++ b/tests/AnnotationTest.cpp
@@ -5,12 +5,12 @@
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
-#include "Test.h"
#include "SkAnnotation.h"
-#include "SkData.h"
#include "SkCanvas.h"
+#include "SkData.h"
#include "SkPDFDevice.h"
#include "SkPDFDocument.h"
+#include "Test.h"
/** Returns true if data (may contain null characters) contains needle (null
* terminated). */
diff --git a/tests/AtomicTest.cpp b/tests/AtomicTest.cpp
index 9d5f0e6..8b5ac9b 100644
--- a/tests/AtomicTest.cpp
+++ b/tests/AtomicTest.cpp
@@ -5,10 +5,10 @@
* found in the LICENSE file.
*/
-#include "Test.h"
#include "SkThread.h"
#include "SkThreadUtils.h"
#include "SkTypes.h"
+#include "Test.h"
struct AddInfo {
int32_t valueToAdd;
diff --git a/tests/BitSetTest.cpp b/tests/BitSetTest.cpp
index f1ebb36..da02376 100644
--- a/tests/BitSetTest.cpp
+++ b/tests/BitSetTest.cpp
@@ -5,8 +5,8 @@
* found in the LICENSE file.
*/
-#include "Test.h"
#include "SkBitSet.h"
+#include "Test.h"
DEF_TEST(BitSet, reporter) {
SkBitSet set0(65536);
diff --git a/tests/BitmapCopyTest.cpp b/tests/BitmapCopyTest.cpp
index 9e96c33..57ac950 100644
--- a/tests/BitmapCopyTest.cpp
+++ b/tests/BitmapCopyTest.cpp
@@ -4,9 +4,9 @@
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
-#include "Test.h"
#include "SkBitmap.h"
#include "SkRect.h"
+#include "Test.h"
static const char* boolStr(bool value) {
return value ? "true" : "false";
diff --git a/tests/BitmapGetColorTest.cpp b/tests/BitmapGetColorTest.cpp
index 79dddbb..8df8661 100644
--- a/tests/BitmapGetColorTest.cpp
+++ b/tests/BitmapGetColorTest.cpp
@@ -5,10 +5,10 @@
* found in the LICENSE file.
*/
-#include "Test.h"
#include "SkBitmap.h"
-#include "SkRect.h"
#include "SkRandom.h"
+#include "SkRect.h"
+#include "Test.h"
DEF_TEST(GetColor, reporter) {
static const struct Rec {
diff --git a/tests/BlitRowTest.cpp b/tests/BlitRowTest.cpp
index 3f3f529..9ab620e 100644
--- a/tests/BlitRowTest.cpp
+++ b/tests/BlitRowTest.cpp
@@ -5,12 +5,12 @@
* found in the LICENSE file.
*/
-#include "Test.h"
#include "SkBitmap.h"
#include "SkCanvas.h"
#include "SkColorPriv.h"
#include "SkGradientShader.h"
#include "SkRect.h"
+#include "Test.h"
// these are in the same order as the SkBitmap::Config enum
static const char* gConfigName[] = {
diff --git a/tests/CachedDecodingPixelRefTest.cpp b/tests/CachedDecodingPixelRefTest.cpp
index d725ff5..a04ebe6 100644
--- a/tests/CachedDecodingPixelRefTest.cpp
+++ b/tests/CachedDecodingPixelRefTest.cpp
@@ -6,12 +6,12 @@
*/
#include "SkBitmap.h"
+#include "SkCachingPixelRef.h"
#include "SkCanvas.h"
#include "SkData.h"
#include "SkDecodingImageGenerator.h"
#include "SkDiscardableMemoryPool.h"
#include "SkImageDecoder.h"
-#include "SkCachingPixelRef.h"
#include "SkScaledImageCache.h"
#include "SkStream.h"
#include "SkUtils.h"
diff --git a/tests/CanvasStateTest.cpp b/tests/CanvasStateTest.cpp
index 4d39d9e..f1c3592 100644
--- a/tests/CanvasStateTest.cpp
+++ b/tests/CanvasStateTest.cpp
@@ -5,15 +5,15 @@
* found in the LICENSE file.
*/
-#include "Test.h"
#include "SkBitmapDevice.h"
#include "SkCanvas.h"
#include "SkCanvasStateUtils.h"
#include "SkDrawFilter.h"
#include "SkError.h"
#include "SkPaint.h"
-#include "SkRect.h"
#include "SkRRect.h"
+#include "SkRect.h"
+#include "Test.h"
static void test_complex_layers(skiatest::Reporter* reporter) {
const int WIDTH = 400;
diff --git a/tests/ClampRangeTest.cpp b/tests/ClampRangeTest.cpp
index 16ca525..b8059bc 100644
--- a/tests/ClampRangeTest.cpp
+++ b/tests/ClampRangeTest.cpp
@@ -5,9 +5,9 @@
* found in the LICENSE file.
*/
+#include "SkRandom.h"
#include "Test.h"
#include "gradients/SkClampRange.h"
-#include "SkRandom.h"
static skiatest::Reporter* gReporter;
diff --git a/tests/ClipCacheTest.cpp b/tests/ClipCacheTest.cpp
index 15a1332..77f0137 100644
--- a/tests/ClipCacheTest.cpp
+++ b/tests/ClipCacheTest.cpp
@@ -8,9 +8,9 @@
#include "Test.h"
// This is a GR test
#if SK_SUPPORT_GPU
+#include "../../src/gpu/GrClipMaskManager.h"
#include "GrContextFactory.h"
#include "SkGpuDevice.h"
-#include "../../src/gpu/GrClipMaskManager.h"
static const int X_SIZE = 12;
static const int Y_SIZE = 12;
diff --git a/tests/ClipCubicTest.cpp b/tests/ClipCubicTest.cpp
index 05ced3d..db6ae80 100644
--- a/tests/ClipCubicTest.cpp
+++ b/tests/ClipCubicTest.cpp
@@ -5,11 +5,11 @@
* found in the LICENSE file.
*/
-#include "Test.h"
#include "SkCanvas.h"
-#include "SkPaint.h"
#include "SkCubicClipper.h"
#include "SkGeometry.h"
+#include "SkPaint.h"
+#include "Test.h"
// Currently the supersampler blitter uses int16_t for its index into an array
// the width of the clip. Test that we don't crash/assert if we try to draw
diff --git a/tests/ClipperTest.cpp b/tests/ClipperTest.cpp
index 6f72068..c8f65db 100644
--- a/tests/ClipperTest.cpp
+++ b/tests/ClipperTest.cpp
@@ -5,11 +5,11 @@
* found in the LICENSE file.
*/
-#include "Test.h"
#include "SkCanvas.h"
#include "SkEdgeClipper.h"
#include "SkLineClipper.h"
#include "SkPath.h"
+#include "Test.h"
static void test_hairclipping(skiatest::Reporter* reporter) {
SkBitmap bm;
diff --git a/tests/ColorFilterTest.cpp b/tests/ColorFilterTest.cpp
index 4d2f815..e8cf8ba 100644
--- a/tests/ColorFilterTest.cpp
+++ b/tests/ColorFilterTest.cpp
@@ -5,15 +5,15 @@
* found in the LICENSE file.
*/
-#include "Test.h"
#include "SkColor.h"
-#include "SkColorPriv.h"
#include "SkColorFilter.h"
+#include "SkColorPriv.h"
#include "SkLumaColorFilter.h"
-#include "SkRandom.h"
-#include "SkXfermode.h"
#include "SkOrderedReadBuffer.h"
#include "SkOrderedWriteBuffer.h"
+#include "SkRandom.h"
+#include "SkXfermode.h"
+#include "Test.h"
static SkColorFilter* reincarnate_colorfilter(SkFlattenable* obj) {
SkOrderedWriteBuffer wb;
diff --git a/tests/ColorTest.cpp b/tests/ColorTest.cpp
index 64f2785..5a6f0fb 100644
--- a/tests/ColorTest.cpp
+++ b/tests/ColorTest.cpp
@@ -5,12 +5,12 @@
* found in the LICENSE file.
*/
-#include "Test.h"
#include "SkColor.h"
#include "SkColorPriv.h"
#include "SkMathPriv.h"
#include "SkRandom.h"
#include "SkUnPreMultiply.h"
+#include "Test.h"
#define GetPackedR16As32(packed) (SkGetPackedR16(dc) << (8 - SK_R16_BITS))
#define GetPackedG16As32(packed) (SkGetPackedG16(dc) << (8 - SK_G16_BITS))
diff --git a/tests/DataRefTest.cpp b/tests/DataRefTest.cpp
index e4c0a6b..731e448 100644
--- a/tests/DataRefTest.cpp
+++ b/tests/DataRefTest.cpp
@@ -5,13 +5,13 @@
* found in the LICENSE file.
*/
-#include "Test.h"
#include "SkData.h"
#include "SkDataTable.h"
+#include "SkOSFile.h"
#include "SkOrderedReadBuffer.h"
#include "SkOrderedWriteBuffer.h"
-#include "SkOSFile.h"
#include "SkStream.h"
+#include "Test.h"
static void test_is_equal(skiatest::Reporter* reporter,
const SkDataTable* a, const SkDataTable* b) {
diff --git a/tests/DeferredCanvasTest.cpp b/tests/DeferredCanvasTest.cpp
index df7c658..d15eeff 100644
--- a/tests/DeferredCanvasTest.cpp
+++ b/tests/DeferredCanvasTest.cpp
@@ -5,15 +5,15 @@
* found in the LICENSE file.
*/
-#include "Test.h"
+#include "../src/image/SkImagePriv.h"
+#include "../src/image/SkSurface_Base.h"
#include "SkBitmap.h"
#include "SkBitmapDevice.h"
#include "SkBitmapProcShader.h"
#include "SkDeferredCanvas.h"
#include "SkGradientShader.h"
#include "SkShader.h"
-#include "../src/image/SkSurface_Base.h"
-#include "../src/image/SkImagePriv.h"
+#include "Test.h"
#if SK_SUPPORT_GPU
#include "GrContextFactory.h"
#else
diff --git a/tests/DequeTest.cpp b/tests/DequeTest.cpp
index 8a836d3..5d5dc09 100644
--- a/tests/DequeTest.cpp
+++ b/tests/DequeTest.cpp
@@ -5,8 +5,8 @@
* found in the LICENSE file.
*/
-#include "Test.h"
#include "SkDeque.h"
+#include "Test.h"
static void assert_count(skiatest::Reporter* reporter, const SkDeque& deq, int count) {
if (0 == count) {
diff --git a/tests/DeviceLooperTest.cpp b/tests/DeviceLooperTest.cpp
index bd1aa09..ab5841b 100644
--- a/tests/DeviceLooperTest.cpp
+++ b/tests/DeviceLooperTest.cpp
@@ -5,9 +5,9 @@
* found in the LICENSE file.
*/
-#include "Test.h"
#include "SkDeviceLooper.h"
#include "SkRasterClip.h"
+#include "Test.h"
static void make_bm(SkBitmap* bm, int w, int h) {
bm->setConfig(SkBitmap::kA8_Config, w, h);
diff --git a/tests/DrawBitmapRectTest.cpp b/tests/DrawBitmapRectTest.cpp
index 2b5e420..a168146 100644
--- a/tests/DrawBitmapRectTest.cpp
+++ b/tests/DrawBitmapRectTest.cpp
@@ -5,17 +5,17 @@
* found in the LICENSE file.
*/
-#include "Test.h"
#include "SkBitmap.h"
#include "SkCanvas.h"
#include "SkData.h"
#include "SkDiscardableMemoryPool.h"
#include "SkImageGenerator.h"
+#include "SkMatrixUtils.h"
#include "SkPaint.h"
+#include "SkRandom.h"
#include "SkShader.h"
#include "SkSurface.h"
-#include "SkRandom.h"
-#include "SkMatrixUtils.h"
+#include "Test.h"
// A BitmapFactory that always fails when asked to return pixels.
class FailureImageGenerator : public SkImageGenerator {
diff --git a/tests/DrawPathTest.cpp b/tests/DrawPathTest.cpp
index ac015b6..2cf1bc5 100644
--- a/tests/DrawPathTest.cpp
+++ b/tests/DrawPathTest.cpp
@@ -5,11 +5,11 @@
* found in the LICENSE file.
*/
-#include "Test.h"
#include "SkBitmap.h"
#include "SkCanvas.h"
#include "SkDashPathEffect.h"
#include "SkSurface.h"
+#include "Test.h"
static SkCanvas* create(SkBitmap::Config config, int w, int h, int rb,
void* addr = NULL) {
diff --git a/tests/DrawTextTest.cpp b/tests/DrawTextTest.cpp
index 93f4b61..bafd2cb 100644
--- a/tests/DrawTextTest.cpp
+++ b/tests/DrawTextTest.cpp
@@ -5,7 +5,6 @@
* found in the LICENSE file.
*/
-#include "Test.h"
#include "SkBitmap.h"
#include "SkCanvas.h"
#include "SkColor.h"
@@ -13,6 +12,7 @@
#include "SkPoint.h"
#include "SkRect.h"
#include "SkTypes.h"
+#include "Test.h"
static const SkColor bgColor = SK_ColorWHITE;
diff --git a/tests/DynamicHashTest.cpp b/tests/DynamicHashTest.cpp
index 4202270..db6622d 100644
--- a/tests/DynamicHashTest.cpp
+++ b/tests/DynamicHashTest.cpp
@@ -5,8 +5,8 @@
* found in the LICENSE file.
*/
-#include "Test.h"
#include "SkTDynamicHash.h"
+#include "Test.h"
namespace {
diff --git a/tests/EmptyPathTest.cpp b/tests/EmptyPathTest.cpp
index d0d31bf..09a1f52 100644
--- a/tests/EmptyPathTest.cpp
+++ b/tests/EmptyPathTest.cpp
@@ -5,9 +5,9 @@
* found in the LICENSE file.
*/
-#include "Test.h"
-#include "SkPath.h"
#include "SkCanvas.h"
+#include "SkPath.h"
+#include "Test.h"
#define DIMENSION 32
diff --git a/tests/ErrorTest.cpp b/tests/ErrorTest.cpp
index 3525205..89e920a 100644
--- a/tests/ErrorTest.cpp
+++ b/tests/ErrorTest.cpp
@@ -5,10 +5,10 @@
* found in the LICENSE file.
*/
-#include "Test.h"
#include "SkError.h"
#include "SkPath.h"
#include "SkRect.h"
+#include "Test.h"
typedef struct {
skiatest::Reporter *fReporter;
diff --git a/tests/FillPathTest.cpp b/tests/FillPathTest.cpp
index 20b47ca..cc8d329 100644
--- a/tests/FillPathTest.cpp
+++ b/tests/FillPathTest.cpp
@@ -5,11 +5,11 @@
* found in the LICENSE file.
*/
-#include "Test.h"
-#include "SkRegion.h"
-#include "SkPath.h"
-#include "SkScan.h"
#include "SkBlitter.h"
+#include "SkPath.h"
+#include "SkRegion.h"
+#include "SkScan.h"
+#include "Test.h"
struct FakeBlitter : public SkBlitter {
FakeBlitter()
diff --git a/tests/FitsInTest.cpp b/tests/FitsInTest.cpp
index 4db81dd..6a46b67 100644
--- a/tests/FitsInTest.cpp
+++ b/tests/FitsInTest.cpp
@@ -5,9 +5,9 @@
* found in the LICENSE file.
*/
-#include "Test.h"
-#include "SkTypes.h"
#include "SkTFitsIn.h"
+#include "SkTypes.h"
+#include "Test.h"
#include <limits>
diff --git a/tests/FlatDataTest.cpp b/tests/FlatDataTest.cpp
index 54427f4..1f0e12a 100644
--- a/tests/FlatDataTest.cpp
+++ b/tests/FlatDataTest.cpp
@@ -5,7 +5,6 @@
* found in the LICENSE file.
*/
-#include "Test.h"
#include "SkBitmap.h"
#include "SkCanvas.h"
#include "SkColor.h"
@@ -15,6 +14,7 @@
#include "SkPictureFlat.h"
#include "SkShader.h"
#include "SkXfermode.h"
+#include "Test.h"
struct SkFlattenableTraits {
static void flatten(SkOrderedWriteBuffer& buffer, const SkFlattenable& flattenable) {
diff --git a/tests/FlateTest.cpp b/tests/FlateTest.cpp
index 22c70ab..aacde34 100644
--- a/tests/FlateTest.cpp
+++ b/tests/FlateTest.cpp
@@ -8,10 +8,10 @@
#include <stdlib.h>
#include <string.h>
-#include "Test.h"
#include "SkData.h"
#include "SkFlate.h"
#include "SkStream.h"
+#include "Test.h"
// A memory stream that reports zero size with the standard call, like
// an unseekable file stream would.
diff --git a/tests/FontHostStreamTest.cpp b/tests/FontHostStreamTest.cpp
index 3f50a92..a5f9ade 100644
--- a/tests/FontHostStreamTest.cpp
+++ b/tests/FontHostStreamTest.cpp
@@ -5,7 +5,6 @@
* found in the LICENSE file.
*/
-#include "Test.h"
#include "SkBitmap.h"
#include "SkCanvas.h"
#include "SkColor.h"
@@ -17,6 +16,7 @@
#include "SkStream.h"
#include "SkTypeface.h"
#include "SkTypes.h"
+#include "Test.h"
static const SkColor bgColor = SK_ColorWHITE;
diff --git a/tests/FontHostTest.cpp b/tests/FontHostTest.cpp
index f9e23c8..bc87aaa 100644
--- a/tests/FontHostTest.cpp
+++ b/tests/FontHostTest.cpp
@@ -5,13 +5,13 @@
* found in the LICENSE file.
*/
-#include "Test.h"
-#include "SkPaint.h"
+#include "SkEndian.h"
#include "SkFontStream.h"
#include "SkOSFile.h"
+#include "SkPaint.h"
#include "SkStream.h"
#include "SkTypeface.h"
-#include "SkEndian.h"
+#include "Test.h"
//#define DUMP_TABLES
//#define DUMP_TTC_TABLES
diff --git a/tests/FontMgrTest.cpp b/tests/FontMgrTest.cpp
index 32c61db..afe618c 100644
--- a/tests/FontMgrTest.cpp
+++ b/tests/FontMgrTest.cpp
@@ -5,10 +5,10 @@
* found in the LICENSE file.
*/
-#include "Test.h"
#include "SkCommandLineFlags.h"
#include "SkFontMgr.h"
#include "SkTypeface.h"
+#include "Test.h"
/*
* If the font backend is going to "alias" some font names to other fonts
diff --git a/tests/FontNamesTest.cpp b/tests/FontNamesTest.cpp
index ddae138..e4966b0 100644
--- a/tests/FontNamesTest.cpp
+++ b/tests/FontNamesTest.cpp
@@ -5,11 +5,11 @@
* found in the LICENSE file.
*/
-#include "Test.h"
#include "SkCommandLineFlags.h"
#include "SkFontMgr.h"
#include "SkOTTable_name.h"
#include "SkTypeface.h"
+#include "Test.h"
#include <stddef.h>
diff --git a/tests/FrontBufferedStreamTest.cpp b/tests/FrontBufferedStreamTest.cpp
index d2290f2..9f60854 100644
--- a/tests/FrontBufferedStreamTest.cpp
+++ b/tests/FrontBufferedStreamTest.cpp
@@ -5,11 +5,11 @@
* found in the LICENSE file.
*/
-#include "Test.h"
#include "SkFrontBufferedStream.h"
#include "SkRefCnt.h"
#include "SkStream.h"
#include "SkTypes.h"
+#include "Test.h"
static void test_read(skiatest::Reporter* reporter, SkStream* bufferedStream,
const void* expectations, size_t bytesToRead) {
diff --git a/tests/GLProgramsTest.cpp b/tests/GLProgramsTest.cpp
index 236a9b3..6c4aace 100644
--- a/tests/GLProgramsTest.cpp
+++ b/tests/GLProgramsTest.cpp
@@ -12,11 +12,11 @@
#if SK_SUPPORT_GPU && SK_ALLOW_STATIC_GLOBAL_INITIALIZERS
-#include "gl/GrGpuGL.h"
#include "GrBackendEffectFactory.h"
#include "GrContextFactory.h"
#include "GrDrawEffect.h"
#include "effects/GrConfigConversionEffect.h"
+#include "gl/GrGpuGL.h"
#include "SkChecksum.h"
#include "SkRandom.h"
@@ -249,9 +249,9 @@
// We force some of the effects that would otherwise be discarded to link here.
#include "SkAlphaThresholdFilter.h"
+#include "SkColorMatrixFilter.h"
#include "SkLightingImageFilter.h"
#include "SkMagnifierImageFilter.h"
-#include "SkColorMatrixFilter.h"
void forceLinking();
diff --git a/tests/GeometryTest.cpp b/tests/GeometryTest.cpp
index 01ac4d7..5151b70 100644
--- a/tests/GeometryTest.cpp
+++ b/tests/GeometryTest.cpp
@@ -5,8 +5,8 @@
* found in the LICENSE file.
*/
-#include "Test.h"
#include "SkGeometry.h"
+#include "Test.h"
static bool nearly_equal(const SkPoint& a, const SkPoint& b) {
return SkScalarNearlyEqual(a.fX, b.fX) && SkScalarNearlyEqual(a.fY, b.fY);
diff --git a/tests/GifTest.cpp b/tests/GifTest.cpp
index 7d5d56c..e2e0384 100644
--- a/tests/GifTest.cpp
+++ b/tests/GifTest.cpp
@@ -11,13 +11,13 @@
(!defined(SK_BUILD_FOR_IOS)) && \
(!defined(SK_BUILD_FOR_MAC))
-#include "Test.h"
#include "SkBitmap.h"
#include "SkData.h"
#include "SkForceLinking.h"
#include "SkImage.h"
#include "SkImageDecoder.h"
#include "SkStream.h"
+#include "Test.h"
__SK_FORCE_IMAGE_DECODER_LINKING;
diff --git a/tests/GpuDrawPathTest.cpp b/tests/GpuDrawPathTest.cpp
index eb83db3..3dcba52 100644
--- a/tests/GpuDrawPathTest.cpp
+++ b/tests/GpuDrawPathTest.cpp
@@ -14,8 +14,8 @@
#include "SkColor.h"
#include "SkGpuDevice.h"
#include "SkPaint.h"
-#include "SkRect.h"
#include "SkRRect.h"
+#include "SkRect.h"
#include "Test.h"
static void test_drawPathEmpty(skiatest::Reporter*, SkCanvas* canvas) {
diff --git a/tests/GrDrawTargetTest.cpp b/tests/GrDrawTargetTest.cpp
index 68f922f..c032d88 100644
--- a/tests/GrDrawTargetTest.cpp
+++ b/tests/GrDrawTargetTest.cpp
@@ -10,8 +10,8 @@
#include "GrContext.h"
#include "GrContextFactory.h"
-#include "GrGpu.h"
#include "GrDrawTargetCaps.h"
+#include "GrGpu.h"
#include "Test.h"
static void test_print(skiatest::Reporter*, const GrDrawTargetCaps* caps) {
diff --git a/tests/GrMemoryPoolTest.cpp b/tests/GrMemoryPoolTest.cpp
index faf5ca1..0848d97 100644
--- a/tests/GrMemoryPoolTest.cpp
+++ b/tests/GrMemoryPoolTest.cpp
@@ -9,10 +9,10 @@
// This is a GPU-backend specific test
#if SK_SUPPORT_GPU
#include "GrMemoryPool.h"
+#include "SkInstCnt.h"
#include "SkRandom.h"
#include "SkTDArray.h"
#include "SkTemplates.h"
-#include "SkInstCnt.h"
// A is the top of an inheritance tree of classes that overload op new and
// and delete to use a GrMemoryPool. The objects have values of different types
diff --git a/tests/GrUnitTests.cpp b/tests/GrUnitTests.cpp
index ddb5ead..0d02da7 100644
--- a/tests/GrUnitTests.cpp
+++ b/tests/GrUnitTests.cpp
@@ -11,8 +11,8 @@
#if SK_SUPPORT_GPU
#include "GrBinHashKey.h"
#include "GrDrawTarget.h"
-#include "SkMatrix.h"
#include "GrRedBlackTree.h"
+#include "SkMatrix.h"
// If we aren't inheriting these as #defines from elsewhere,
// clang demands they be declared before we #include the template
diff --git a/tests/GradientTest.cpp b/tests/GradientTest.cpp
index da9ac7f..8a250fa 100644
--- a/tests/GradientTest.cpp
+++ b/tests/GradientTest.cpp
@@ -5,13 +5,13 @@
* found in the LICENSE file.
*/
-#include "Test.h"
#include "SkBitmapDevice.h"
#include "SkColorShader.h"
#include "SkEmptyShader.h"
#include "SkGradientShader.h"
#include "SkShader.h"
#include "SkTemplates.h"
+#include "Test.h"
struct GradRec {
int fColorCount;
diff --git a/tests/ImageCacheTest.cpp b/tests/ImageCacheTest.cpp
index 06e5ab86..15b624a 100644
--- a/tests/ImageCacheTest.cpp
+++ b/tests/ImageCacheTest.cpp
@@ -5,9 +5,9 @@
* found in the LICENSE file.
*/
-#include "Test.h"
#include "SkDiscardableMemory.h"
#include "SkScaledImageCache.h"
+#include "Test.h"
static void make_bm(SkBitmap* bm, int w, int h) {
bm->setConfig(SkBitmap::kARGB_8888_Config, w, h);
diff --git a/tests/ImageDecodingTest.cpp b/tests/ImageDecodingTest.cpp
index 57990a5..81f9006 100644
--- a/tests/ImageDecodingTest.cpp
+++ b/tests/ImageDecodingTest.cpp
@@ -5,7 +5,6 @@
* found in the LICENSE file.
*/
-#include "Test.h"
#include "SkBitmap.h"
#include "SkCanvas.h"
#include "SkColor.h"
@@ -24,6 +23,7 @@
#include "SkShader.h"
#include "SkStream.h"
#include "SkString.h"
+#include "Test.h"
__SK_FORCE_IMAGE_DECODER_LINKING;
diff --git a/tests/ImageFilterTest.cpp b/tests/ImageFilterTest.cpp
index 3f984c4..f936a7a 100644
--- a/tests/ImageFilterTest.cpp
+++ b/tests/ImageFilterTest.cpp
@@ -5,26 +5,26 @@
* found in the LICENSE file.
*/
-#include "Test.h"
#include "SkBicubicImageFilter.h"
#include "SkBitmap.h"
#include "SkBitmapDevice.h"
#include "SkBitmapSource.h"
-#include "SkCanvas.h"
-#include "SkColorMatrixFilter.h"
-#include "SkColorFilterImageFilter.h"
-#include "SkDeviceImageFilterProxy.h"
#include "SkBlurImageFilter.h"
+#include "SkCanvas.h"
+#include "SkColorFilterImageFilter.h"
+#include "SkColorMatrixFilter.h"
+#include "SkDeviceImageFilterProxy.h"
#include "SkDisplacementMapEffect.h"
#include "SkDropShadowImageFilter.h"
#include "SkLightingImageFilter.h"
+#include "SkMatrixConvolutionImageFilter.h"
#include "SkMergeImageFilter.h"
#include "SkMorphologyImageFilter.h"
-#include "SkMatrixConvolutionImageFilter.h"
#include "SkOffsetImageFilter.h"
+#include "SkRect.h"
#include "SkTileImageFilter.h"
#include "SkXfermodeImageFilter.h"
-#include "SkRect.h"
+#include "Test.h"
static const int kBitmapSize = 4;
diff --git a/tests/InfRectTest.cpp b/tests/InfRectTest.cpp
index 9202ff9..3da0e5e 100644
--- a/tests/InfRectTest.cpp
+++ b/tests/InfRectTest.cpp
@@ -5,9 +5,9 @@
* found in the LICENSE file.
*/
-#include "Test.h"
#include "SkRandom.h"
#include "SkRect.h"
+#include "Test.h"
static float make_zero() {
return sk_float_sin(0);
diff --git a/tests/JpegTest.cpp b/tests/JpegTest.cpp
index 36a7a11..2897883 100644
--- a/tests/JpegTest.cpp
+++ b/tests/JpegTest.cpp
@@ -5,13 +5,13 @@
* found in the LICENSE file.
*/
-#include "Test.h"
#include "SkBitmap.h"
#include "SkData.h"
#include "SkForceLinking.h"
-#include "SkImageDecoder.h"
#include "SkImage.h"
+#include "SkImageDecoder.h"
#include "SkStream.h"
+#include "Test.h"
__SK_FORCE_IMAGE_DECODER_LINKING;
diff --git a/tests/LListTest.cpp b/tests/LListTest.cpp
index 4c6ff59..20151c3 100644
--- a/tests/LListTest.cpp
+++ b/tests/LListTest.cpp
@@ -5,10 +5,10 @@
* found in the LICENSE file.
*/
-#include "Test.h"
#include "SkRandom.h"
#include "SkTInternalLList.h"
#include "SkTLList.h"
+#include "Test.h"
class ListElement {
public:
diff --git a/tests/LayerDrawLooperTest.cpp b/tests/LayerDrawLooperTest.cpp
index d6ff92e..a1319a5 100644
--- a/tests/LayerDrawLooperTest.cpp
+++ b/tests/LayerDrawLooperTest.cpp
@@ -5,7 +5,6 @@
* found in the LICENSE file.
*/
-#include "Test.h"
#include "SkBitmap.h"
#include "SkBitmapDevice.h"
#include "SkCanvas.h"
@@ -17,6 +16,7 @@
#include "SkRefCnt.h"
#include "SkScalar.h"
#include "SkXfermode.h"
+#include "Test.h"
class FakeDevice : public SkBitmapDevice {
public:
diff --git a/tests/MD5Test.cpp b/tests/MD5Test.cpp
index ae827f7..efad26d 100644
--- a/tests/MD5Test.cpp
+++ b/tests/MD5Test.cpp
@@ -5,8 +5,8 @@
* found in the LICENSE file.
*/
-#include "Test.h"
#include "SkMD5.h"
+#include "Test.h"
static bool digests_equal(const SkMD5::Digest& expectedDigest, const SkMD5::Digest& computedDigest) {
for (size_t i = 0; i < SK_ARRAY_COUNT(expectedDigest.data); ++i) {
diff --git a/tests/MathTest.cpp b/tests/MathTest.cpp
index 1d73d58..4205ce6 100644
--- a/tests/MathTest.cpp
+++ b/tests/MathTest.cpp
@@ -5,7 +5,6 @@
* found in the LICENSE file.
*/
-#include "Test.h"
#include "SkColorPriv.h"
#include "SkEndian.h"
#include "SkFloatBits.h"
@@ -13,6 +12,7 @@
#include "SkMathPriv.h"
#include "SkPoint.h"
#include "SkRandom.h"
+#include "Test.h"
static void test_clz(skiatest::Reporter* reporter) {
REPORTER_ASSERT(reporter, 32 == SkCLZ(0));
diff --git a/tests/Matrix44Test.cpp b/tests/Matrix44Test.cpp
index e22c9d4..443086d 100644
--- a/tests/Matrix44Test.cpp
+++ b/tests/Matrix44Test.cpp
@@ -5,8 +5,8 @@
* found in the LICENSE file.
*/
-#include "Test.h"
#include "SkMatrix44.h"
+#include "Test.h"
static bool nearly_equal_double(double a, double b) {
const double tolerance = 1e-7;
diff --git a/tests/MatrixTest.cpp b/tests/MatrixTest.cpp
index 26bb122..9e39d5b2 100644
--- a/tests/MatrixTest.cpp
+++ b/tests/MatrixTest.cpp
@@ -5,11 +5,11 @@
* found in the LICENSE file.
*/
-#include "Test.h"
#include "SkMath.h"
#include "SkMatrix.h"
#include "SkMatrixUtils.h"
#include "SkRandom.h"
+#include "Test.h"
static bool nearly_equal_scalar(SkScalar a, SkScalar b) {
const SkScalar tolerance = SK_Scalar1 / 200000;
diff --git a/tests/MemsetTest.cpp b/tests/MemsetTest.cpp
index 73d50ee..ee6aaea 100644
--- a/tests/MemsetTest.cpp
+++ b/tests/MemsetTest.cpp
@@ -5,9 +5,9 @@
* found in the LICENSE file.
*/
-#include "Test.h"
#include "SkChunkAlloc.h"
#include "SkUtils.h"
+#include "Test.h"
static void test_chunkalloc(skiatest::Reporter* reporter) {
size_t min = 256;
diff --git a/tests/MetaDataTest.cpp b/tests/MetaDataTest.cpp
index 5f9f340..eb7eae9 100644
--- a/tests/MetaDataTest.cpp
+++ b/tests/MetaDataTest.cpp
@@ -5,8 +5,8 @@
* found in the LICENSE file.
*/
-#include "Test.h"
#include "SkMetaData.h"
+#include "Test.h"
static void test_ptrs(skiatest::Reporter* reporter) {
SkRefCnt ref;
diff --git a/tests/MipMapTest.cpp b/tests/MipMapTest.cpp
index 1c2771b..aca6973 100644
--- a/tests/MipMapTest.cpp
+++ b/tests/MipMapTest.cpp
@@ -5,10 +5,10 @@
* found in the LICENSE file.
*/
-#include "Test.h"
-#include "SkMipMap.h"
#include "SkBitmap.h"
+#include "SkMipMap.h"
#include "SkRandom.h"
+#include "Test.h"
static void make_bitmap(SkBitmap* bm, SkRandom& rand) {
// for now, Build needs a min size of 2, otherwise it will return NULL.
diff --git a/tests/OSPathTest.cpp b/tests/OSPathTest.cpp
index c082462..d36b7cb 100644
--- a/tests/OSPathTest.cpp
+++ b/tests/OSPathTest.cpp
@@ -5,9 +5,9 @@
* found in the LICENSE file.
*/
-#include "Test.h"
-#include "SkString.h"
#include "SkOSFile.h"
+#include "SkString.h"
+#include "Test.h"
/**
* Test SkPathJoin and SkBasename.
diff --git a/tests/PDFPrimitivesTest.cpp b/tests/PDFPrimitivesTest.cpp
index 1509365..b05d4c8 100644
--- a/tests/PDFPrimitivesTest.cpp
+++ b/tests/PDFPrimitivesTest.cpp
@@ -5,7 +5,6 @@
* found in the LICENSE file.
*/
-#include "Test.h"
#include "SkBitmap.h"
#include "SkCanvas.h"
#include "SkData.h"
@@ -19,6 +18,7 @@
#include "SkScalar.h"
#include "SkStream.h"
#include "SkTypes.h"
+#include "Test.h"
class SkPDFTestDict : public SkPDFDict {
public:
diff --git a/tests/PackBitsTest.cpp b/tests/PackBitsTest.cpp
index 017e341..2af4f18 100644
--- a/tests/PackBitsTest.cpp
+++ b/tests/PackBitsTest.cpp
@@ -5,8 +5,8 @@
* found in the LICENSE file.
*/
-#include "Test.h"
#include "SkPackBits.h"
+#include "Test.h"
static const uint16_t gTest0[] = { 0, 0, 1, 1 };
static const uint16_t gTest1[] = { 1, 2, 3, 4, 5, 6 };
diff --git a/tests/PaintTest.cpp b/tests/PaintTest.cpp
index 2a6bad4..3210e77 100644
--- a/tests/PaintTest.cpp
+++ b/tests/PaintTest.cpp
@@ -5,15 +5,15 @@
* found in the LICENSE file.
*/
-#include "Test.h"
#include "SkBlurMask.h"
#include "SkBlurMaskFilter.h"
#include "SkLayerDrawLooper.h"
-#include "SkPath.h"
#include "SkPaint.h"
+#include "SkPath.h"
#include "SkRandom.h"
#include "SkTypeface.h"
#include "SkUtils.h"
+#include "Test.h"
static size_t uni_to_utf8(const SkUnichar src[], void* dst, int count) {
char* u8 = (char*)dst;
diff --git a/tests/ParsePathTest.cpp b/tests/ParsePathTest.cpp
index 23b8919..ff43d14 100644
--- a/tests/ParsePathTest.cpp
+++ b/tests/ParsePathTest.cpp
@@ -5,8 +5,8 @@
* found in the LICENSE file.
*/
-#include "Test.h"
#include "SkParsePath.h"
+#include "Test.h"
static void test_to_from(skiatest::Reporter* reporter, const SkPath& path) {
SkString str, str2;
diff --git a/tests/PathCoverageTest.cpp b/tests/PathCoverageTest.cpp
index cc0db7c..0e4a153 100644
--- a/tests/PathCoverageTest.cpp
+++ b/tests/PathCoverageTest.cpp
@@ -5,10 +5,10 @@
* found in the LICENSE file.
*/
-#include "Test.h"
#include "SkMath.h"
#include "SkPoint.h"
#include "SkScalar.h"
+#include "Test.h"
/*
Duplicates lots of code from gpu/src/GrPathUtils.cpp
diff --git a/tests/PathMeasureTest.cpp b/tests/PathMeasureTest.cpp
index 00a3e2e..578f4eb 100644
--- a/tests/PathMeasureTest.cpp
+++ b/tests/PathMeasureTest.cpp
@@ -5,8 +5,8 @@
* found in the LICENSE file.
*/
-#include "Test.h"
#include "SkPathMeasure.h"
+#include "Test.h"
static void test_small_segment3() {
SkPath path;
diff --git a/tests/PathOpsCubicIntersectionTestData.cpp b/tests/PathOpsCubicIntersectionTestData.cpp
index aafc613..31056d2 100644
--- a/tests/PathOpsCubicIntersectionTestData.cpp
+++ b/tests/PathOpsCubicIntersectionTestData.cpp
@@ -4,7 +4,9 @@
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
+
#include "PathOpsCubicIntersectionTestData.h"
+
#include <limits>
static const double D = FLT_EPSILON / 2;
diff --git a/tests/PathOpsSimplifyFailTest.cpp b/tests/PathOpsSimplifyFailTest.cpp
index 8bcc883..cff6bd3 100644
--- a/tests/PathOpsSimplifyFailTest.cpp
+++ b/tests/PathOpsSimplifyFailTest.cpp
@@ -4,8 +4,8 @@
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
-#include "SkPathOps.h"
#include "SkPath.h"
+#include "SkPathOps.h"
#include "SkPoint.h"
#include "Test.h"
diff --git a/tests/PathTest.cpp b/tests/PathTest.cpp
index 33d8da4..1af5bd3 100644
--- a/tests/PathTest.cpp
+++ b/tests/PathTest.cpp
@@ -5,20 +5,20 @@
* found in the LICENSE file.
*/
-#include "Test.h"
#include "SkCanvas.h"
#include "SkPaint.h"
-#include "SkPath.h"
#include "SkParse.h"
#include "SkParsePath.h"
+#include "SkPath.h"
#include "SkPathEffect.h"
+#include "SkRRect.h"
#include "SkRandom.h"
#include "SkReader32.h"
-#include "SkRRect.h"
#include "SkSize.h"
#include "SkSurface.h"
#include "SkTypes.h"
#include "SkWriter32.h"
+#include "Test.h"
static void make_path0(SkPath* path) {
// from * https://code.google.com/p/skia/issues/detail?id=1706
diff --git a/tests/PathUtilsTest.cpp b/tests/PathUtilsTest.cpp
index 65b742c..872af0b 100644
--- a/tests/PathUtilsTest.cpp
+++ b/tests/PathUtilsTest.cpp
@@ -5,12 +5,12 @@
* found in the LICENSE file.
*/
-#include "Test.h"
#include "SkBitmap.h"
#include "SkCanvas.h"
#include "SkPathUtils.h"
#include "SkRandom.h"
#include "SkTime.h"
+#include "Test.h"
const int kNumIt = 100;
diff --git a/tests/PictureTest.cpp b/tests/PictureTest.cpp
index 2bdcfb3..5aaf73b 100644
--- a/tests/PictureTest.cpp
+++ b/tests/PictureTest.cpp
@@ -5,7 +5,6 @@
* found in the LICENSE file.
*/
-#include "Test.h"
#include "SkBitmapDevice.h"
#include "SkCanvas.h"
#include "SkColorPriv.h"
@@ -17,10 +16,11 @@
#include "SkPaint.h"
#include "SkPicture.h"
#include "SkPictureUtils.h"
-#include "SkRandom.h"
#include "SkRRect.h"
+#include "SkRandom.h"
#include "SkShader.h"
#include "SkStream.h"
+#include "Test.h"
static const int gColorScale = 30;
static const int gColorOffset = 60;
diff --git a/tests/PictureUtilsTest.cpp b/tests/PictureUtilsTest.cpp
index 8cf013c..069e852 100644
--- a/tests/PictureUtilsTest.cpp
+++ b/tests/PictureUtilsTest.cpp
@@ -5,9 +5,9 @@
* found in the LICENSE file.
*/
+#include "SkString.h"
#include "Test.h"
#include "picture_utils.h"
-#include "SkString.h"
static void test_filepath_creation(skiatest::Reporter* reporter) {
SkString result;
diff --git a/tests/PipeTest.cpp b/tests/PipeTest.cpp
index 579f736..6ab4d8e 100644
--- a/tests/PipeTest.cpp
+++ b/tests/PipeTest.cpp
@@ -5,13 +5,13 @@
* found in the LICENSE file.
*/
-#include "Test.h"
#include "SamplePipeControllers.h"
#include "SkBitmap.h"
#include "SkCanvas.h"
#include "SkGPipe.h"
#include "SkPaint.h"
#include "SkShader.h"
+#include "Test.h"
// Ensures that the pipe gracefully handles drawing an invalid bitmap.
static void testDrawingBadBitmap(SkCanvas* pipeCanvas) {
diff --git a/tests/PixelRefTest.cpp b/tests/PixelRefTest.cpp
index 1e9bbe7..c0bdf54 100644
--- a/tests/PixelRefTest.cpp
+++ b/tests/PixelRefTest.cpp
@@ -1,7 +1,7 @@
#include "Test.h"
-#include "SkPixelRef.h"
#include "SkMallocPixelRef.h"
+#include "SkPixelRef.h"
static void test_info(skiatest::Reporter* reporter) {
static const struct {
diff --git a/tests/QuickRejectTest.cpp b/tests/QuickRejectTest.cpp
index 9546924..5c1b877 100644
--- a/tests/QuickRejectTest.cpp
+++ b/tests/QuickRejectTest.cpp
@@ -5,9 +5,9 @@
* found in the LICENSE file.
*/
-#include "Test.h"
#include "SkCanvas.h"
#include "SkDrawLooper.h"
+#include "Test.h"
/*
* Subclass of looper that just draws once, with an offset in X.
diff --git a/tests/RTreeTest.cpp b/tests/RTreeTest.cpp
index a78e746..ae8c005 100644
--- a/tests/RTreeTest.cpp
+++ b/tests/RTreeTest.cpp
@@ -5,10 +5,10 @@
* found in the LICENSE file.
*/
-#include "Test.h"
-#include "SkRandom.h"
#include "SkRTree.h"
+#include "SkRandom.h"
#include "SkTSort.h"
+#include "Test.h"
static const size_t MIN_CHILDREN = 6;
static const size_t MAX_CHILDREN = 11;
diff --git a/tests/RandomTest.cpp b/tests/RandomTest.cpp
index 4aa39a3..8d93d87 100644
--- a/tests/RandomTest.cpp
+++ b/tests/RandomTest.cpp
@@ -5,9 +5,9 @@
* found in the LICENSE file.
*/
-#include "Test.h"
#include "SkRandom.h"
#include "SkTSort.h"
+#include "Test.h"
static bool anderson_darling_test(double p[32]) {
// Min and max Anderson-Darling values allowable for k=32
diff --git a/tests/ReadPixelsTest.cpp b/tests/ReadPixelsTest.cpp
index 32676de..5f25007 100644
--- a/tests/ReadPixelsTest.cpp
+++ b/tests/ReadPixelsTest.cpp
@@ -13,8 +13,8 @@
#include "Test.h"
#if SK_SUPPORT_GPU
-#include "SkGpuDevice.h"
#include "GrContextFactory.h"
+#include "SkGpuDevice.h"
#endif
static const int DEV_W = 100, DEV_H = 100;
diff --git a/tests/Reader32Test.cpp b/tests/Reader32Test.cpp
index d557f32..cfa08b3 100644
--- a/tests/Reader32Test.cpp
+++ b/tests/Reader32Test.cpp
@@ -5,8 +5,8 @@
* found in the LICENSE file.
*/
-#include "Test.h"
#include "SkReader32.h"
+#include "Test.h"
static void assert_eof(skiatest::Reporter* reporter, const SkReader32& reader) {
REPORTER_ASSERT(reporter, reader.eof());
diff --git a/tests/RefCntTest.cpp b/tests/RefCntTest.cpp
index 19973f7..bd4f348 100644
--- a/tests/RefCntTest.cpp
+++ b/tests/RefCntTest.cpp
@@ -5,12 +5,12 @@
* found in the LICENSE file.
*/
-#include "Test.h"
#include "SkRefCnt.h"
#include "SkTRefArray.h"
#include "SkThreadUtils.h"
#include "SkTypes.h"
#include "SkWeakRefCnt.h"
+#include "Test.h"
class InstCounterClass {
public:
diff --git a/tests/RefDictTest.cpp b/tests/RefDictTest.cpp
index b9f4a9a..1e18a68 100644
--- a/tests/RefDictTest.cpp
+++ b/tests/RefDictTest.cpp
@@ -5,8 +5,8 @@
* found in the LICENSE file.
*/
-#include "Test.h"
#include "SkRefDict.h"
+#include "Test.h"
class TestRC : public SkRefCnt {
public:
diff --git a/tests/RegionTest.cpp b/tests/RegionTest.cpp
index 814a7d4..ae58ae6 100644
--- a/tests/RegionTest.cpp
+++ b/tests/RegionTest.cpp
@@ -5,9 +5,9 @@
* found in the LICENSE file.
*/
-#include "Test.h"
-#include "SkRegion.h"
#include "SkRandom.h"
+#include "SkRegion.h"
+#include "Test.h"
static void Union(SkRegion* rgn, const SkIRect& rect) {
rgn->op(rect, SkRegion::kUnion_Op);
diff --git a/tests/RoundRectTest.cpp b/tests/RoundRectTest.cpp
index 891b039..9b2eecd 100644
--- a/tests/RoundRectTest.cpp
+++ b/tests/RoundRectTest.cpp
@@ -5,9 +5,9 @@
* found in the LICENSE file.
*/
-#include "Test.h"
#include "SkMatrix.h"
#include "SkRRect.h"
+#include "Test.h"
static const SkScalar kWidth = 100.0f;
static const SkScalar kHeight = 100.0f;
diff --git a/tests/SHA1Test.cpp b/tests/SHA1Test.cpp
index d189c1c..fd5fcb7 100644
--- a/tests/SHA1Test.cpp
+++ b/tests/SHA1Test.cpp
@@ -5,8 +5,8 @@
* found in the LICENSE file.
*/
-#include "Test.h"
#include "SkSHA1.h"
+#include "Test.h"
static bool digests_equal(const SkSHA1::Digest& expectedDigest, const SkSHA1::Digest& computedDigest) {
for (size_t i = 0; i < SK_ARRAY_COUNT(expectedDigest.data); ++i) {
diff --git a/tests/ScalarTest.cpp b/tests/ScalarTest.cpp
index 08f5d66..82f61ec 100644
--- a/tests/ScalarTest.cpp
+++ b/tests/ScalarTest.cpp
@@ -5,12 +5,12 @@
* found in the LICENSE file.
*/
-#include "Test.h"
#include "SkFloatingPoint.h"
#include "SkMath.h"
#include "SkPoint.h"
#include "SkRandom.h"
#include "SkRect.h"
+#include "Test.h"
struct PointSet {
const SkPoint* fPts;
diff --git a/tests/SerializationTest.cpp b/tests/SerializationTest.cpp
index ee7875a..76612b6 100644
--- a/tests/SerializationTest.cpp
+++ b/tests/SerializationTest.cpp
@@ -5,7 +5,6 @@
* found in the LICENSE file.
*/
-#include "Test.h"
#include "SkBitmapDevice.h"
#include "SkBitmapSource.h"
#include "SkCanvas.h"
@@ -13,6 +12,7 @@
#include "SkOrderedWriteBuffer.h"
#include "SkValidatingReadBuffer.h"
#include "SkXfermodeImageFilter.h"
+#include "Test.h"
static const uint32_t kArraySize = 64;
diff --git a/tests/ShaderImageFilterTest.cpp b/tests/ShaderImageFilterTest.cpp
index bf5b275..96beed5 100644
--- a/tests/ShaderImageFilterTest.cpp
+++ b/tests/ShaderImageFilterTest.cpp
@@ -5,11 +5,11 @@
* found in the LICENSE file.
*/
-#include "Test.h"
#include "SkCanvas.h"
-#include "SkShader.h"
-#include "SkRectShaderImageFilter.h"
#include "SkGradientShader.h"
+#include "SkRectShaderImageFilter.h"
+#include "SkShader.h"
+#include "Test.h"
DEF_TEST(ShaderImageFilter, reporter) {
int w = 10, h = 10;
diff --git a/tests/ShaderOpacityTest.cpp b/tests/ShaderOpacityTest.cpp
index 3e67306..5230e4a 100644
--- a/tests/ShaderOpacityTest.cpp
+++ b/tests/ShaderOpacityTest.cpp
@@ -5,10 +5,10 @@
* found in the LICENSE file.
*/
-#include "Test.h"
-#include "SkShader.h"
-#include "SkGradientShader.h"
#include "SkColorShader.h"
+#include "SkGradientShader.h"
+#include "SkShader.h"
+#include "Test.h"
static void test_bitmap(skiatest::Reporter* reporter) {
SkBitmap bmp;
diff --git a/tests/SkpSkGrTest.cpp b/tests/SkpSkGrTest.cpp
old mode 100755
new mode 100644
index c22b50f..2c01a7e
--- a/tests/SkpSkGrTest.cpp
+++ b/tests/SkpSkGrTest.cpp
@@ -9,17 +9,17 @@
#include "gl/GrGLDefines.h"
#include "SkBitmap.h"
+#include "SkCanvas.h"
#include "SkColor.h"
#include "SkDevice.h"
-#include "SkCanvas.h"
#include "SkGraphics.h"
#include "SkImageDecoder.h"
#include "SkImageEncoder.h"
-#include "SkStream.h"
#include "SkOSFile.h"
#include "SkPicture.h"
#include "SkRTConf.h"
#include "SkRunnable.h"
+#include "SkStream.h"
#include "SkString.h"
#include "SkTArray.h"
#include "SkTDArray.h"
diff --git a/tests/SortTest.cpp b/tests/SortTest.cpp
index 198e3cf..e8713dd 100644
--- a/tests/SortTest.cpp
+++ b/tests/SortTest.cpp
@@ -5,9 +5,9 @@
* found in the LICENSE file.
*/
-#include "Test.h"
#include "SkRandom.h"
#include "SkTSort.h"
+#include "Test.h"
extern "C" {
static int compare_int(const void* a, const void* b) {
diff --git a/tests/SrcOverTest.cpp b/tests/SrcOverTest.cpp
index 91a9c81..be64710 100644
--- a/tests/SrcOverTest.cpp
+++ b/tests/SrcOverTest.cpp
@@ -5,9 +5,9 @@
* found in the LICENSE file.
*/
-#include "Test.h"
#include "SkColorPriv.h"
#include "SkXfermode.h"
+#include "Test.h"
// our std SkAlpha255To256
static int test_srcover0(unsigned dst, unsigned alpha) {
diff --git a/tests/StreamTest.cpp b/tests/StreamTest.cpp
index ecb8336..7cf3126 100644
--- a/tests/StreamTest.cpp
+++ b/tests/StreamTest.cpp
@@ -5,11 +5,11 @@
* found in the LICENSE file.
*/
-#include "Test.h"
-#include "SkRandom.h"
-#include "SkOSFile.h"
-#include "SkStream.h"
#include "SkData.h"
+#include "SkOSFile.h"
+#include "SkRandom.h"
+#include "SkStream.h"
+#include "Test.h"
#ifndef SK_BUILD_FOR_WIN
#include <unistd.h>
diff --git a/tests/StringTest.cpp b/tests/StringTest.cpp
index a911a85..13ee5ec 100644
--- a/tests/StringTest.cpp
+++ b/tests/StringTest.cpp
@@ -5,10 +5,10 @@
* found in the LICENSE file.
*/
-#include "Test.h"
-#include "SkString.h"
#include <stdarg.h>
#include <stdio.h>
+#include "SkString.h"
+#include "Test.h"
// Windows vsnprintf doesn't 0-terminate safely), but is so far
// encapsulated in SkString that we can't test it directly.
diff --git a/tests/StrokeTest.cpp b/tests/StrokeTest.cpp
index 2a28fa4..15220c4 100644
--- a/tests/StrokeTest.cpp
+++ b/tests/StrokeTest.cpp
@@ -5,11 +5,11 @@
* found in the LICENSE file.
*/
-#include "Test.h"
#include "SkPaint.h"
#include "SkPath.h"
#include "SkRect.h"
#include "SkStroke.h"
+#include "Test.h"
static bool equal(const SkRect& a, const SkRect& b) {
return SkScalarNearlyEqual(a.left(), b.left()) &&
diff --git a/tests/TLSTest.cpp b/tests/TLSTest.cpp
index 1e6b616..53bb5fe 100644
--- a/tests/TLSTest.cpp
+++ b/tests/TLSTest.cpp
@@ -5,11 +5,11 @@
* found in the LICENSE file.
*/
-#include "Test.h"
#include "SkGraphics.h"
#include "SkPaint.h"
#include "SkTLS.h"
#include "SkThreadUtils.h"
+#include "Test.h"
static void thread_main(void*) {
SkGraphics::SetTLSFontCacheLimit(1 * 1024 * 1024);
diff --git a/tests/TSetTest.cpp b/tests/TSetTest.cpp
index dc53633..3f82648 100644
--- a/tests/TSetTest.cpp
+++ b/tests/TSetTest.cpp
@@ -5,8 +5,8 @@
* found in the LICENSE file.
*/
-#include "Test.h"
#include "SkTSet.h"
+#include "Test.h"
// Tests the SkTSet<T> class template.
// Functions that just call SkTDArray are not tested.
diff --git a/tests/Test.cpp b/tests/Test.cpp
index 994a342..daa23b1 100644
--- a/tests/Test.cpp
+++ b/tests/Test.cpp
@@ -7,10 +7,10 @@
*/
#include "Test.h"
+#include "SkError.h"
#include "SkString.h"
#include "SkTArray.h"
#include "SkTime.h"
-#include "SkError.h"
#if SK_SUPPORT_GPU
#include "GrContext.h"
diff --git a/tests/TestSize.cpp b/tests/TestSize.cpp
index 76a96e7..466a628 100644
--- a/tests/TestSize.cpp
+++ b/tests/TestSize.cpp
@@ -5,8 +5,8 @@
* found in the LICENSE file.
*/
-#include "Test.h"
#include "SkSize.h"
+#include "Test.h"
static void TestISize(skiatest::Reporter* reporter) {
SkISize a, b;
diff --git a/tests/TileGridTest.cpp b/tests/TileGridTest.cpp
index c86a2bd..37952b4 100644
--- a/tests/TileGridTest.cpp
+++ b/tests/TileGridTest.cpp
@@ -5,11 +5,11 @@
* found in the LICENSE file.
*/
-#include "Test.h"
#include "SkBitmapDevice.h"
#include "SkCanvas.h"
#include "SkTileGrid.h"
#include "SkTileGridPicture.h"
+#include "Test.h"
enum Tile {
kTopLeft_Tile = 0x1,
diff --git a/tests/ToUnicode.cpp b/tests/ToUnicode.cpp
index 71b8592..919ba11 100644
--- a/tests/ToUnicode.cpp
+++ b/tests/ToUnicode.cpp
@@ -5,11 +5,11 @@
* found in the LICENSE file.
*/
-#include "Test.h"
#include "SkData.h"
-#include "SkPDFTypes.h"
#include "SkPDFFont.h"
+#include "SkPDFTypes.h"
#include "SkStream.h"
+#include "Test.h"
static bool stream_equals(const SkDynamicMemoryWStream& stream, size_t offset,
const char* buffer, size_t len) {
diff --git a/tests/Typeface.cpp b/tests/Typeface.cpp
index 93f1627..bb5d361 100644
--- a/tests/Typeface.cpp
+++ b/tests/Typeface.cpp
@@ -5,8 +5,8 @@
* found in the LICENSE file.
*/
-#include "Test.h"
#include "SkTypeface.h"
+#include "Test.h"
DEF_TEST(Typeface, reporter) {
diff --git a/tests/UnicodeTest.cpp b/tests/UnicodeTest.cpp
index dc5bc15..5ed92d4 100644
--- a/tests/UnicodeTest.cpp
+++ b/tests/UnicodeTest.cpp
@@ -5,9 +5,9 @@
* found in the LICENSE file.
*/
-#include "Test.h"
#include "SkPaint.h"
#include "SkUtils.h"
+#include "Test.h"
// Unicode Variation Selector ranges: inclusive
#define UVS_MIN0 0x180B
diff --git a/tests/UnitTestTest.cpp b/tests/UnitTestTest.cpp
index d0ed6a1..35432cd 100644
--- a/tests/UnitTestTest.cpp
+++ b/tests/UnitTestTest.cpp
@@ -5,8 +5,8 @@
* found in the LICENSE file.
*/
-#include "Test.h"
#include "SkRTConf.h"
+#include "Test.h"
DEF_TEST(UnitTest, reporter) {
#ifdef SK_SUPPORT_UNITTEST
diff --git a/tests/UtilsTest.cpp b/tests/UtilsTest.cpp
index ccea466..438a5cc 100644
--- a/tests/UtilsTest.cpp
+++ b/tests/UtilsTest.cpp
@@ -5,12 +5,12 @@
* found in the LICENSE file.
*/
-#include "Test.h"
#include "SkRandom.h"
#include "SkRefCnt.h"
#include "SkTSearch.h"
#include "SkTSort.h"
#include "SkUtils.h"
+#include "Test.h"
class RefClass : public SkRefCnt {
public:
diff --git a/tests/WritePixelsTest.cpp b/tests/WritePixelsTest.cpp
index 99e6d11..43d17e7 100644
--- a/tests/WritePixelsTest.cpp
+++ b/tests/WritePixelsTest.cpp
@@ -13,8 +13,8 @@
#include "Test.h"
#if SK_SUPPORT_GPU
-#include "SkGpuDevice.h"
#include "GrContextFactory.h"
+#include "SkGpuDevice.h"
#else
class GrContext;
class GrContextFactory;
diff --git a/tests/Writer32Test.cpp b/tests/Writer32Test.cpp
index d9f4f9e..fa024ba 100644
--- a/tests/Writer32Test.cpp
+++ b/tests/Writer32Test.cpp
@@ -5,10 +5,10 @@
* found in the LICENSE file.
*/
-#include "Test.h"
#include "SkRandom.h"
#include "SkReader32.h"
#include "SkWriter32.h"
+#include "Test.h"
static void check_contents(skiatest::Reporter* reporter, const SkWriter32& writer,
const void* expected, size_t size) {
diff --git a/tests/XfermodeTest.cpp b/tests/XfermodeTest.cpp
index 878f40d..7ac12fb 100644
--- a/tests/XfermodeTest.cpp
+++ b/tests/XfermodeTest.cpp
@@ -5,9 +5,9 @@
* found in the LICENSE file.
*/
-#include "Test.h"
#include "SkColor.h"
#include "SkXfermode.h"
+#include "Test.h"
static SkPMColor bogusXfermodeProc(SkPMColor src, SkPMColor dst) {
return 42;
diff --git a/tests/skia_test.cpp b/tests/skia_test.cpp
index d489972..fd7f3a3 100644
--- a/tests/skia_test.cpp
+++ b/tests/skia_test.cpp
@@ -5,6 +5,7 @@
* found in the LICENSE file.
*/
+#include "OverwriteLine.h"
#include "SkCommandLineFlags.h"
#include "SkGraphics.h"
#include "SkOSFile.h"
@@ -13,7 +14,6 @@
#include "SkThreadPool.h"
#include "SkTime.h"
#include "Test.h"
-#include "OverwriteLine.h"
#if SK_SUPPORT_GPU
#include "GrContext.h"