diff options
Diffstat (limited to 'tests')
-rw-r--r-- | tests/Float16Test.cpp | 5 | ||||
-rw-r--r-- | tests/MathTest.cpp | 1 | ||||
-rw-r--r-- | tests/PDFDeflateWStreamTest.cpp | 1 | ||||
-rw-r--r-- | tests/PDFGlyphsToUnicodeTest.cpp | 1 | ||||
-rw-r--r-- | tests/PDFPrimitivesTest.cpp | 3 | ||||
-rw-r--r-- | tests/PaintTest.cpp | 1 | ||||
-rw-r--r-- | tests/PathTest.cpp | 3 | ||||
-rw-r--r-- | tests/ReadWriteAlphaTest.cpp | 1 | ||||
-rw-r--r-- | tests/SVGDeviceTest.cpp | 2 | ||||
-rw-r--r-- | tests/SkBase64Test.cpp | 1 | ||||
-rw-r--r-- | tests/SkPEGTest.cpp | 1 | ||||
-rw-r--r-- | tests/SkRasterPipelineTest.cpp | 5 | ||||
-rw-r--r-- | tests/StreamTest.cpp | 1 | ||||
-rw-r--r-- | tests/TextBlobTest.cpp | 1 | ||||
-rw-r--r-- | tests/Time.cpp | 1 |
15 files changed, 7 insertions, 21 deletions
diff --git a/tests/Float16Test.cpp b/tests/Float16Test.cpp index 85f0ad59a6..e67d8f1e79 100644 --- a/tests/Float16Test.cpp +++ b/tests/Float16Test.cpp @@ -5,15 +5,14 @@ * found in the LICENSE file. */ +#include "Test.h" #include "SkAutoPixmapStorage.h" #include "SkColor.h" #include "SkHalf.h" #include "SkOpts.h" -#include "SkPM4f.h" #include "SkPixmap.h" +#include "SkPM4f.h" #include "SkRandom.h" -#include "SkTo.h" -#include "Test.h" #include <cmath> diff --git a/tests/MathTest.cpp b/tests/MathTest.cpp index 857440c9f9..b5d933d987 100644 --- a/tests/MathTest.cpp +++ b/tests/MathTest.cpp @@ -13,7 +13,6 @@ #include "SkMathPriv.h" #include "SkPoint.h" #include "SkRandom.h" -#include "SkTo.h" #include "Test.h" static void test_clz(skiatest::Reporter* reporter) { diff --git a/tests/PDFDeflateWStreamTest.cpp b/tests/PDFDeflateWStreamTest.cpp index d32828c29e..3d734c81a1 100644 --- a/tests/PDFDeflateWStreamTest.cpp +++ b/tests/PDFDeflateWStreamTest.cpp @@ -11,7 +11,6 @@ #include "SkDeflate.h" #include "SkRandom.h" -#include "SkTo.h" namespace { diff --git a/tests/PDFGlyphsToUnicodeTest.cpp b/tests/PDFGlyphsToUnicodeTest.cpp index cf69705eb1..2aeedf0330 100644 --- a/tests/PDFGlyphsToUnicodeTest.cpp +++ b/tests/PDFGlyphsToUnicodeTest.cpp @@ -13,7 +13,6 @@ #include "SkData.h" #include "SkPDFMakeToUnicodeCmap.h" #include "SkStream.h" -#include "SkTo.h" static const int kMaximumGlyphCount = SK_MaxU16 + 1; diff --git a/tests/PDFPrimitivesTest.cpp b/tests/PDFPrimitivesTest.cpp index f23c8e34df..d25adea16f 100644 --- a/tests/PDFPrimitivesTest.cpp +++ b/tests/PDFPrimitivesTest.cpp @@ -14,8 +14,8 @@ #include "SkCanvas.h" #include "SkClusterator.h" #include "SkData.h" -#include "SkDeflate.h" #include "SkDocument.h" +#include "SkDeflate.h" #include "SkImageEncoder.h" #include "SkImageFilterPriv.h" #include "SkMakeUnique.h" @@ -29,7 +29,6 @@ #include "SkScalar.h" #include "SkSpecialImage.h" #include "SkStream.h" -#include "SkTo.h" #include "SkTypes.h" #include "sk_tool_utils.h" diff --git a/tests/PaintTest.cpp b/tests/PaintTest.cpp index 2794058ceb..e52308c159 100644 --- a/tests/PaintTest.cpp +++ b/tests/PaintTest.cpp @@ -13,7 +13,6 @@ #include "SkPath.h" #include "SkRandom.h" #include "SkReadBuffer.h" -#include "SkTo.h" #include "SkTypeface.h" #include "SkUtils.h" #include "SkWriteBuffer.h" diff --git a/tests/PathTest.cpp b/tests/PathTest.cpp index 30d27c1e1b..565e8d817b 100644 --- a/tests/PathTest.cpp +++ b/tests/PathTest.cpp @@ -21,12 +21,11 @@ #include "SkStream.h" #include "SkStrokeRec.h" #include "SkSurface.h" -#include "SkTo.h" #include "SkWriter32.h" #include "Test.h" - #include <cmath> + static void set_radii(SkVector radii[4], int index, float rad) { sk_bzero(radii, sizeof(SkVector) * 4); radii[index].set(rad, rad); diff --git a/tests/ReadWriteAlphaTest.cpp b/tests/ReadWriteAlphaTest.cpp index d7f4d54ae1..0dc1fc090c 100644 --- a/tests/ReadWriteAlphaTest.cpp +++ b/tests/ReadWriteAlphaTest.cpp @@ -18,7 +18,6 @@ #include "ProxyUtils.h" #include "SkCanvas.h" #include "SkSurface.h" -#include "SkTo.h" // This was made indivisible by 4 to ensure we test setting GL_PACK_ALIGNMENT properly. static const int X_SIZE = 13; diff --git a/tests/SVGDeviceTest.cpp b/tests/SVGDeviceTest.cpp index 4d1d414bf9..6cf533fa1b 100644 --- a/tests/SVGDeviceTest.cpp +++ b/tests/SVGDeviceTest.cpp @@ -5,6 +5,7 @@ * found in the LICENSE file. */ + #include "SkBitmap.h" #include "SkCanvas.h" #include "SkData.h" @@ -13,7 +14,6 @@ #include "SkParse.h" #include "SkShader.h" #include "SkStream.h" -#include "SkTo.h" #include "Test.h" #include <string.h> diff --git a/tests/SkBase64Test.cpp b/tests/SkBase64Test.cpp index 30bfbce28b..d855ef57ad 100644 --- a/tests/SkBase64Test.cpp +++ b/tests/SkBase64Test.cpp @@ -6,7 +6,6 @@ */ #include "SkBase64.h" -#include "SkTo.h" #include "Test.h" diff --git a/tests/SkPEGTest.cpp b/tests/SkPEGTest.cpp index 2b51dfd5c5..6773c1b8ca 100644 --- a/tests/SkPEGTest.cpp +++ b/tests/SkPEGTest.cpp @@ -9,7 +9,6 @@ #if defined(SK_XML) #include "SkPEG.h" -#include "SkTo.h" using namespace skpeg; diff --git a/tests/SkRasterPipelineTest.cpp b/tests/SkRasterPipelineTest.cpp index 4c7658719b..e54c8c8039 100644 --- a/tests/SkRasterPipelineTest.cpp +++ b/tests/SkRasterPipelineTest.cpp @@ -5,11 +5,10 @@ * found in the LICENSE file. */ -#include "../src/jumper/SkJumper.h" +#include "Test.h" #include "SkHalf.h" #include "SkRasterPipeline.h" -#include "SkTo.h" -#include "Test.h" +#include "../src/jumper/SkJumper.h" DEF_TEST(SkRasterPipeline, r) { // Build and run a simple pipeline to exercise SkRasterPipeline, diff --git a/tests/StreamTest.cpp b/tests/StreamTest.cpp index 3372ee878a..7cf8d92bc5 100644 --- a/tests/StreamTest.cpp +++ b/tests/StreamTest.cpp @@ -14,7 +14,6 @@ #include "SkRandom.h" #include "SkStream.h" #include "SkStreamPriv.h" -#include "SkTo.h" #include "Test.h" #include <functional> diff --git a/tests/TextBlobTest.cpp b/tests/TextBlobTest.cpp index c94955838c..6aabc45a2a 100644 --- a/tests/TextBlobTest.cpp +++ b/tests/TextBlobTest.cpp @@ -8,7 +8,6 @@ #include "SkPaint.h" #include "SkPoint.h" #include "SkTextBlobRunIterator.h" -#include "SkTo.h" #include "SkTypeface.h" #include "Test.h" diff --git a/tests/Time.cpp b/tests/Time.cpp index 5a07f08925..f6bf9ff3f5 100644 --- a/tests/Time.cpp +++ b/tests/Time.cpp @@ -6,7 +6,6 @@ */ #include "SkTime.h" -#include "SkTo.h" #include "Test.h" // Sanity checks for the GetDateTime function. |