rewrite includes to not need so much -Ifoo
Current strategy: everything from the top
Things to look at first are the manual changes:
- added tools/rewrite_includes.py
- removed -Idirectives from BUILD.gn
- various compile.sh simplifications
- tweak tools/embed_resources.py
- update gn/find_headers.py to write paths from the top
- update gn/gn_to_bp.py SkUserConfig.h layout
so that #include "include/config/SkUserConfig.h" always
gets the header we want.
No-Presubmit: true
Change-Id: I73a4b181654e0e38d229bc456c0d0854bae3363e
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/209706
Commit-Queue: Mike Klein <mtklein@google.com>
Reviewed-by: Hal Canary <halcanary@google.com>
Reviewed-by: Brian Osman <brianosman@google.com>
Reviewed-by: Florin Malita <fmalita@chromium.org>
diff --git a/tests/AAClipTest.cpp b/tests/AAClipTest.cpp
index b7ec31b..4162def 100644
--- a/tests/AAClipTest.cpp
+++ b/tests/AAClipTest.cpp
@@ -5,23 +5,23 @@
* found in the LICENSE file.
*/
-#include "SkAAClip.h"
-#include "SkBitmap.h"
-#include "SkCanvas.h"
-#include "SkColor.h"
-#include "SkImageInfo.h"
-#include "SkMalloc.h"
-#include "SkMask.h"
-#include "SkMatrix.h"
-#include "SkPath.h"
-#include "SkRRect.h"
-#include "SkRandom.h"
-#include "SkRasterClip.h"
-#include "SkRect.h"
-#include "SkRegion.h"
-#include "SkScalar.h"
-#include "SkTypes.h"
-#include "Test.h"
+#include "include/core/SkBitmap.h"
+#include "include/core/SkCanvas.h"
+#include "include/core/SkColor.h"
+#include "include/core/SkImageInfo.h"
+#include "include/core/SkMatrix.h"
+#include "include/core/SkPath.h"
+#include "include/core/SkRRect.h"
+#include "include/core/SkRect.h"
+#include "include/core/SkRegion.h"
+#include "include/core/SkScalar.h"
+#include "include/core/SkTypes.h"
+#include "include/private/SkMalloc.h"
+#include "include/utils/SkRandom.h"
+#include "src/core/SkAAClip.h"
+#include "src/core/SkMask.h"
+#include "src/core/SkRasterClip.h"
+#include "tests/Test.h"
#include <string.h>
diff --git a/tests/AdvancedBlendTest.cpp b/tests/AdvancedBlendTest.cpp
index 3ff2a71..a008013 100644
--- a/tests/AdvancedBlendTest.cpp
+++ b/tests/AdvancedBlendTest.cpp
@@ -5,12 +5,12 @@
* found in the LICENSE file.
*/
-#include "Test.h"
+#include "tests/Test.h"
-#include "GrContextPriv.h"
-#include "GrPaint.h"
-#include "GrProcessorSet.h"
-#include "effects/GrCustomXfermode.h"
+#include "src/gpu/GrContextPriv.h"
+#include "src/gpu/GrPaint.h"
+#include "src/gpu/GrProcessorSet.h"
+#include "src/gpu/effects/GrCustomXfermode.h"
DEF_GPUTEST_FOR_RENDERING_CONTEXTS(AdvancedBlendTest, reporter, ctxInfo) {
static constexpr auto opaque = GrProcessorAnalysisColor::Opaque::kYes;
diff --git a/tests/AndroidCodecTest.cpp b/tests/AndroidCodecTest.cpp
index 748c50b..cdb8c5f 100644
--- a/tests/AndroidCodecTest.cpp
+++ b/tests/AndroidCodecTest.cpp
@@ -5,22 +5,22 @@
* found in the LICENSE file.
*/
-#include "Resources.h"
-#include "SkAndroidCodec.h"
-#include "SkBitmap.h"
-#include "SkCodec.h"
-#include "SkCodecImageGenerator.h"
-#include "SkColor.h"
-#include "SkData.h"
-#include "SkEncodedImageFormat.h"
-#include "SkImageGenerator.h"
-#include "SkImageInfo.h"
-#include "SkPixmapPriv.h"
-#include "SkRefCnt.h"
-#include "SkSize.h"
-#include "SkString.h"
-#include "SkTypes.h"
-#include "Test.h"
+#include "include/codec/SkAndroidCodec.h"
+#include "include/codec/SkCodec.h"
+#include "include/core/SkBitmap.h"
+#include "include/core/SkColor.h"
+#include "include/core/SkData.h"
+#include "include/core/SkEncodedImageFormat.h"
+#include "include/core/SkImageGenerator.h"
+#include "include/core/SkImageInfo.h"
+#include "include/core/SkRefCnt.h"
+#include "include/core/SkSize.h"
+#include "include/core/SkString.h"
+#include "include/core/SkTypes.h"
+#include "src/codec/SkCodecImageGenerator.h"
+#include "src/core/SkPixmapPriv.h"
+#include "tests/Test.h"
+#include "tools/Resources.h"
#include <algorithm>
#include <memory>
diff --git a/tests/AnimatedImageTest.cpp b/tests/AnimatedImageTest.cpp
index 93292d1..3382495 100644
--- a/tests/AnimatedImageTest.cpp
+++ b/tests/AnimatedImageTest.cpp
@@ -5,24 +5,24 @@
* found in the LICENSE file.
*/
-#include "CodecPriv.h"
-#include "Resources.h"
-#include "SkAndroidCodec.h"
-#include "SkAnimatedImage.h"
-#include "SkBitmap.h"
-#include "SkCanvas.h"
-#include "SkCodec.h"
-#include "SkColor.h"
-#include "SkData.h"
-#include "SkImageInfo.h"
-#include "SkPicture.h"
-#include "SkRefCnt.h"
-#include "SkSize.h"
-#include "SkString.h"
-#include "SkTypes.h"
-#include "SkUnPreMultiply.h"
-#include "Test.h"
-#include "ToolUtils.h"
+#include "include/android/SkAnimatedImage.h"
+#include "include/codec/SkAndroidCodec.h"
+#include "include/codec/SkCodec.h"
+#include "include/core/SkBitmap.h"
+#include "include/core/SkCanvas.h"
+#include "include/core/SkColor.h"
+#include "include/core/SkData.h"
+#include "include/core/SkImageInfo.h"
+#include "include/core/SkPicture.h"
+#include "include/core/SkRefCnt.h"
+#include "include/core/SkSize.h"
+#include "include/core/SkString.h"
+#include "include/core/SkTypes.h"
+#include "include/core/SkUnPreMultiply.h"
+#include "tests/CodecPriv.h"
+#include "tests/Test.h"
+#include "tools/Resources.h"
+#include "tools/ToolUtils.h"
#include <algorithm>
#include <memory>
diff --git a/tests/AnnotationTest.cpp b/tests/AnnotationTest.cpp
index aec85cd..d89541a 100644
--- a/tests/AnnotationTest.cpp
+++ b/tests/AnnotationTest.cpp
@@ -5,19 +5,19 @@
* found in the LICENSE file.
*/
-#include "SkAnnotation.h"
-#include "SkBitmap.h"
-#include "SkCanvas.h"
-#include "SkColor.h"
-#include "SkData.h"
-#include "SkPDFDocument.h"
-#include "SkPoint.h"
-#include "SkRect.h"
-#include "SkRefCnt.h"
-#include "SkScalar.h"
-#include "SkStream.h"
-#include "SkTypes.h"
-#include "Test.h"
+#include "include/core/SkAnnotation.h"
+#include "include/core/SkBitmap.h"
+#include "include/core/SkCanvas.h"
+#include "include/core/SkColor.h"
+#include "include/core/SkData.h"
+#include "include/core/SkPoint.h"
+#include "include/core/SkRect.h"
+#include "include/core/SkRefCnt.h"
+#include "include/core/SkScalar.h"
+#include "include/core/SkStream.h"
+#include "include/core/SkTypes.h"
+#include "include/docs/SkPDFDocument.h"
+#include "tests/Test.h"
#include <string.h>
#include <memory>
@@ -88,8 +88,8 @@
}
#if defined(SK_XML)
- #include "SkSVGCanvas.h"
- #include "SkXMLWriter.h"
+ #include "include/svg/SkSVGCanvas.h"
+ #include "src/xml/SkXMLWriter.h"
DEF_TEST(Annotation_SvgLink, reporter) {
SkDynamicMemoryWStream outStream;
diff --git a/tests/ApplyGammaTest.cpp b/tests/ApplyGammaTest.cpp
index 62d843a..76c6601 100644
--- a/tests/ApplyGammaTest.cpp
+++ b/tests/ApplyGammaTest.cpp
@@ -5,28 +5,28 @@
* found in the LICENSE file.
*/
-#include "SkTypes.h"
+#include "include/core/SkTypes.h"
-#include "GrCaps.h"
-#include "GrContext.h"
-#include "GrContextFactory.h"
-#include "GrContextPriv.h"
-#include "GrShaderCaps.h"
-#include "GrTypes.h"
-#include "SkBitmap.h"
-#include "SkBlendMode.h"
-#include "SkCanvas.h"
-#include "SkColor.h"
-#include "SkColorFilter.h"
-#include "SkColorPriv.h"
-#include "SkImageInfo.h"
-#include "SkPaint.h"
-#include "SkRefCnt.h"
-#include "SkScalar.h"
-#include "SkSurface.h"
-#include "SkTemplates.h"
-#include "SkUtils.h"
-#include "Test.h"
+#include "include/core/SkBitmap.h"
+#include "include/core/SkBlendMode.h"
+#include "include/core/SkCanvas.h"
+#include "include/core/SkColor.h"
+#include "include/core/SkColorFilter.h"
+#include "include/core/SkColorPriv.h"
+#include "include/core/SkImageInfo.h"
+#include "include/core/SkPaint.h"
+#include "include/core/SkRefCnt.h"
+#include "include/core/SkScalar.h"
+#include "include/core/SkSurface.h"
+#include "include/gpu/GrContext.h"
+#include "include/gpu/GrTypes.h"
+#include "include/private/SkTemplates.h"
+#include "src/core/SkUtils.h"
+#include "src/gpu/GrCaps.h"
+#include "src/gpu/GrContextPriv.h"
+#include "src/gpu/GrShaderCaps.h"
+#include "tests/Test.h"
+#include "tools/gpu/GrContextFactory.h"
#include <math.h>
diff --git a/tests/ArenaAllocTest.cpp b/tests/ArenaAllocTest.cpp
index adcdb55..b4a8d56 100644
--- a/tests/ArenaAllocTest.cpp
+++ b/tests/ArenaAllocTest.cpp
@@ -5,10 +5,10 @@
* found in the LICENSE file.
*/
-#include "SkArenaAlloc.h"
-#include "SkRefCnt.h"
-#include "SkTypes.h"
-#include "Test.h"
+#include "include/core/SkRefCnt.h"
+#include "include/core/SkTypes.h"
+#include "include/private/SkArenaAlloc.h"
+#include "tests/Test.h"
#include <memory>
#include <new>
diff --git a/tests/AsADashTest.cpp b/tests/AsADashTest.cpp
index b612f23..a7ecfd6 100644
--- a/tests/AsADashTest.cpp
+++ b/tests/AsADashTest.cpp
@@ -5,13 +5,13 @@
* found in the LICENSE file.
*/
-#include "SkCornerPathEffect.h"
-#include "SkDashPathEffect.h"
-#include "SkPathEffect.h"
-#include "SkRefCnt.h"
-#include "SkScalar.h"
-#include "SkTemplates.h"
-#include "Test.h"
+#include "include/core/SkPathEffect.h"
+#include "include/core/SkRefCnt.h"
+#include "include/core/SkScalar.h"
+#include "include/effects/SkCornerPathEffect.h"
+#include "include/effects/SkDashPathEffect.h"
+#include "include/private/SkTemplates.h"
+#include "tests/Test.h"
DEF_TEST(AsADashTest_noneDash, reporter) {
sk_sp<SkPathEffect> pe(SkCornerPathEffect::Make(1.0));
diff --git a/tests/BadIcoTest.cpp b/tests/BadIcoTest.cpp
index e549b86..7863084 100644
--- a/tests/BadIcoTest.cpp
+++ b/tests/BadIcoTest.cpp
@@ -5,14 +5,14 @@
* found in the LICENSE file.
*/
-#include "Resources.h"
-#include "SkBitmap.h"
-#include "SkCodec.h"
-#include "SkOSPath.h"
-#include "SkStream.h"
-#include "SkString.h"
-#include "SkTypes.h"
-#include "Test.h"
+#include "include/codec/SkCodec.h"
+#include "include/core/SkBitmap.h"
+#include "include/core/SkStream.h"
+#include "include/core/SkString.h"
+#include "include/core/SkTypes.h"
+#include "src/utils/SkOSPath.h"
+#include "tests/Test.h"
+#include "tools/Resources.h"
#include <memory>
#include <utility>
diff --git a/tests/BitSetTest.cpp b/tests/BitSetTest.cpp
index 3bbb074..c9105b0 100644
--- a/tests/BitSetTest.cpp
+++ b/tests/BitSetTest.cpp
@@ -5,8 +5,8 @@
* found in the LICENSE file.
*/
-#include "SkBitSet.h"
-#include "Test.h"
+#include "src/utils/SkBitSet.h"
+#include "tests/Test.h"
#include <vector>
diff --git a/tests/BitmapCopyTest.cpp b/tests/BitmapCopyTest.cpp
index 5b02491..0e3cef2 100644
--- a/tests/BitmapCopyTest.cpp
+++ b/tests/BitmapCopyTest.cpp
@@ -5,17 +5,17 @@
* found in the LICENSE file.
*/
-#include "SkBitmap.h"
-#include "SkColor.h"
-#include "SkColorSpace.h"
-#include "SkImageInfo.h"
-#include "SkPoint.h"
-#include "SkRect.h"
-#include "SkRefCnt.h"
-#include "SkSize.h"
-#include "SkTypes.h"
-#include "Test.h"
-#include "ToolUtils.h"
+#include "include/core/SkBitmap.h"
+#include "include/core/SkColor.h"
+#include "include/core/SkColorSpace.h"
+#include "include/core/SkImageInfo.h"
+#include "include/core/SkPoint.h"
+#include "include/core/SkRect.h"
+#include "include/core/SkRefCnt.h"
+#include "include/core/SkSize.h"
+#include "include/core/SkTypes.h"
+#include "tests/Test.h"
+#include "tools/ToolUtils.h"
static void init_src(const SkBitmap& bitmap) {
if (bitmap.getPixels()) {
@@ -128,8 +128,8 @@
}
}
-#include "SkColorPriv.h"
-#include "SkUtils.h"
+#include "include/core/SkColorPriv.h"
+#include "src/core/SkUtils.h"
/**
* Construct 4x4 pixels where we can look at a color and determine where it should be in the grid.
diff --git a/tests/BitmapGetColorTest.cpp b/tests/BitmapGetColorTest.cpp
index 89c8ecb..c27cb2f 100644
--- a/tests/BitmapGetColorTest.cpp
+++ b/tests/BitmapGetColorTest.cpp
@@ -5,12 +5,12 @@
* found in the LICENSE file.
*/
-#include "SkBitmap.h"
-#include "SkColor.h"
-#include "SkImageInfo.h"
-#include "SkRect.h"
-#include "SkTypes.h"
-#include "Test.h"
+#include "include/core/SkBitmap.h"
+#include "include/core/SkColor.h"
+#include "include/core/SkImageInfo.h"
+#include "include/core/SkRect.h"
+#include "include/core/SkTypes.h"
+#include "tests/Test.h"
DEF_TEST(GetColor, reporter) {
static const struct Rec {
diff --git a/tests/BitmapTest.cpp b/tests/BitmapTest.cpp
index be5b972..d859a6c 100644
--- a/tests/BitmapTest.cpp
+++ b/tests/BitmapTest.cpp
@@ -5,17 +5,17 @@
* found in the LICENSE file.
*/
-#include "SkBitmap.h"
-#include "SkColor.h"
-#include "SkImageInfo.h"
-#include "SkMallocPixelRef.h"
-#include "SkPixelRef.h"
-#include "SkPixmap.h"
-#include "SkRandom.h"
-#include "SkRefCnt.h"
-#include "SkTypes.h"
-#include "Test.h"
-#include "ToolUtils.h"
+#include "include/core/SkBitmap.h"
+#include "include/core/SkColor.h"
+#include "include/core/SkImageInfo.h"
+#include "include/core/SkMallocPixelRef.h"
+#include "include/core/SkPixelRef.h"
+#include "include/core/SkPixmap.h"
+#include "include/core/SkRefCnt.h"
+#include "include/core/SkTypes.h"
+#include "include/utils/SkRandom.h"
+#include "tests/Test.h"
+#include "tools/ToolUtils.h"
static void test_peekpixels(skiatest::Reporter* reporter) {
const SkImageInfo info = SkImageInfo::MakeN32Premul(10, 10);
diff --git a/tests/BlendTest.cpp b/tests/BlendTest.cpp
index 8e52c25..fe701ee 100644
--- a/tests/BlendTest.cpp
+++ b/tests/BlendTest.cpp
@@ -5,27 +5,27 @@
* found in the LICENSE file.
*/
-#include "SkBitmap.h"
-#include "SkBlendMode.h"
-#include "SkCanvas.h"
-#include "SkColor.h"
-#include "SkColorSpace.h"
-#include "SkImageInfo.h"
-#include "SkPaint.h"
-#include "SkPoint.h"
-#include "SkRect.h"
-#include "SkRefCnt.h"
-#include "SkSurface.h"
-#include "SkTypes.h"
-#include "Test.h"
+#include "include/core/SkBitmap.h"
+#include "include/core/SkBlendMode.h"
+#include "include/core/SkCanvas.h"
+#include "include/core/SkColor.h"
+#include "include/core/SkColorSpace.h"
+#include "include/core/SkImageInfo.h"
+#include "include/core/SkPaint.h"
+#include "include/core/SkPoint.h"
+#include "include/core/SkRect.h"
+#include "include/core/SkRefCnt.h"
+#include "include/core/SkSurface.h"
+#include "include/core/SkTypes.h"
+#include "tests/Test.h"
-#include "GrBackendSurface.h"
-#include "GrContext.h"
-#include "GrContextFactory.h"
-#include "GrContextPriv.h"
-#include "GrResourceProvider.h"
-#include "GrTexture.h"
-#include "GrTypes.h"
+#include "include/gpu/GrBackendSurface.h"
+#include "include/gpu/GrContext.h"
+#include "include/gpu/GrTexture.h"
+#include "include/gpu/GrTypes.h"
+#include "src/gpu/GrContextPriv.h"
+#include "src/gpu/GrResourceProvider.h"
+#include "tools/gpu/GrContextFactory.h"
#include <vector>
diff --git a/tests/BlitMaskClip.cpp b/tests/BlitMaskClip.cpp
index 240a0cf..967b1b4 100644
--- a/tests/BlitMaskClip.cpp
+++ b/tests/BlitMaskClip.cpp
@@ -5,12 +5,12 @@
* found in the LICENSE file.
*/
-#include "SkBlitter.h"
-#include "SkColor.h"
-#include "SkMask.h"
-#include "SkRect.h"
-#include "SkTypes.h"
-#include "Test.h"
+#include "include/core/SkColor.h"
+#include "include/core/SkRect.h"
+#include "include/core/SkTypes.h"
+#include "src/core/SkBlitter.h"
+#include "src/core/SkMask.h"
+#include "tests/Test.h"
#include <string.h>
diff --git a/tests/BlurTest.cpp b/tests/BlurTest.cpp
index 40a911a..c066085 100644
--- a/tests/BlurTest.cpp
+++ b/tests/BlurTest.cpp
@@ -5,42 +5,42 @@
* found in the LICENSE file.
*/
-#include "SkBitmap.h"
-#include "SkBlendMode.h"
-#include "SkBlurDrawLooper.h"
-#include "SkBlurMask.h"
-#include "SkBlurPriv.h"
-#include "SkBlurTypes.h"
-#include "SkCanvas.h"
-#include "SkColor.h"
-#include "SkColorPriv.h"
-#include "SkDrawLooper.h"
-#include "SkEmbossMaskFilter.h"
-#include "SkFloatBits.h"
-#include "SkImageInfo.h"
-#include "SkLayerDrawLooper.h"
-#include "SkMask.h"
-#include "SkMaskFilter.h"
-#include "SkMaskFilterBase.h"
-#include "SkMath.h"
-#include "SkMathPriv.h"
-#include "SkPaint.h"
-#include "SkPath.h"
-#include "SkPerlinNoiseShader.h"
-#include "SkPixmap.h"
-#include "SkPoint.h"
-#include "SkRRect.h"
-#include "SkRectPriv.h"
-#include "SkRefCnt.h"
-#include "SkScalar.h"
-#include "SkShader.h"
-#include "SkSize.h"
-#include "SkSurface.h"
-#include "SkTypes.h"
-#include "Test.h"
-#include "ToolUtils.h"
+#include "include/core/SkBitmap.h"
+#include "include/core/SkBlendMode.h"
+#include "include/core/SkBlurTypes.h"
+#include "include/core/SkCanvas.h"
+#include "include/core/SkColor.h"
+#include "include/core/SkColorPriv.h"
+#include "include/core/SkDrawLooper.h"
+#include "include/core/SkImageInfo.h"
+#include "include/core/SkMaskFilter.h"
+#include "include/core/SkMath.h"
+#include "include/core/SkPaint.h"
+#include "include/core/SkPath.h"
+#include "include/core/SkPixmap.h"
+#include "include/core/SkPoint.h"
+#include "include/core/SkRRect.h"
+#include "include/core/SkRefCnt.h"
+#include "include/core/SkScalar.h"
+#include "include/core/SkShader.h"
+#include "include/core/SkSize.h"
+#include "include/core/SkSurface.h"
+#include "include/core/SkTypes.h"
+#include "include/effects/SkBlurDrawLooper.h"
+#include "include/effects/SkLayerDrawLooper.h"
+#include "include/effects/SkPerlinNoiseShader.h"
+#include "include/private/SkFloatBits.h"
+#include "src/core/SkBlurMask.h"
+#include "src/core/SkBlurPriv.h"
+#include "src/core/SkMask.h"
+#include "src/core/SkMaskFilterBase.h"
+#include "src/core/SkMathPriv.h"
+#include "src/core/SkRectPriv.h"
+#include "src/effects/SkEmbossMaskFilter.h"
+#include "tests/Test.h"
+#include "tools/ToolUtils.h"
-#include "GrContextFactory.h"
+#include "tools/gpu/GrContextFactory.h"
#include <math.h>
#include <string.h>
diff --git a/tests/CTest.cpp b/tests/CTest.cpp
index cd9522f..884e1b9 100644
--- a/tests/CTest.cpp
+++ b/tests/CTest.cpp
@@ -5,13 +5,13 @@
* found in the LICENSE file.
*/
-#include "Test.h"
-#include "sk_canvas.h"
-#include "sk_imageinfo.h"
-#include "sk_paint.h"
-#include "sk_shader.h"
-#include "sk_surface.h"
-#include "sk_types.h"
+#include "include/c/sk_canvas.h"
+#include "include/c/sk_imageinfo.h"
+#include "include/c/sk_paint.h"
+#include "include/c/sk_shader.h"
+#include "include/c/sk_surface.h"
+#include "include/c/sk_types.h"
+#include "tests/Test.h"
#include <stdint.h>
diff --git a/tests/CachedDataTest.cpp b/tests/CachedDataTest.cpp
index efb4d71..856b83c 100644
--- a/tests/CachedDataTest.cpp
+++ b/tests/CachedDataTest.cpp
@@ -5,12 +5,12 @@
* found in the LICENSE file.
*/
-#include "SkCachedData.h"
-#include "SkDiscardableMemoryPool.h"
-#include "SkMalloc.h"
-#include "SkRefCnt.h"
-#include "SkTypes.h"
-#include "Test.h"
+#include "include/core/SkRefCnt.h"
+#include "include/core/SkTypes.h"
+#include "include/private/SkMalloc.h"
+#include "src/core/SkCachedData.h"
+#include "src/lazy/SkDiscardableMemoryPool.h"
+#include "tests/Test.h"
#include <cstring>
diff --git a/tests/CachedDecodingPixelRefTest.cpp b/tests/CachedDecodingPixelRefTest.cpp
index a09fe62..f4fa442 100644
--- a/tests/CachedDecodingPixelRefTest.cpp
+++ b/tests/CachedDecodingPixelRefTest.cpp
@@ -5,19 +5,19 @@
* found in the LICENSE file.
*/
-#include "SkBitmap.h"
-#include "SkCanvas.h"
-#include "SkColor.h"
-#include "SkColorData.h"
-#include "SkImage.h"
-#include "SkImageGenerator.h"
-#include "SkImageInfo.h"
-#include "SkMakeUnique.h"
-#include "SkRefCnt.h"
-#include "SkTypes.h"
-#include "SkUtils.h"
-#include "Test.h"
-#include "ToolUtils.h"
+#include "include/core/SkBitmap.h"
+#include "include/core/SkCanvas.h"
+#include "include/core/SkColor.h"
+#include "include/core/SkImage.h"
+#include "include/core/SkImageGenerator.h"
+#include "include/core/SkImageInfo.h"
+#include "include/core/SkRefCnt.h"
+#include "include/core/SkTypes.h"
+#include "include/private/SkColorData.h"
+#include "src/core/SkMakeUnique.h"
+#include "src/core/SkUtils.h"
+#include "tests/Test.h"
+#include "tools/ToolUtils.h"
#include <utility>
diff --git a/tests/CanvasStateHelpers.cpp b/tests/CanvasStateHelpers.cpp
index e84615d..95d35fb 100644
--- a/tests/CanvasStateHelpers.cpp
+++ b/tests/CanvasStateHelpers.cpp
@@ -5,17 +5,17 @@
* found in the LICENSE file.
*/
-#include "SkTypes.h"
+#include "include/core/SkTypes.h"
#ifdef SK_SUPPORT_LEGACY_CLIPTOLAYERFLAG
-#include "CanvasStateHelpers.h"
-#include "SkCanvas.h"
-#include "SkCanvasStateUtils.h"
-#include "SkClipOp.h"
-#include "SkColor.h"
-#include "SkPaint.h"
-#include "SkRect.h"
-#include "SkRegion.h"
-#include "SkScalar.h"
+#include "include/core/SkCanvas.h"
+#include "include/core/SkClipOp.h"
+#include "include/core/SkColor.h"
+#include "include/core/SkPaint.h"
+#include "include/core/SkRect.h"
+#include "include/core/SkRegion.h"
+#include "include/core/SkScalar.h"
+#include "include/utils/SkCanvasStateUtils.h"
+#include "tests/CanvasStateHelpers.h"
#include <memory>
diff --git a/tests/CanvasStateHelpers.h b/tests/CanvasStateHelpers.h
index aa3c178..c02d9ec 100644
--- a/tests/CanvasStateHelpers.h
+++ b/tests/CanvasStateHelpers.h
@@ -8,7 +8,7 @@
#ifndef CanvasStateHelpers_DEFINED
#define CanvasStateHelpers_DEFINED
-#include "SkTypes.h"
+#include "include/core/SkTypes.h"
#ifdef SK_SUPPORT_LEGACY_CLIPTOLAYERFLAG
class SkCanvas;
diff --git a/tests/CanvasStateTest.cpp b/tests/CanvasStateTest.cpp
index f4ed5a4..7c2c798 100644
--- a/tests/CanvasStateTest.cpp
+++ b/tests/CanvasStateTest.cpp
@@ -5,23 +5,23 @@
* found in the LICENSE file.
*/
-#include "CanvasStateHelpers.h"
-#include "CommandLineFlags.h"
-#include "SkBitmap.h"
-#include "SkCanvasPriv.h"
-#include "SkCanvasStateUtils.h"
-#include "SkClipOpPriv.h"
-#include "SkColor.h"
-#include "SkImageInfo.h"
-#include "SkPaint.h"
-#include "SkRRect.h"
-#include "SkRect.h"
-#include "SkRegion.h"
-#include "SkScalar.h"
-#include "SkTDArray.h"
-#include "SkTLazy.h"
-#include "SkTypes.h"
-#include "Test.h"
+#include "include/core/SkBitmap.h"
+#include "include/core/SkColor.h"
+#include "include/core/SkImageInfo.h"
+#include "include/core/SkPaint.h"
+#include "include/core/SkRRect.h"
+#include "include/core/SkRect.h"
+#include "include/core/SkRegion.h"
+#include "include/core/SkScalar.h"
+#include "include/core/SkTypes.h"
+#include "include/private/SkTDArray.h"
+#include "include/utils/SkCanvasStateUtils.h"
+#include "src/core/SkCanvasPriv.h"
+#include "src/core/SkClipOpPriv.h"
+#include "src/core/SkTLazy.h"
+#include "tests/CanvasStateHelpers.h"
+#include "tests/Test.h"
+#include "tools/flags/CommandLineFlags.h"
#include <cstring>
#include <memory>
diff --git a/tests/CanvasTest.cpp b/tests/CanvasTest.cpp
index f66f163..986f124 100644
--- a/tests/CanvasTest.cpp
+++ b/tests/CanvasTest.cpp
@@ -45,44 +45,44 @@
* that the invoked method returns a non-zero value.
*/
-#include "SkBitmap.h"
-#include "SkBlendMode.h"
-#include "SkCanvas.h"
-#include "SkCanvasStack.h"
-#include "SkClipOp.h"
-#include "SkClipOpPriv.h"
-#include "SkColor.h"
-#include "SkImageFilter.h"
-#include "SkImageInfo.h"
-#include "SkMalloc.h"
-#include "SkMatrix.h"
-#include "SkNWayCanvas.h"
-#include "SkPDFDocument.h"
-#include "SkPaint.h"
-#include "SkPaintFilterCanvas.h"
-#include "SkPath.h"
-#include "SkPictureRecorder.h"
-#include "SkPixmap.h"
-#include "SkPoint.h"
-#include "SkRect.h"
-#include "SkRefCnt.h"
-#include "SkRegion.h"
-#include "SkScalar.h"
-#include "SkShader.h"
-#include "SkSize.h"
-#include "SkSpecialImage.h"
-#include "SkStream.h"
-#include "SkString.h"
-#include "SkSurface.h"
-#include "SkTDArray.h"
-#include "SkTemplates.h"
-#include "SkTypes.h"
-#include "SkVertices.h"
-#include "Test.h"
+#include "include/core/SkBitmap.h"
+#include "include/core/SkBlendMode.h"
+#include "include/core/SkCanvas.h"
+#include "include/core/SkClipOp.h"
+#include "include/core/SkColor.h"
+#include "include/core/SkImageFilter.h"
+#include "include/core/SkImageInfo.h"
+#include "include/core/SkMatrix.h"
+#include "include/core/SkPaint.h"
+#include "include/core/SkPath.h"
+#include "include/core/SkPictureRecorder.h"
+#include "include/core/SkPixmap.h"
+#include "include/core/SkPoint.h"
+#include "include/core/SkRect.h"
+#include "include/core/SkRefCnt.h"
+#include "include/core/SkRegion.h"
+#include "include/core/SkScalar.h"
+#include "include/core/SkShader.h"
+#include "include/core/SkSize.h"
+#include "include/core/SkStream.h"
+#include "include/core/SkString.h"
+#include "include/core/SkSurface.h"
+#include "include/core/SkTypes.h"
+#include "include/core/SkVertices.h"
+#include "include/docs/SkPDFDocument.h"
+#include "include/private/SkMalloc.h"
+#include "include/private/SkTDArray.h"
+#include "include/private/SkTemplates.h"
+#include "include/utils/SkNWayCanvas.h"
+#include "include/utils/SkPaintFilterCanvas.h"
+#include "src/core/SkClipOpPriv.h"
+#include "src/core/SkSpecialImage.h"
+#include "src/utils/SkCanvasStack.h"
+#include "tests/Test.h"
#ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK
-#include "SkColorData.h"
-#include "SkColorSpace.h"
+#include "include/core/SkColorSpace.h"
+#include "include/private/SkColorData.h"
#endif
#include <memory>
@@ -869,7 +869,7 @@
canvas.restore();
}
-#include "SkPaintImageFilter.h"
+#include "include/effects/SkPaintImageFilter.h"
// Test that we don't crash/assert when building a canvas with degenerate coordintes
// (esp. big ones, that might invoke tiling).
@@ -890,7 +890,7 @@
}
}
-#include "SkBlurImageFilter.h"
+#include "include/effects/SkBlurImageFilter.h"
DEF_TEST(Canvas_ClippedOutImageFilter, reporter) {
SkCanvas canvas(100, 100);
diff --git a/tests/ChecksumTest.cpp b/tests/ChecksumTest.cpp
index 6a92ed6..ecea56c 100644
--- a/tests/ChecksumTest.cpp
+++ b/tests/ChecksumTest.cpp
@@ -5,11 +5,11 @@
* found in the LICENSE file.
*/
-#include "SkChecksum.h"
-#include "SkOpts.h"
-#include "SkRandom.h"
-#include "SkTypes.h"
-#include "Test.h"
+#include "include/core/SkTypes.h"
+#include "include/private/SkChecksum.h"
+#include "include/utils/SkRandom.h"
+#include "src/core/SkOpts.h"
+#include "tests/Test.h"
DEF_TEST(Checksum, r) {
// Put 128 random bytes into two identical buffers. Any multiple of 4 will do.
diff --git a/tests/ClearTest.cpp b/tests/ClearTest.cpp
index 03bfc58..3209609 100644
--- a/tests/ClearTest.cpp
+++ b/tests/ClearTest.cpp
@@ -5,25 +5,25 @@
* found in the LICENSE file.
*/
-#include "SkTypes.h"
+#include "include/core/SkTypes.h"
-#include "GrColor.h"
-#include "GrContext.h"
-#include "GrContextFactory.h"
-#include "GrContextOptions.h"
-#include "GrContextPriv.h"
-#include "GrRenderTargetContext.h"
-#include "GrTypes.h"
-#include "SkBitmap.h"
-#include "SkCanvas.h"
-#include "SkColor.h"
-#include "SkColorSpace.h"
-#include "SkImageInfo.h"
-#include "SkPaint.h"
-#include "SkRect.h"
-#include "SkRefCnt.h"
-#include "SkSurface.h"
-#include "Test.h"
+#include "include/core/SkBitmap.h"
+#include "include/core/SkCanvas.h"
+#include "include/core/SkColor.h"
+#include "include/core/SkColorSpace.h"
+#include "include/core/SkImageInfo.h"
+#include "include/core/SkPaint.h"
+#include "include/core/SkRect.h"
+#include "include/core/SkRefCnt.h"
+#include "include/core/SkSurface.h"
+#include "include/gpu/GrContext.h"
+#include "include/gpu/GrContextOptions.h"
+#include "include/gpu/GrTypes.h"
+#include "include/private/GrColor.h"
+#include "src/gpu/GrContextPriv.h"
+#include "src/gpu/GrRenderTargetContext.h"
+#include "tests/Test.h"
+#include "tools/gpu/GrContextFactory.h"
#include <cstring>
#include <memory>
diff --git a/tests/ClipBoundsTest.cpp b/tests/ClipBoundsTest.cpp
index 32b17ad..ca1cb3e 100644
--- a/tests/ClipBoundsTest.cpp
+++ b/tests/ClipBoundsTest.cpp
@@ -5,14 +5,14 @@
* found in the LICENSE file.
*/
-#include "SkTypes.h"
+#include "include/core/SkTypes.h"
-#include "GrClipStackClip.h"
-#include "SkClipOpPriv.h"
-#include "SkClipStack.h"
-#include "SkMatrix.h"
-#include "SkRect.h"
-#include "Test.h"
+#include "include/core/SkMatrix.h"
+#include "include/core/SkRect.h"
+#include "src/core/SkClipOpPriv.h"
+#include "src/core/SkClipStack.h"
+#include "src/gpu/GrClipStackClip.h"
+#include "tests/Test.h"
// Ensure that the 'getConservativeBounds' calls are returning bounds clamped
// to the render target
diff --git a/tests/ClipCubicTest.cpp b/tests/ClipCubicTest.cpp
index ca2f623..342f2cc 100644
--- a/tests/ClipCubicTest.cpp
+++ b/tests/ClipCubicTest.cpp
@@ -5,20 +5,20 @@
* found in the LICENSE file.
*/
-#include "SkBitmap.h"
-#include "SkCanvas.h"
-#include "SkColor.h"
-#include "SkCubicClipper.h"
-#include "SkFloatBits.h"
-#include "SkPaint.h"
-#include "SkPath.h"
-#include "SkPoint.h"
-#include "SkRect.h"
-#include "SkRefCnt.h"
-#include "SkScalar.h"
-#include "SkSurface.h"
-#include "SkTypes.h"
-#include "Test.h"
+#include "include/core/SkBitmap.h"
+#include "include/core/SkCanvas.h"
+#include "include/core/SkColor.h"
+#include "include/core/SkPaint.h"
+#include "include/core/SkPath.h"
+#include "include/core/SkPoint.h"
+#include "include/core/SkRect.h"
+#include "include/core/SkRefCnt.h"
+#include "include/core/SkScalar.h"
+#include "include/core/SkSurface.h"
+#include "include/core/SkTypes.h"
+#include "include/private/SkFloatBits.h"
+#include "src/core/SkCubicClipper.h"
+#include "tests/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
@@ -171,7 +171,7 @@
test_giantClip();
}
-#include "SkSurface.h"
+#include "include/core/SkSurface.h"
DEF_TEST(test_fuzz_crbug_698714, reporter) {
auto surface(SkSurface::MakeRasterN32Premul(500, 500));
diff --git a/tests/ClipStackTest.cpp b/tests/ClipStackTest.cpp
index c95bdc7..1bd1007 100644
--- a/tests/ClipStackTest.cpp
+++ b/tests/ClipStackTest.cpp
@@ -5,40 +5,40 @@
* found in the LICENSE file.
*/
-#include "SkCanvas.h"
-#include "SkClipOp.h"
-#include "SkClipOpPriv.h"
-#include "SkClipStack.h"
-#include "SkImageInfo.h"
-#include "SkMatrix.h"
-#include "SkPath.h"
-#include "SkPoint.h"
-#include "SkRRect.h"
-#include "SkRandom.h"
-#include "SkRect.h"
-#include "SkRefCnt.h"
-#include "SkRegion.h"
-#include "SkScalar.h"
-#include "SkSize.h"
-#include "SkString.h"
-#include "SkSurface.h"
-#include "SkTemplates.h"
-#include "SkTypes.h"
-#include "Test.h"
+#include "include/core/SkCanvas.h"
+#include "include/core/SkClipOp.h"
+#include "include/core/SkImageInfo.h"
+#include "include/core/SkMatrix.h"
+#include "include/core/SkPath.h"
+#include "include/core/SkPoint.h"
+#include "include/core/SkRRect.h"
+#include "include/core/SkRect.h"
+#include "include/core/SkRefCnt.h"
+#include "include/core/SkRegion.h"
+#include "include/core/SkScalar.h"
+#include "include/core/SkSize.h"
+#include "include/core/SkString.h"
+#include "include/core/SkSurface.h"
+#include "include/core/SkTypes.h"
+#include "include/private/SkTemplates.h"
+#include "include/utils/SkRandom.h"
+#include "src/core/SkClipOpPriv.h"
+#include "src/core/SkClipStack.h"
+#include "tests/Test.h"
-#include "GrCaps.h"
-#include "GrClip.h"
-#include "GrClipStackClip.h"
-#include "GrConfig.h"
-#include "GrContext.h"
-#include "GrContextFactory.h"
-#include "GrContextPriv.h"
-#include "GrReducedClip.h"
-#include "GrResourceCache.h"
-#include "GrResourceKey.h"
-#include "GrSurfaceProxyPriv.h"
-#include "GrTexture.h"
-#include "GrTextureProxy.h"
+#include "include/gpu/GrConfig.h"
+#include "include/gpu/GrContext.h"
+#include "include/gpu/GrTexture.h"
+#include "include/private/GrResourceKey.h"
+#include "include/private/GrTextureProxy.h"
+#include "src/gpu/GrCaps.h"
+#include "src/gpu/GrClip.h"
+#include "src/gpu/GrClipStackClip.h"
+#include "src/gpu/GrContextPriv.h"
+#include "src/gpu/GrReducedClip.h"
+#include "src/gpu/GrResourceCache.h"
+#include "src/gpu/GrSurfaceProxyPriv.h"
+#include "tools/gpu/GrContextFactory.h"
typedef GrReducedClip::ElementList ElementList;
typedef GrReducedClip::InitialState InitialState;
diff --git a/tests/ClipperTest.cpp b/tests/ClipperTest.cpp
index 3cebd78..efedad8 100644
--- a/tests/ClipperTest.cpp
+++ b/tests/ClipperTest.cpp
@@ -5,17 +5,17 @@
* found in the LICENSE file.
*/
-#include "SkBitmap.h"
-#include "SkCanvas.h"
-#include "SkColor.h"
-#include "SkEdgeClipper.h"
-#include "SkLineClipper.h"
-#include "SkPaint.h"
-#include "SkPoint.h"
-#include "SkRect.h"
-#include "SkScalar.h"
-#include "SkTypes.h"
-#include "Test.h"
+#include "include/core/SkBitmap.h"
+#include "include/core/SkCanvas.h"
+#include "include/core/SkColor.h"
+#include "include/core/SkPaint.h"
+#include "include/core/SkPoint.h"
+#include "include/core/SkRect.h"
+#include "include/core/SkScalar.h"
+#include "include/core/SkTypes.h"
+#include "src/core/SkEdgeClipper.h"
+#include "src/core/SkLineClipper.h"
+#include "tests/Test.h"
#include <cstring>
@@ -157,7 +157,7 @@
test_hairclipping(reporter);
}
-#include "SkLineClipper.h"
+#include "src/core/SkLineClipper.h"
DEF_TEST(LineClipper_skbug_7981, r) {
SkPoint src[] = {{ -5.77698802E+17f, -1.81758057E+23f}, {38127, 2}};
diff --git a/tests/CodecAnimTest.cpp b/tests/CodecAnimTest.cpp
index ec4ca18..96915f5 100644
--- a/tests/CodecAnimTest.cpp
+++ b/tests/CodecAnimTest.cpp
@@ -5,22 +5,22 @@
* found in the LICENSE file.
*/
-#include "CodecPriv.h"
-#include "Resources.h"
-#include "SkAndroidCodec.h"
-#include "SkAnimCodecPlayer.h"
-#include "SkBitmap.h"
-#include "SkCodec.h"
-#include "SkCodecAnimation.h"
-#include "SkData.h"
-#include "SkImageInfo.h"
-#include "SkMakeUnique.h"
-#include "SkRefCnt.h"
-#include "SkSize.h"
-#include "SkString.h"
-#include "SkTypes.h"
-#include "Test.h"
-#include "ToolUtils.h"
+#include "include/codec/SkAndroidCodec.h"
+#include "include/codec/SkCodec.h"
+#include "include/codec/SkCodecAnimation.h"
+#include "include/core/SkBitmap.h"
+#include "include/core/SkData.h"
+#include "include/core/SkImageInfo.h"
+#include "include/core/SkRefCnt.h"
+#include "include/core/SkSize.h"
+#include "include/core/SkString.h"
+#include "include/core/SkTypes.h"
+#include "include/utils/SkAnimCodecPlayer.h"
+#include "src/core/SkMakeUnique.h"
+#include "tests/CodecPriv.h"
+#include "tests/Test.h"
+#include "tools/Resources.h"
+#include "tools/ToolUtils.h"
#include <cstring>
#include <memory>
diff --git a/tests/CodecExactReadTest.cpp b/tests/CodecExactReadTest.cpp
index 86702a1..f4cac6f 100644
--- a/tests/CodecExactReadTest.cpp
+++ b/tests/CodecExactReadTest.cpp
@@ -5,16 +5,16 @@
* found in the LICENSE file.
*/
-#include "Resources.h"
-#include "SkBitmap.h"
-#include "SkCodec.h"
-#include "SkData.h"
-#include "SkImageInfo.h"
-#include "SkMakeUnique.h"
-#include "SkRefCnt.h"
-#include "SkStream.h"
-#include "SkTemplates.h"
-#include "Test.h"
+#include "include/codec/SkCodec.h"
+#include "include/core/SkBitmap.h"
+#include "include/core/SkData.h"
+#include "include/core/SkImageInfo.h"
+#include "include/core/SkRefCnt.h"
+#include "include/core/SkStream.h"
+#include "include/private/SkTemplates.h"
+#include "src/core/SkMakeUnique.h"
+#include "tests/Test.h"
+#include "tools/Resources.h"
#include <cstring>
#include <memory>
diff --git a/tests/CodecPartialTest.cpp b/tests/CodecPartialTest.cpp
index 84bc03e..f1c5437 100644
--- a/tests/CodecPartialTest.cpp
+++ b/tests/CodecPartialTest.cpp
@@ -5,18 +5,18 @@
* found in the LICENSE file.
*/
-#include "CodecPriv.h"
-#include "FakeStreams.h"
-#include "Resources.h"
-#include "SkBitmap.h"
-#include "SkCodec.h"
-#include "SkData.h"
-#include "SkImageInfo.h"
-#include "SkMakeUnique.h"
-#include "SkRefCnt.h"
-#include "SkStream.h"
-#include "SkTypes.h"
-#include "Test.h"
+#include "include/codec/SkCodec.h"
+#include "include/core/SkBitmap.h"
+#include "include/core/SkData.h"
+#include "include/core/SkImageInfo.h"
+#include "include/core/SkRefCnt.h"
+#include "include/core/SkStream.h"
+#include "include/core/SkTypes.h"
+#include "src/core/SkMakeUnique.h"
+#include "tests/CodecPriv.h"
+#include "tests/FakeStreams.h"
+#include "tests/Test.h"
+#include "tools/Resources.h"
#include <cstring>
#include <memory>
diff --git a/tests/CodecPriv.h b/tests/CodecPriv.h
index d4457b9..b36f0eb 100644
--- a/tests/CodecPriv.h
+++ b/tests/CodecPriv.h
@@ -7,14 +7,14 @@
#ifndef CodecPriv_DEFINED
#define CodecPriv_DEFINED
-#include "CommandLineFlags.h"
-#include "SkBitmap.h"
-#include "SkCodec.h"
-#include "SkData.h"
-#include "SkEncodedImageFormat.h"
-#include "SkImageEncoder.h"
-#include "SkOSPath.h"
-#include "SkStream.h"
+#include "include/codec/SkCodec.h"
+#include "include/core/SkBitmap.h"
+#include "include/core/SkData.h"
+#include "include/core/SkEncodedImageFormat.h"
+#include "include/core/SkImageEncoder.h"
+#include "include/core/SkStream.h"
+#include "src/utils/SkOSPath.h"
+#include "tools/flags/CommandLineFlags.h"
static DEFINE_string(codecWritePath, "",
"Dump image decodes from codec unit tests here.");
diff --git a/tests/CodecRecommendedTypeTest.cpp b/tests/CodecRecommendedTypeTest.cpp
index 53b6427..e041c7e 100644
--- a/tests/CodecRecommendedTypeTest.cpp
+++ b/tests/CodecRecommendedTypeTest.cpp
@@ -5,16 +5,16 @@
* found in the LICENSE file.
*/
-#include "SkAndroidCodec.h"
-#include "SkBitmap.h"
-#include "SkColor.h"
-#include "SkColorSpace.h"
-#include "SkData.h"
-#include "SkEncodedImageFormat.h"
-#include "SkImageEncoder.h"
-#include "SkImageInfo.h"
-#include "SkStream.h"
-#include "Test.h"
+#include "include/codec/SkAndroidCodec.h"
+#include "include/core/SkBitmap.h"
+#include "include/core/SkColor.h"
+#include "include/core/SkColorSpace.h"
+#include "include/core/SkData.h"
+#include "include/core/SkEncodedImageFormat.h"
+#include "include/core/SkImageEncoder.h"
+#include "include/core/SkImageInfo.h"
+#include "include/core/SkStream.h"
+#include "tests/Test.h"
#include <memory>
#include <utility>
diff --git a/tests/CodecTest.cpp b/tests/CodecTest.cpp
index 2be8b20..78e9e4b 100644
--- a/tests/CodecTest.cpp
+++ b/tests/CodecTest.cpp
@@ -5,43 +5,43 @@
* found in the LICENSE file.
*/
-#include "FakeStreams.h"
-#include "Resources.h"
-#include "SkAndroidCodec.h"
-#include "SkAutoMalloc.h"
-#include "SkBitmap.h"
-#include "SkCanvas.h"
-#include "SkCodec.h"
-#include "SkCodecImageGenerator.h"
-#include "SkColor.h"
-#include "SkColorSpace.h"
-#include "SkColorSpacePriv.h"
-#include "SkData.h"
-#include "SkEncodedImageFormat.h"
-#include "SkFrontBufferedStream.h"
-#include "SkImage.h"
-#include "SkImageGenerator.h"
-#include "SkImageInfo.h"
-#include "SkJpegEncoder.h"
-#include "SkMD5.h"
-#include "SkMakeUnique.h"
-#include "SkMalloc.h"
-#include "SkPixmap.h"
-#include "SkPngChunkReader.h"
-#include "SkPngEncoder.h"
-#include "SkRandom.h"
-#include "SkRect.h"
-#include "SkRefCnt.h"
-#include "SkSize.h"
-#include "SkStream.h"
-#include "SkStreamPriv.h"
-#include "SkString.h"
-#include "SkTemplates.h"
-#include "SkTypes.h"
-#include "SkUnPreMultiply.h"
-#include "SkWebpEncoder.h"
-#include "Test.h"
-#include "ToolUtils.h"
+#include "include/codec/SkAndroidCodec.h"
+#include "include/codec/SkCodec.h"
+#include "include/core/SkBitmap.h"
+#include "include/core/SkCanvas.h"
+#include "include/core/SkColor.h"
+#include "include/core/SkColorSpace.h"
+#include "include/core/SkData.h"
+#include "include/core/SkEncodedImageFormat.h"
+#include "include/core/SkImage.h"
+#include "include/core/SkImageGenerator.h"
+#include "include/core/SkImageInfo.h"
+#include "include/core/SkPixmap.h"
+#include "include/core/SkPngChunkReader.h"
+#include "include/core/SkRect.h"
+#include "include/core/SkRefCnt.h"
+#include "include/core/SkSize.h"
+#include "include/core/SkStream.h"
+#include "include/core/SkString.h"
+#include "include/core/SkTypes.h"
+#include "include/core/SkUnPreMultiply.h"
+#include "include/encode/SkJpegEncoder.h"
+#include "include/encode/SkPngEncoder.h"
+#include "include/encode/SkWebpEncoder.h"
+#include "include/private/SkMalloc.h"
+#include "include/private/SkTemplates.h"
+#include "include/utils/SkFrontBufferedStream.h"
+#include "include/utils/SkRandom.h"
+#include "src/codec/SkCodecImageGenerator.h"
+#include "src/core/SkAutoMalloc.h"
+#include "src/core/SkColorSpacePriv.h"
+#include "src/core/SkMD5.h"
+#include "src/core/SkMakeUnique.h"
+#include "src/core/SkStreamPriv.h"
+#include "tests/FakeStreams.h"
+#include "tests/Test.h"
+#include "tools/Resources.h"
+#include "tools/ToolUtils.h"
#include "png.h"
#include <setjmp.h>
diff --git a/tests/ColorFilterTest.cpp b/tests/ColorFilterTest.cpp
index 2b05f94..4852802 100644
--- a/tests/ColorFilterTest.cpp
+++ b/tests/ColorFilterTest.cpp
@@ -5,16 +5,16 @@
* found in the LICENSE file.
*/
-#include "SkAutoMalloc.h"
-#include "SkBlendMode.h"
-#include "SkColor.h"
-#include "SkColorFilter.h"
-#include "SkRandom.h"
-#include "SkReadBuffer.h"
-#include "SkRefCnt.h"
-#include "SkWriteBuffer.h"
-#include "SkTypes.h"
-#include "Test.h"
+#include "include/core/SkBlendMode.h"
+#include "include/core/SkColor.h"
+#include "include/core/SkColorFilter.h"
+#include "include/core/SkRefCnt.h"
+#include "include/core/SkTypes.h"
+#include "include/utils/SkRandom.h"
+#include "src/core/SkAutoMalloc.h"
+#include "src/core/SkReadBuffer.h"
+#include "src/core/SkWriteBuffer.h"
+#include "tests/Test.h"
class SkFlattenable;
diff --git a/tests/ColorMatrixTest.cpp b/tests/ColorMatrixTest.cpp
index 371c332..52a19b0 100644
--- a/tests/ColorMatrixTest.cpp
+++ b/tests/ColorMatrixTest.cpp
@@ -5,14 +5,14 @@
* found in the LICENSE file.
*/
-#include "SkBitmap.h"
-#include "SkCanvas.h"
-#include "SkColor.h"
-#include "SkColorFilter.h"
-#include "SkPaint.h"
-#include "SkRefCnt.h"
-#include "SkScalar.h"
-#include "Test.h"
+#include "include/core/SkBitmap.h"
+#include "include/core/SkCanvas.h"
+#include "include/core/SkColor.h"
+#include "include/core/SkColorFilter.h"
+#include "include/core/SkPaint.h"
+#include "include/core/SkRefCnt.h"
+#include "include/core/SkScalar.h"
+#include "tests/Test.h"
#include <cmath>
#include <cstdlib>
diff --git a/tests/ColorPrivTest.cpp b/tests/ColorPrivTest.cpp
index c43873b..89f8d99 100644
--- a/tests/ColorPrivTest.cpp
+++ b/tests/ColorPrivTest.cpp
@@ -5,11 +5,11 @@
* found in the LICENSE file.
*/
-#include "SkColor.h"
-#include "SkColorData.h"
-#include "SkColorPriv.h"
-#include "SkTypes.h"
-#include "Test.h"
+#include "include/core/SkColor.h"
+#include "include/core/SkColorPriv.h"
+#include "include/core/SkTypes.h"
+#include "include/private/SkColorData.h"
+#include "tests/Test.h"
#define ASSERT(expr) REPORTER_ASSERT(r, expr)
diff --git a/tests/ColorSpaceTest.cpp b/tests/ColorSpaceTest.cpp
index 556a30d..e8864d4 100644
--- a/tests/ColorSpaceTest.cpp
+++ b/tests/ColorSpaceTest.cpp
@@ -5,16 +5,16 @@
* found in the LICENSE file.
*/
-#include "Resources.h"
-#include "SkCodec.h"
-#include "SkColorSpace.h"
-#include "SkColorSpacePriv.h"
-#include "SkData.h"
-#include "SkImageInfo.h"
-#include "SkRefCnt.h"
-#include "SkStream.h"
-#include "SkTypes.h"
-#include "Test.h"
+#include "include/codec/SkCodec.h"
+#include "include/core/SkColorSpace.h"
+#include "include/core/SkData.h"
+#include "include/core/SkImageInfo.h"
+#include "include/core/SkRefCnt.h"
+#include "include/core/SkStream.h"
+#include "include/core/SkTypes.h"
+#include "src/core/SkColorSpacePriv.h"
+#include "tests/Test.h"
+#include "tools/Resources.h"
#include "skcms.h"
#include "png.h"
diff --git a/tests/ColorTest.cpp b/tests/ColorTest.cpp
index e8bc9ec..e9e9479 100644
--- a/tests/ColorTest.cpp
+++ b/tests/ColorTest.cpp
@@ -5,14 +5,14 @@
* found in the LICENSE file.
*/
-#include "SkColor.h"
-#include "SkColorData.h"
-#include "SkColorPriv.h"
-#include "SkMathPriv.h"
-#include "SkRandom.h"
-#include "SkTypes.h"
-#include "SkUnPreMultiply.h"
-#include "Test.h"
+#include "include/core/SkColor.h"
+#include "include/core/SkColorPriv.h"
+#include "include/core/SkTypes.h"
+#include "include/core/SkUnPreMultiply.h"
+#include "include/private/SkColorData.h"
+#include "include/utils/SkRandom.h"
+#include "src/core/SkMathPriv.h"
+#include "tests/Test.h"
#define GetPackedR16As32(packed) (SkGetPackedR16(dc) << (8 - SK_R16_BITS))
#define GetPackedG16As32(packed) (SkGetPackedG16(dc) << (8 - SK_G16_BITS))
diff --git a/tests/CopySurfaceTest.cpp b/tests/CopySurfaceTest.cpp
index 2e66351..0674d04 100644
--- a/tests/CopySurfaceTest.cpp
+++ b/tests/CopySurfaceTest.cpp
@@ -5,24 +5,24 @@
* found in the LICENSE file.
*/
-#include "SkTypes.h"
+#include "include/core/SkTypes.h"
-#include "GrContext.h"
-#include "GrContextFactory.h"
-#include "GrContextPriv.h"
-#include "GrSurfaceContext.h"
-#include "GrSurfaceProxy.h"
-#include "GrTextureProxy.h"
-#include "GrTypes.h"
-#include "ProxyUtils.h"
-#include "SkGr.h"
-#include "SkImageInfo.h"
-#include "SkPoint.h"
-#include "SkRect.h"
-#include "SkRefCnt.h"
-#include "SkTemplates.h"
-#include "SkUtils.h"
-#include "Test.h"
+#include "include/core/SkImageInfo.h"
+#include "include/core/SkPoint.h"
+#include "include/core/SkRect.h"
+#include "include/core/SkRefCnt.h"
+#include "include/gpu/GrContext.h"
+#include "include/gpu/GrTypes.h"
+#include "include/private/GrSurfaceProxy.h"
+#include "include/private/GrTextureProxy.h"
+#include "include/private/SkTemplates.h"
+#include "src/core/SkUtils.h"
+#include "src/gpu/GrContextPriv.h"
+#include "src/gpu/GrSurfaceContext.h"
+#include "src/gpu/SkGr.h"
+#include "tests/Test.h"
+#include "tools/gpu/GrContextFactory.h"
+#include "tools/gpu/ProxyUtils.h"
#include <utility>
diff --git a/tests/CubicMapTest.cpp b/tests/CubicMapTest.cpp
index db44dc0..3bc0d09 100644
--- a/tests/CubicMapTest.cpp
+++ b/tests/CubicMapTest.cpp
@@ -5,11 +5,11 @@
* found in the LICENSE file.
*/
-#include "SkCubicMap.h"
-#include "SkGeometry.h"
-#include "SkRandom.h"
-#include "Test.h"
-#include "../../src/pathops/SkPathOpsCubic.h"
+#include "include/core/SkCubicMap.h"
+#include "include/utils/SkRandom.h"
+#include "src/core/SkGeometry.h"
+#include "src/pathops/SkPathOpsCubic.h"
+#include "tests/Test.h"
static float accurate_t(float A, float B, float C, float D) {
double roots[3];
diff --git a/tests/DashPathEffectTest.cpp b/tests/DashPathEffectTest.cpp
index c50c88d..cc38b1b 100644
--- a/tests/DashPathEffectTest.cpp
+++ b/tests/DashPathEffectTest.cpp
@@ -5,21 +5,21 @@
* found in the LICENSE file.
*/
-#include "SkCanvas.h"
-#include "SkDashPathEffect.h"
-#include "SkImageInfo.h"
-#include "SkMatrix.h"
-#include "SkPaint.h"
-#include "SkPath.h"
-#include "SkPathEffect.h"
-#include "SkPoint.h"
-#include "SkRect.h"
-#include "SkRefCnt.h"
-#include "SkScalar.h"
-#include "SkStrokeRec.h"
-#include "SkSurface.h"
-#include "SkTypes.h"
-#include "Test.h"
+#include "include/core/SkCanvas.h"
+#include "include/core/SkImageInfo.h"
+#include "include/core/SkMatrix.h"
+#include "include/core/SkPaint.h"
+#include "include/core/SkPath.h"
+#include "include/core/SkPathEffect.h"
+#include "include/core/SkPoint.h"
+#include "include/core/SkRect.h"
+#include "include/core/SkRefCnt.h"
+#include "include/core/SkScalar.h"
+#include "include/core/SkStrokeRec.h"
+#include "include/core/SkSurface.h"
+#include "include/core/SkTypes.h"
+#include "include/effects/SkDashPathEffect.h"
+#include "tests/Test.h"
// crbug.com/348821 was rooted in SkDashPathEffect refusing to flatten and unflatten itself when
// the effect is nonsense. Here we test that it fails when passed nonsense parameters.
diff --git a/tests/DataRefTest.cpp b/tests/DataRefTest.cpp
index e7ada5f..52a848f 100644
--- a/tests/DataRefTest.cpp
+++ b/tests/DataRefTest.cpp
@@ -5,19 +5,19 @@
* found in the LICENSE file.
*/
-#include "SkData.h"
-#include "SkDataTable.h"
-#include "SkOSFile.h"
-#include "SkOSPath.h"
-#include "SkRWBuffer.h"
-#include "SkRefCnt.h"
-#include "SkStream.h"
-#include "SkString.h"
-#include "SkTArray.h"
-#include "SkTaskGroup.h"
-#include "SkTemplates.h"
-#include "SkTypes.h"
-#include "Test.h"
+#include "include/core/SkData.h"
+#include "include/core/SkDataTable.h"
+#include "include/core/SkRWBuffer.h"
+#include "include/core/SkRefCnt.h"
+#include "include/core/SkStream.h"
+#include "include/core/SkString.h"
+#include "include/core/SkTypes.h"
+#include "include/private/SkTArray.h"
+#include "include/private/SkTemplates.h"
+#include "src/core/SkOSFile.h"
+#include "src/core/SkTaskGroup.h"
+#include "src/utils/SkOSPath.h"
+#include "tests/Test.h"
#include <cstdio>
#include <cstring>
diff --git a/tests/DefaultPathRendererTest.cpp b/tests/DefaultPathRendererTest.cpp
index 8de67d0..17b2126 100644
--- a/tests/DefaultPathRendererTest.cpp
+++ b/tests/DefaultPathRendererTest.cpp
@@ -5,30 +5,30 @@
* found in the LICENSE file.
*/
-#include "SkTypes.h"
+#include "include/core/SkTypes.h"
-#include "GrClip.h"
-#include "GrColor.h"
-#include "GrContext.h"
-#include "GrContextFactory.h"
-#include "GrContextOptions.h"
-#include "GrContextPriv.h"
-#include "GrFragmentProcessor.h"
-#include "GrPaint.h"
-#include "GrRenderTargetContext.h"
-#include "GrStyle.h"
-#include "GrTypesPriv.h"
-#include "SkBitmap.h"
-#include "SkColor.h"
-#include "SkColorSpace.h"
-#include "SkImageInfo.h"
-#include "SkMatrix.h"
-#include "SkPath.h"
-#include "SkRect.h"
-#include "SkRefCnt.h"
-#include "SkStrokeRec.h"
-#include "Test.h"
-#include "effects/generated/GrConstColorProcessor.h"
+#include "include/core/SkBitmap.h"
+#include "include/core/SkColor.h"
+#include "include/core/SkColorSpace.h"
+#include "include/core/SkImageInfo.h"
+#include "include/core/SkMatrix.h"
+#include "include/core/SkPath.h"
+#include "include/core/SkRect.h"
+#include "include/core/SkRefCnt.h"
+#include "include/core/SkStrokeRec.h"
+#include "include/gpu/GrContext.h"
+#include "include/gpu/GrContextOptions.h"
+#include "include/private/GrColor.h"
+#include "include/private/GrTypesPriv.h"
+#include "src/gpu/GrClip.h"
+#include "src/gpu/GrContextPriv.h"
+#include "src/gpu/GrFragmentProcessor.h"
+#include "src/gpu/GrPaint.h"
+#include "src/gpu/GrRenderTargetContext.h"
+#include "src/gpu/GrStyle.h"
+#include "src/gpu/effects/generated/GrConstColorProcessor.h"
+#include "tests/Test.h"
+#include "tools/gpu/GrContextFactory.h"
#include <utility>
diff --git a/tests/DeferredDisplayListTest.cpp b/tests/DeferredDisplayListTest.cpp
index 29cffb0..24e3a91 100644
--- a/tests/DeferredDisplayListTest.cpp
+++ b/tests/DeferredDisplayListTest.cpp
@@ -8,40 +8,40 @@
#include <initializer_list>
#include <memory>
#include <utility>
-#include "GrBackendSurface.h"
-#include "GrCaps.h"
-#include "GrContext.h"
-#include "GrContextFactory.h"
-#include "GrContextPriv.h"
-#include "GrGpu.h"
-#include "GrRenderTargetContext.h"
-#include "GrRenderTargetProxy.h"
-#include "GrTextureProxy.h"
-#include "GrTextureProxyPriv.h"
-#include "GrTypes.h"
-#include "GrTypesPriv.h"
-#include "SkBitmap.h"
-#include "SkCanvas.h"
-#include "SkColorSpace.h"
-#include "SkDeferredDisplayList.h"
-#include "SkDeferredDisplayListPriv.h"
-#include "SkDeferredDisplayListRecorder.h"
-#include "SkGpuDevice.h"
-#include "SkImage.h"
-#include "SkImageInfo.h"
-#include "SkImage_Gpu.h"
-#include "SkPaint.h"
-#include "SkPromiseImageTexture.h"
-#include "SkRect.h"
-#include "SkRefCnt.h"
-#include "SkSurface.h"
-#include "SkSurfaceCharacterization.h"
-#include "SkSurfaceProps.h"
-#include "SkSurface_Gpu.h"
-#include "Test.h"
-#include "gl/GrGLCaps.h"
-#include "gl/GrGLDefines.h"
-#include "gl/GrGLTypes.h"
+#include "include/core/SkBitmap.h"
+#include "include/core/SkCanvas.h"
+#include "include/core/SkColorSpace.h"
+#include "include/core/SkDeferredDisplayListRecorder.h"
+#include "include/core/SkImage.h"
+#include "include/core/SkImageInfo.h"
+#include "include/core/SkPaint.h"
+#include "include/core/SkPromiseImageTexture.h"
+#include "include/core/SkRect.h"
+#include "include/core/SkRefCnt.h"
+#include "include/core/SkSurface.h"
+#include "include/core/SkSurfaceCharacterization.h"
+#include "include/core/SkSurfaceProps.h"
+#include "include/gpu/GrBackendSurface.h"
+#include "include/gpu/GrContext.h"
+#include "include/gpu/GrTypes.h"
+#include "include/gpu/gl/GrGLTypes.h"
+#include "include/private/GrRenderTargetProxy.h"
+#include "include/private/GrTextureProxy.h"
+#include "include/private/GrTypesPriv.h"
+#include "include/private/SkDeferredDisplayList.h"
+#include "src/core/SkDeferredDisplayListPriv.h"
+#include "src/gpu/GrCaps.h"
+#include "src/gpu/GrContextPriv.h"
+#include "src/gpu/GrGpu.h"
+#include "src/gpu/GrRenderTargetContext.h"
+#include "src/gpu/GrTextureProxyPriv.h"
+#include "src/gpu/SkGpuDevice.h"
+#include "src/gpu/gl/GrGLCaps.h"
+#include "src/gpu/gl/GrGLDefines.h"
+#include "src/image/SkImage_Gpu.h"
+#include "src/image/SkSurface_Gpu.h"
+#include "tests/Test.h"
+#include "tools/gpu/GrContextFactory.h"
#ifdef SK_VULKAN
#include <vulkan/vulkan_core.h>
#endif
diff --git a/tests/DequeTest.cpp b/tests/DequeTest.cpp
index b41262f..b3e4515 100644
--- a/tests/DequeTest.cpp
+++ b/tests/DequeTest.cpp
@@ -5,8 +5,8 @@
* found in the LICENSE file.
*/
-#include "SkDeque.h"
-#include "Test.h"
+#include "include/core/SkDeque.h"
+#include "tests/Test.h"
static void assert_count(skiatest::Reporter* reporter, const SkDeque& deq, int count) {
if (0 == count) {
diff --git a/tests/DescriptorTest.cpp b/tests/DescriptorTest.cpp
index 42f0727..7426084 100644
--- a/tests/DescriptorTest.cpp
+++ b/tests/DescriptorTest.cpp
@@ -5,8 +5,8 @@
* found in the LICENSE file.
*/
-#include "SkDescriptor.h"
-#include "Test.h"
+#include "src/core/SkDescriptor.h"
+#include "tests/Test.h"
class SkDescriptorTestHelper {
public:
diff --git a/tests/DetermineDomainModeTest.cpp b/tests/DetermineDomainModeTest.cpp
index 74e2b8a..577f333 100644
--- a/tests/DetermineDomainModeTest.cpp
+++ b/tests/DetermineDomainModeTest.cpp
@@ -5,20 +5,20 @@
* found in the LICENSE file.
*/
-#include "SkTypes.h"
+#include "include/core/SkTypes.h"
-#include "GrContext.h"
-#include "GrContextFactory.h"
-#include "GrContextPriv.h"
-#include "GrProxyProvider.h"
-#include "GrSamplerState.h"
-#include "GrTextureProducer.h"
-#include "GrTextureProxy.h"
-#include "GrTypes.h"
-#include "GrTypesPriv.h"
-#include "SkRect.h"
-#include "SkRefCnt.h"
-#include "Test.h"
+#include "include/core/SkRect.h"
+#include "include/core/SkRefCnt.h"
+#include "include/gpu/GrContext.h"
+#include "include/gpu/GrSamplerState.h"
+#include "include/gpu/GrTypes.h"
+#include "include/private/GrTextureProxy.h"
+#include "include/private/GrTypesPriv.h"
+#include "src/gpu/GrContextPriv.h"
+#include "src/gpu/GrProxyProvider.h"
+#include "src/gpu/GrTextureProducer.h"
+#include "tests/Test.h"
+#include "tools/gpu/GrContextFactory.h"
#include <initializer_list>
diff --git a/tests/DeviceTest.cpp b/tests/DeviceTest.cpp
index 5b1676c..2f96ff6 100644
--- a/tests/DeviceTest.cpp
+++ b/tests/DeviceTest.cpp
@@ -5,18 +5,18 @@
* 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"
-#include "SkRefCnt.h"
-#include "SkSpecialImage.h"
-#include "SkTypes.h"
-#include "Test.h"
+#include "include/core/SkBitmap.h"
+#include "include/core/SkImage.h"
+#include "include/core/SkImageInfo.h"
+#include "include/core/SkRect.h"
+#include "include/core/SkRefCnt.h"
+#include "include/core/SkTypes.h"
+#include "include/gpu/GrTypes.h"
+#include "src/core/SkDevice.h"
+#include "src/core/SkSpecialImage.h"
+#include "src/gpu/SkGpuDevice.h"
+#include "tests/Test.h"
+#include "tools/gpu/GrContextFactory.h"
class SkColorSpace;
class GrContext;
diff --git a/tests/DiscardableMemoryPoolTest.cpp b/tests/DiscardableMemoryPoolTest.cpp
index 6ea0e9b..6d7923f 100644
--- a/tests/DiscardableMemoryPoolTest.cpp
+++ b/tests/DiscardableMemoryPoolTest.cpp
@@ -5,10 +5,10 @@
* found in the LICENSE file.
*/
-#include "SkDiscardableMemory.h"
-#include "SkDiscardableMemoryPool.h"
-#include "SkRefCnt.h"
-#include "Test.h"
+#include "include/core/SkRefCnt.h"
+#include "src/core/SkDiscardableMemory.h"
+#include "src/lazy/SkDiscardableMemoryPool.h"
+#include "tests/Test.h"
#include <memory>
diff --git a/tests/DiscardableMemoryTest.cpp b/tests/DiscardableMemoryTest.cpp
index 8447e4d..cb90124 100644
--- a/tests/DiscardableMemoryTest.cpp
+++ b/tests/DiscardableMemoryTest.cpp
@@ -5,10 +5,10 @@
* found in the LICENSE file.
*/
-#include "SkDiscardableMemory.h"
-#include "SkDiscardableMemoryPool.h"
-#include "SkRefCnt.h"
-#include "Test.h"
+#include "include/core/SkRefCnt.h"
+#include "src/core/SkDiscardableMemory.h"
+#include "src/lazy/SkDiscardableMemoryPool.h"
+#include "tests/Test.h"
#include <cstring>
#include <memory>
diff --git a/tests/DrawBitmapRectTest.cpp b/tests/DrawBitmapRectTest.cpp
index 6d3c1be..9f54e48 100644
--- a/tests/DrawBitmapRectTest.cpp
+++ b/tests/DrawBitmapRectTest.cpp
@@ -5,20 +5,20 @@
* found in the LICENSE file.
*/
-#include "SkBitmap.h"
-#include "SkCanvas.h"
-#include "SkColor.h"
-#include "SkMatrix.h"
-#include "SkMatrixUtils.h"
-#include "SkPaint.h"
-#include "SkPath.h"
-#include "SkRandom.h"
-#include "SkRect.h"
-#include "SkScalar.h"
-#include "SkShader.h"
-#include "SkSize.h"
-#include "SkTypes.h"
-#include "Test.h"
+#include "include/core/SkBitmap.h"
+#include "include/core/SkCanvas.h"
+#include "include/core/SkColor.h"
+#include "include/core/SkMatrix.h"
+#include "include/core/SkPaint.h"
+#include "include/core/SkPath.h"
+#include "include/core/SkRect.h"
+#include "include/core/SkScalar.h"
+#include "include/core/SkShader.h"
+#include "include/core/SkSize.h"
+#include "include/core/SkTypes.h"
+#include "include/utils/SkRandom.h"
+#include "src/core/SkMatrixUtils.h"
+#include "tests/Test.h"
///////////////////////////////////////////////////////////////////////////////
diff --git a/tests/DrawOpAtlasTest.cpp b/tests/DrawOpAtlasTest.cpp
index dc6cd2a..eda7d0f 100644
--- a/tests/DrawOpAtlasTest.cpp
+++ b/tests/DrawOpAtlasTest.cpp
@@ -5,36 +5,36 @@
* found in the LICENSE file.
*/
-#include "SkTypes.h"
+#include "include/core/SkTypes.h"
-#include "GrContext.h"
-#include "GrContextFactory.h"
-#include "GrContextPriv.h"
-#include "GrDeferredUpload.h"
-#include "GrDrawOpAtlas.h"
-#include "GrDrawingManager.h"
-#include "GrMemoryPool.h"
-#include "GrOnFlushResourceProvider.h"
-#include "GrOpFlushState.h"
-#include "GrRenderTargetContext.h"
-#include "GrSurfaceProxyPriv.h"
-#include "GrTextureProxy.h"
-#include "GrTypesPriv.h"
-#include "GrXferProcessor.h"
-#include "SkBitmap.h"
-#include "SkColor.h"
-#include "SkColorSpace.h"
-#include "SkIPoint16.h"
-#include "SkImageInfo.h"
-#include "SkMatrix.h"
-#include "SkPaint.h"
-#include "SkPoint.h"
-#include "SkRefCnt.h"
-#include "Test.h"
-#include "ops/GrDrawOp.h"
-#include "text/GrAtlasManager.h"
-#include "text/GrTextContext.h"
-#include "text/GrTextTarget.h"
+#include "include/core/SkBitmap.h"
+#include "include/core/SkColor.h"
+#include "include/core/SkColorSpace.h"
+#include "include/core/SkImageInfo.h"
+#include "include/core/SkMatrix.h"
+#include "include/core/SkPaint.h"
+#include "include/core/SkPoint.h"
+#include "include/core/SkRefCnt.h"
+#include "include/gpu/GrContext.h"
+#include "include/private/GrTextureProxy.h"
+#include "include/private/GrTypesPriv.h"
+#include "src/core/SkIPoint16.h"
+#include "src/gpu/GrContextPriv.h"
+#include "src/gpu/GrDeferredUpload.h"
+#include "src/gpu/GrDrawOpAtlas.h"
+#include "src/gpu/GrDrawingManager.h"
+#include "src/gpu/GrMemoryPool.h"
+#include "src/gpu/GrOnFlushResourceProvider.h"
+#include "src/gpu/GrOpFlushState.h"
+#include "src/gpu/GrRenderTargetContext.h"
+#include "src/gpu/GrSurfaceProxyPriv.h"
+#include "src/gpu/GrXferProcessor.h"
+#include "src/gpu/ops/GrDrawOp.h"
+#include "src/gpu/text/GrAtlasManager.h"
+#include "src/gpu/text/GrTextContext.h"
+#include "src/gpu/text/GrTextTarget.h"
+#include "tests/Test.h"
+#include "tools/gpu/GrContextFactory.h"
#include <memory>
diff --git a/tests/DrawPathTest.cpp b/tests/DrawPathTest.cpp
index 53ebad1..940b286 100644
--- a/tests/DrawPathTest.cpp
+++ b/tests/DrawPathTest.cpp
@@ -5,24 +5,24 @@
* found in the LICENSE file.
*/
-#include "SkBitmap.h"
-#include "SkCanvas.h"
-#include "SkColor.h"
-#include "SkDashPathEffect.h"
-#include "SkImageInfo.h"
-#include "SkMatrix.h"
-#include "SkPaint.h"
-#include "SkPath.h"
-#include "SkPathEffect.h"
-#include "SkPoint.h"
-#include "SkRRect.h"
-#include "SkRect.h"
-#include "SkRefCnt.h"
-#include "SkScalar.h"
-#include "SkStrokeRec.h"
-#include "SkSurface.h"
-#include "SkTypes.h"
-#include "Test.h"
+#include "include/core/SkBitmap.h"
+#include "include/core/SkCanvas.h"
+#include "include/core/SkColor.h"
+#include "include/core/SkImageInfo.h"
+#include "include/core/SkMatrix.h"
+#include "include/core/SkPaint.h"
+#include "include/core/SkPath.h"
+#include "include/core/SkPathEffect.h"
+#include "include/core/SkPoint.h"
+#include "include/core/SkRRect.h"
+#include "include/core/SkRect.h"
+#include "include/core/SkRefCnt.h"
+#include "include/core/SkScalar.h"
+#include "include/core/SkStrokeRec.h"
+#include "include/core/SkSurface.h"
+#include "include/core/SkTypes.h"
+#include "include/effects/SkDashPathEffect.h"
+#include "tests/Test.h"
// test that we can draw an aa-rect at coordinates > 32K (bigger than fixedpoint)
static void test_big_aa_rect(skiatest::Reporter* reporter) {
diff --git a/tests/DrawTextTest.cpp b/tests/DrawTextTest.cpp
index 19c08f3..c0205fe 100644
--- a/tests/DrawTextTest.cpp
+++ b/tests/DrawTextTest.cpp
@@ -5,21 +5,21 @@
* found in the LICENSE file.
*/
-#include "SkBitmap.h"
-#include "SkCanvas.h"
-#include "SkColor.h"
-#include "SkDashPathEffect.h"
-#include "SkFont.h"
-#include "SkMatrix.h"
-#include "SkPaint.h"
-#include "SkPathEffect.h"
-#include "SkPoint.h"
-#include "SkRect.h"
-#include "SkRefCnt.h"
-#include "SkScalar.h"
-#include "SkSurface.h"
-#include "SkTypes.h"
-#include "Test.h"
+#include "include/core/SkBitmap.h"
+#include "include/core/SkCanvas.h"
+#include "include/core/SkColor.h"
+#include "include/core/SkFont.h"
+#include "include/core/SkMatrix.h"
+#include "include/core/SkPaint.h"
+#include "include/core/SkPathEffect.h"
+#include "include/core/SkPoint.h"
+#include "include/core/SkRect.h"
+#include "include/core/SkRefCnt.h"
+#include "include/core/SkScalar.h"
+#include "include/core/SkSurface.h"
+#include "include/core/SkTypes.h"
+#include "include/effects/SkDashPathEffect.h"
+#include "tests/Test.h"
#include <cmath>
diff --git a/tests/DynamicHashTest.cpp b/tests/DynamicHashTest.cpp
index 62c070a..b2bbc40 100644
--- a/tests/DynamicHashTest.cpp
+++ b/tests/DynamicHashTest.cpp
@@ -5,9 +5,9 @@
* found in the LICENSE file.
*/
-#include "SkTDynamicHash.h"
-#include "SkTypes.h"
-#include "Test.h"
+#include "include/core/SkTypes.h"
+#include "src/core/SkTDynamicHash.h"
+#include "tests/Test.h"
#include <cstring>
diff --git a/tests/EGLImageTest.cpp b/tests/EGLImageTest.cpp
index 09c6bae..42f13e5 100644
--- a/tests/EGLImageTest.cpp
+++ b/tests/EGLImageTest.cpp
@@ -5,21 +5,21 @@
* found in the LICENSE file.
*/
-#include "Test.h"
-#include "TestUtils.h"
-#include "GrContext.h"
-#include "GrContextFactory.h"
-#include "GrContextPriv.h"
-#include "GrRenderTargetContext.h"
-#include "GrShaderCaps.h"
-#include "GrSurfacePriv.h"
-#include "GrTexture.h"
-#include "GrTextureContext.h"
-#include "GrTexturePriv.h"
-#include "GrTextureProxyPriv.h"
-#include "gl/GLTestContext.h"
-#include "gl/GrGLGpu.h"
-#include "gl/GrGLUtil.h"
+#include "include/gpu/GrContext.h"
+#include "include/gpu/GrTexture.h"
+#include "src/gpu/GrContextPriv.h"
+#include "src/gpu/GrRenderTargetContext.h"
+#include "src/gpu/GrShaderCaps.h"
+#include "src/gpu/GrSurfacePriv.h"
+#include "src/gpu/GrTextureContext.h"
+#include "src/gpu/GrTexturePriv.h"
+#include "src/gpu/GrTextureProxyPriv.h"
+#include "src/gpu/gl/GrGLGpu.h"
+#include "src/gpu/gl/GrGLUtil.h"
+#include "tests/Test.h"
+#include "tests/TestUtils.h"
+#include "tools/gpu/GrContextFactory.h"
+#include "tools/gpu/gl/GLTestContext.h"
using sk_gpu_test::GLTestContext;
diff --git a/tests/EmptyPathTest.cpp b/tests/EmptyPathTest.cpp
index 78f1816..8212fc4 100644
--- a/tests/EmptyPathTest.cpp
+++ b/tests/EmptyPathTest.cpp
@@ -5,10 +5,10 @@
* found in the LICENSE file.
*/
-#include "SkBitmap.h"
-#include "SkCanvas.h"
-#include "SkPath.h"
-#include "Test.h"
+#include "include/core/SkBitmap.h"
+#include "include/core/SkCanvas.h"
+#include "include/core/SkPath.h"
+#include "tests/Test.h"
#define DIMENSION 32
diff --git a/tests/EncodeTest.cpp b/tests/EncodeTest.cpp
index 367dc35..9465742 100644
--- a/tests/EncodeTest.cpp
+++ b/tests/EncodeTest.cpp
@@ -5,17 +5,17 @@
* found in the LICENSE file.
*/
-#include "Resources.h"
-#include "Test.h"
+#include "tests/Test.h"
+#include "tools/Resources.h"
-#include "SkBitmap.h"
-#include "SkColorPriv.h"
-#include "SkEncodedImageFormat.h"
-#include "SkImage.h"
-#include "SkJpegEncoder.h"
-#include "SkPngEncoder.h"
-#include "SkStream.h"
-#include "SkWebpEncoder.h"
+#include "include/core/SkBitmap.h"
+#include "include/core/SkColorPriv.h"
+#include "include/core/SkEncodedImageFormat.h"
+#include "include/core/SkImage.h"
+#include "include/core/SkStream.h"
+#include "include/encode/SkJpegEncoder.h"
+#include "include/encode/SkPngEncoder.h"
+#include "include/encode/SkWebpEncoder.h"
#include "png.h"
diff --git a/tests/EncodedInfoTest.cpp b/tests/EncodedInfoTest.cpp
index 3babbd0..16535ed 100644
--- a/tests/EncodedInfoTest.cpp
+++ b/tests/EncodedInfoTest.cpp
@@ -5,16 +5,16 @@
* found in the LICENSE file.
*/
-#include "Resources.h"
-#include "Test.h"
-#include "ToolUtils.h"
+#include "tests/Test.h"
+#include "tools/Resources.h"
+#include "tools/ToolUtils.h"
-#include "SkBitmap.h"
-#include "SkCodec.h"
-#include "SkData.h"
-#include "SkEncodedImageFormat.h"
-#include "SkImageInfo.h"
-#include "SkImageEncoder.h"
+#include "include/codec/SkCodec.h"
+#include "include/core/SkBitmap.h"
+#include "include/core/SkData.h"
+#include "include/core/SkEncodedImageFormat.h"
+#include "include/core/SkImageEncoder.h"
+#include "include/core/SkImageInfo.h"
DEF_TEST(AlphaEncodedInfo, r) {
auto codec = SkCodec::MakeFromStream(GetResourceAsStream("images/grayscale.jpg"));
diff --git a/tests/ExifTest.cpp b/tests/ExifTest.cpp
index 16f62bb..ff83f1a 100644
--- a/tests/ExifTest.cpp
+++ b/tests/ExifTest.cpp
@@ -5,9 +5,9 @@
* found in the LICENSE file.
*/
-#include "Resources.h"
-#include "SkCodec.h"
-#include "Test.h"
+#include "include/codec/SkCodec.h"
+#include "tests/Test.h"
+#include "tools/Resources.h"
DEF_TEST(ExifOrientation, r) {
std::unique_ptr<SkStream> stream(GetResourceAsStream("images/exif-orientation-2-ur.jpg"));
diff --git a/tests/F16StagesTest.cpp b/tests/F16StagesTest.cpp
index 46e3fba..b9cb5a1 100644
--- a/tests/F16StagesTest.cpp
+++ b/tests/F16StagesTest.cpp
@@ -5,8 +5,8 @@
* found in the LICENSE file.
*/
-#include "SkRasterPipeline.h"
-#include "Test.h"
+#include "src/core/SkRasterPipeline.h"
+#include "tests/Test.h"
DEF_TEST(F16Stages, r) {
// Make sure SkRasterPipeline::load_f16 and store_f16 can handle a range of
diff --git a/tests/FakeStreams.h b/tests/FakeStreams.h
index 6b510b8..a5577e9 100644
--- a/tests/FakeStreams.h
+++ b/tests/FakeStreams.h
@@ -5,8 +5,8 @@
* found in the LICENSE file.
*/
-#include "SkData.h"
-#include "SkStream.h"
+#include "include/core/SkData.h"
+#include "include/core/SkStream.h"
#ifndef FakeStreams_DEFINED
#define FakeStreams_DEFINED
diff --git a/tests/FillPathTest.cpp b/tests/FillPathTest.cpp
index 01489d7..b5149e9 100644
--- a/tests/FillPathTest.cpp
+++ b/tests/FillPathTest.cpp
@@ -5,11 +5,11 @@
* found in the LICENSE file.
*/
-#include "SkBlitter.h"
-#include "SkPath.h"
-#include "SkRegion.h"
-#include "SkScan.h"
-#include "Test.h"
+#include "include/core/SkPath.h"
+#include "include/core/SkRegion.h"
+#include "src/core/SkBlitter.h"
+#include "src/core/SkScan.h"
+#include "tests/Test.h"
struct FakeBlitter : public SkBlitter {
FakeBlitter()
diff --git a/tests/FitsInTest.cpp b/tests/FitsInTest.cpp
index 1802477..42a0bad 100644
--- a/tests/FitsInTest.cpp
+++ b/tests/FitsInTest.cpp
@@ -5,9 +5,9 @@
* found in the LICENSE file.
*/
-#include "SkTFitsIn.h"
-#include "SkTypes.h"
-#include "Test.h"
+#include "include/core/SkTypes.h"
+#include "include/private/SkTFitsIn.h"
+#include "tests/Test.h"
#include <limits>
diff --git a/tests/FlattenDrawableTest.cpp b/tests/FlattenDrawableTest.cpp
index 84f3164..e1074e0 100644
--- a/tests/FlattenDrawableTest.cpp
+++ b/tests/FlattenDrawableTest.cpp
@@ -5,15 +5,15 @@
* found in the LICENSE file.
*/
-#include "SkCanvas.h"
-#include "SkDrawable.h"
-#include "SkFont.h"
-#include "SkPictureRecorder.h"
-#include "SkReadBuffer.h"
-#include "SkRect.h"
-#include "SkStream.h"
-#include "SkWriteBuffer.h"
-#include "Test.h"
+#include "include/core/SkCanvas.h"
+#include "include/core/SkDrawable.h"
+#include "include/core/SkFont.h"
+#include "include/core/SkPictureRecorder.h"
+#include "include/core/SkRect.h"
+#include "include/core/SkStream.h"
+#include "src/core/SkReadBuffer.h"
+#include "src/core/SkWriteBuffer.h"
+#include "tests/Test.h"
class IntDrawable : public SkDrawable {
public:
diff --git a/tests/FlattenableFactoryToName.cpp b/tests/FlattenableFactoryToName.cpp
index fc47dfc..aa44e4c 100644
--- a/tests/FlattenableFactoryToName.cpp
+++ b/tests/FlattenableFactoryToName.cpp
@@ -5,10 +5,10 @@
* found in the LICENSE file.
*/
-#include "SkAlphaThresholdFilter.h"
-#include "SkImage.h"
-#include "SkRegion.h"
-#include "Test.h"
+#include "include/core/SkImage.h"
+#include "include/core/SkRegion.h"
+#include "include/effects/SkAlphaThresholdFilter.h"
+#include "tests/Test.h"
static void test_flattenable(skiatest::Reporter* r,
const SkFlattenable* f,
diff --git a/tests/FlattenableNameToFactory.cpp b/tests/FlattenableNameToFactory.cpp
index d082504..1524b79 100644
--- a/tests/FlattenableNameToFactory.cpp
+++ b/tests/FlattenableNameToFactory.cpp
@@ -5,8 +5,8 @@
* found in the LICENSE file.
*/
-#include "SkFlattenable.h"
-#include "Test.h"
+#include "include/core/SkFlattenable.h"
+#include "tests/Test.h"
DEF_TEST(FlattenableNameToFactory, r) {
if (!SkFlattenable::NameToFactory("SkImageShader")) {
diff --git a/tests/Float16Test.cpp b/tests/Float16Test.cpp
index 8524290..c223c7c 100644
--- a/tests/Float16Test.cpp
+++ b/tests/Float16Test.cpp
@@ -5,14 +5,14 @@
* found in the LICENSE file.
*/
-#include "SkAutoPixmapStorage.h"
-#include "SkColor.h"
-#include "SkHalf.h"
-#include "SkOpts.h"
-#include "SkPixmap.h"
-#include "SkRandom.h"
-#include "SkTo.h"
-#include "Test.h"
+#include "include/core/SkColor.h"
+#include "include/core/SkPixmap.h"
+#include "include/private/SkHalf.h"
+#include "include/private/SkTo.h"
+#include "include/utils/SkRandom.h"
+#include "src/core/SkAutoPixmapStorage.h"
+#include "src/core/SkOpts.h"
+#include "tests/Test.h"
#include <cmath>
diff --git a/tests/FloatingPointTextureTest.cpp b/tests/FloatingPointTextureTest.cpp
index afb2a66..9a09e0e 100644
--- a/tests/FloatingPointTextureTest.cpp
+++ b/tests/FloatingPointTextureTest.cpp
@@ -12,14 +12,14 @@
* have been selected to require 32 bits of precision and full IEEE conformance
*/
-#include "Test.h"
+#include "tests/Test.h"
-#include "GrContext.h"
-#include "GrContextPriv.h"
-#include "GrProxyProvider.h"
-#include "GrTextureProxy.h"
-#include "ProxyUtils.h"
-#include "SkHalf.h"
+#include "include/gpu/GrContext.h"
+#include "include/private/GrTextureProxy.h"
+#include "include/private/SkHalf.h"
+#include "src/gpu/GrContextPriv.h"
+#include "src/gpu/GrProxyProvider.h"
+#include "tools/gpu/ProxyUtils.h"
#include <float.h>
diff --git a/tests/FontHostStreamTest.cpp b/tests/FontHostStreamTest.cpp
index 8fb699b..a03fcce 100644
--- a/tests/FontHostStreamTest.cpp
+++ b/tests/FontHostStreamTest.cpp
@@ -5,20 +5,20 @@
* found in the LICENSE file.
*/
-#include "SkBitmap.h"
-#include "SkCanvas.h"
-#include "SkColor.h"
-#include "SkFont.h"
-#include "SkFontDescriptor.h"
-#include "SkFontPriv.h"
-#include "SkGraphics.h"
-#include "SkPaint.h"
-#include "SkPoint.h"
-#include "SkRect.h"
-#include "SkStream.h"
-#include "SkTypeface.h"
-#include "SkTypes.h"
-#include "Test.h"
+#include "include/core/SkBitmap.h"
+#include "include/core/SkCanvas.h"
+#include "include/core/SkColor.h"
+#include "include/core/SkFont.h"
+#include "include/core/SkGraphics.h"
+#include "include/core/SkPaint.h"
+#include "include/core/SkPoint.h"
+#include "include/core/SkRect.h"
+#include "include/core/SkStream.h"
+#include "include/core/SkTypeface.h"
+#include "include/core/SkTypes.h"
+#include "src/core/SkFontDescriptor.h"
+#include "src/core/SkFontPriv.h"
+#include "tests/Test.h"
static const SkColor bgColor = SK_ColorWHITE;
diff --git a/tests/FontHostTest.cpp b/tests/FontHostTest.cpp
index 0b70ac6..eb4c48a 100644
--- a/tests/FontHostTest.cpp
+++ b/tests/FontHostTest.cpp
@@ -5,16 +5,16 @@
* found in the LICENSE file.
*/
-#include "Resources.h"
-#include "SkAutoMalloc.h"
-#include "SkEndian.h"
-#include "SkFont.h"
-#include "SkFontStream.h"
-#include "SkOSFile.h"
-#include "SkPaint.h"
-#include "SkStream.h"
-#include "SkTypeface.h"
-#include "Test.h"
+#include "include/core/SkFont.h"
+#include "include/core/SkPaint.h"
+#include "include/core/SkStream.h"
+#include "include/core/SkTypeface.h"
+#include "src/core/SkAutoMalloc.h"
+#include "src/core/SkEndian.h"
+#include "src/core/SkFontStream.h"
+#include "src/core/SkOSFile.h"
+#include "tests/Test.h"
+#include "tools/Resources.h"
//#define DUMP_TABLES
//#define DUMP_TTC_TABLES
diff --git a/tests/FontMgrAndroidParserTest.cpp b/tests/FontMgrAndroidParserTest.cpp
index 6adcfe6..2a41b60 100644
--- a/tests/FontMgrAndroidParserTest.cpp
+++ b/tests/FontMgrAndroidParserTest.cpp
@@ -5,17 +5,17 @@
* found in the LICENSE file.
*/
-#include "Test.h"
+#include "tests/Test.h"
-#include "CommandLineFlags.h"
-#include "Resources.h"
-#include "SkCanvas.h"
-#include "SkFixed.h"
-#include "SkFont.h"
-#include "SkFontMgr_android.h"
-#include "SkFontMgr_android_parser.h"
-#include "SkOSFile.h"
-#include "SkTypeface.h"
+#include "include/core/SkCanvas.h"
+#include "include/core/SkFont.h"
+#include "include/core/SkTypeface.h"
+#include "include/ports/SkFontMgr_android.h"
+#include "include/private/SkFixed.h"
+#include "src/core/SkOSFile.h"
+#include "src/ports/SkFontMgr_android_parser.h"
+#include "tools/Resources.h"
+#include "tools/flags/CommandLineFlags.h"
#include <cmath>
#include <cstdio>
diff --git a/tests/FontMgrFontConfigTest.cpp b/tests/FontMgrFontConfigTest.cpp
index 5cb396a..7fb60e5 100644
--- a/tests/FontMgrFontConfigTest.cpp
+++ b/tests/FontMgrFontConfigTest.cpp
@@ -5,13 +5,13 @@
* found in the LICENSE file.
*/
-#include "Resources.h"
-#include "SkCanvas.h"
-#include "SkFont.h"
-#include "SkFontMgr.h"
-#include "SkFontMgr_fontconfig.h"
-#include "SkTypeface.h"
-#include "Test.h"
+#include "include/core/SkCanvas.h"
+#include "include/core/SkFont.h"
+#include "include/core/SkFontMgr.h"
+#include "include/core/SkTypeface.h"
+#include "include/ports/SkFontMgr_fontconfig.h"
+#include "tests/Test.h"
+#include "tools/Resources.h"
#include <fontconfig/fontconfig.h>
diff --git a/tests/FontMgrTest.cpp b/tests/FontMgrTest.cpp
index 9eb8d74..7f956ea 100644
--- a/tests/FontMgrTest.cpp
+++ b/tests/FontMgrTest.cpp
@@ -5,14 +5,14 @@
* found in the LICENSE file.
*/
-#include "CommandLineFlags.h"
-#include "SkAdvancedTypefaceMetrics.h"
-#include "SkFont.h"
-#include "SkFontMgr.h"
-#include "SkPaint.h"
-#include "SkStream.h"
-#include "SkTypeface.h"
-#include "Test.h"
+#include "include/core/SkFont.h"
+#include "include/core/SkFontMgr.h"
+#include "include/core/SkPaint.h"
+#include "include/core/SkStream.h"
+#include "include/core/SkTypeface.h"
+#include "src/core/SkAdvancedTypefaceMetrics.h"
+#include "tests/Test.h"
+#include "tools/flags/CommandLineFlags.h"
#include <initializer_list>
#include <limits>
diff --git a/tests/FontNamesTest.cpp b/tests/FontNamesTest.cpp
index de6bcc9..101d98e 100644
--- a/tests/FontNamesTest.cpp
+++ b/tests/FontNamesTest.cpp
@@ -5,11 +5,11 @@
* found in the LICENSE file.
*/
-#include "CommandLineFlags.h"
-#include "SkFontMgr.h"
-#include "SkOTTable_name.h"
-#include "SkTypeface.h"
-#include "Test.h"
+#include "include/core/SkFontMgr.h"
+#include "include/core/SkTypeface.h"
+#include "src/sfnt/SkOTTable_name.h"
+#include "tests/Test.h"
+#include "tools/flags/CommandLineFlags.h"
#include <stddef.h>
diff --git a/tests/FrontBufferedStreamTest.cpp b/tests/FrontBufferedStreamTest.cpp
index 5452730..e3f4352 100644
--- a/tests/FrontBufferedStreamTest.cpp
+++ b/tests/FrontBufferedStreamTest.cpp
@@ -5,13 +5,13 @@
* found in the LICENSE file.
*/
-#include "SkAutoMalloc.h"
-#include "SkBitmap.h"
-#include "SkCodec.h"
-#include "SkFrontBufferedStream.h"
-#include "SkRefCnt.h"
-#include "SkStream.h"
-#include "Test.h"
+#include "include/codec/SkCodec.h"
+#include "include/core/SkBitmap.h"
+#include "include/core/SkRefCnt.h"
+#include "include/core/SkStream.h"
+#include "include/utils/SkFrontBufferedStream.h"
+#include "src/core/SkAutoMalloc.h"
+#include "tests/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 4b230a8..7af9593 100644
--- a/tests/GLProgramsTest.cpp
+++ b/tests/GLProgramsTest.cpp
@@ -7,32 +7,32 @@
// This is a GPU-backend specific test. It relies on static intializers to work
-#include "SkTypes.h"
+#include "include/core/SkTypes.h"
#if SK_ALLOW_STATIC_GLOBAL_INITIALIZERS
-#include "GrAutoLocaleSetter.h"
-#include "GrContextFactory.h"
-#include "GrContextPriv.h"
-#include "GrDrawOpTest.h"
-#include "GrDrawingManager.h"
-#include "GrPipeline.h"
-#include "GrRenderTargetContextPriv.h"
-#include "GrXferProcessor.h"
-#include "SkChecksum.h"
-#include "SkRandom.h"
-#include "Test.h"
+#include "include/private/SkChecksum.h"
+#include "include/utils/SkRandom.h"
+#include "src/gpu/GrAutoLocaleSetter.h"
+#include "src/gpu/GrContextPriv.h"
+#include "src/gpu/GrDrawOpTest.h"
+#include "src/gpu/GrDrawingManager.h"
+#include "src/gpu/GrPipeline.h"
+#include "src/gpu/GrRenderTargetContextPriv.h"
+#include "src/gpu/GrXferProcessor.h"
+#include "tests/Test.h"
+#include "tools/gpu/GrContextFactory.h"
-#include "ops/GrDrawOp.h"
+#include "src/gpu/ops/GrDrawOp.h"
-#include "effects/generated/GrConfigConversionEffect.h"
-#include "effects/GrPorterDuffXferProcessor.h"
-#include "effects/GrXfermodeFragmentProcessor.h"
+#include "src/gpu/effects/GrPorterDuffXferProcessor.h"
+#include "src/gpu/effects/GrXfermodeFragmentProcessor.h"
+#include "src/gpu/effects/generated/GrConfigConversionEffect.h"
-#include "gl/GrGLGpu.h"
-#include "glsl/GrGLSLFragmentProcessor.h"
-#include "glsl/GrGLSLFragmentShaderBuilder.h"
-#include "glsl/GrGLSLProgramBuilder.h"
+#include "src/gpu/gl/GrGLGpu.h"
+#include "src/gpu/glsl/GrGLSLFragmentProcessor.h"
+#include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h"
+#include "src/gpu/glsl/GrGLSLProgramBuilder.h"
/*
* A dummy processor which just tries to insert a massive key and verify that it can retrieve the
diff --git a/tests/GeometryTest.cpp b/tests/GeometryTest.cpp
index 4b15e5f..2f09c24 100644
--- a/tests/GeometryTest.cpp
+++ b/tests/GeometryTest.cpp
@@ -5,10 +5,10 @@
* found in the LICENSE file.
*/
-#include "SkGeometry.h"
-#include "SkPointPriv.h"
-#include "SkRandom.h"
-#include "Test.h"
+#include "include/utils/SkRandom.h"
+#include "src/core/SkGeometry.h"
+#include "src/core/SkPointPriv.h"
+#include "tests/Test.h"
#include <array>
#include <numeric>
diff --git a/tests/GifTest.cpp b/tests/GifTest.cpp
index af2d303..a3eb0ea 100644
--- a/tests/GifTest.cpp
+++ b/tests/GifTest.cpp
@@ -5,16 +5,16 @@
* found in the LICENSE file.
*/
-#include "CodecPriv.h"
-#include "Resources.h"
-#include "SkAndroidCodec.h"
-#include "SkBitmap.h"
-#include "SkCanvas.h"
-#include "SkData.h"
-#include "SkImage.h"
-#include "SkStream.h"
-#include "SkTypes.h"
-#include "Test.h"
+#include "include/codec/SkAndroidCodec.h"
+#include "include/core/SkBitmap.h"
+#include "include/core/SkCanvas.h"
+#include "include/core/SkData.h"
+#include "include/core/SkImage.h"
+#include "include/core/SkStream.h"
+#include "include/core/SkTypes.h"
+#include "tests/CodecPriv.h"
+#include "tests/Test.h"
+#include "tools/Resources.h"
static unsigned char gGIFData[] = {
0x47, 0x49, 0x46, 0x38, 0x37, 0x61, 0x03, 0x00, 0x03, 0x00, 0xe3, 0x08,
diff --git a/tests/GlyphRunTest.cpp b/tests/GlyphRunTest.cpp
index 0405647..66e4725 100644
--- a/tests/GlyphRunTest.cpp
+++ b/tests/GlyphRunTest.cpp
@@ -5,10 +5,10 @@
* found in the LICENSE file.
*/
-#include "SkGlyphRun.h"
+#include "src/core/SkGlyphRun.h"
-#include "SkTextBlob.h"
-#include "Test.h"
+#include "include/core/SkTextBlob.h"
+#include "tests/Test.h"
#include <algorithm>
#include <memory>
diff --git a/tests/GpuDrawPathTest.cpp b/tests/GpuDrawPathTest.cpp
index 39e332f..8213b64 100644
--- a/tests/GpuDrawPathTest.cpp
+++ b/tests/GpuDrawPathTest.cpp
@@ -5,21 +5,21 @@
* found in the LICENSE file.
*/
-#include "SkTypes.h"
+#include "include/core/SkTypes.h"
-#include "GrContext.h"
-#include "GrPath.h"
-#include "GrShape.h"
-#include "SkBitmap.h"
-#include "SkCanvas.h"
-#include "SkColor.h"
-#include "SkPaint.h"
-#include "SkPath.h"
-#include "SkDashPathEffect.h"
-#include "SkRRect.h"
-#include "SkRect.h"
-#include "SkSurface.h"
-#include "Test.h"
+#include "include/core/SkBitmap.h"
+#include "include/core/SkCanvas.h"
+#include "include/core/SkColor.h"
+#include "include/core/SkPaint.h"
+#include "include/core/SkPath.h"
+#include "include/core/SkRRect.h"
+#include "include/core/SkRect.h"
+#include "include/core/SkSurface.h"
+#include "include/effects/SkDashPathEffect.h"
+#include "include/gpu/GrContext.h"
+#include "src/gpu/GrPath.h"
+#include "src/gpu/GrShape.h"
+#include "tests/Test.h"
#include <initializer_list>
diff --git a/tests/GpuLayerCacheTest.cpp b/tests/GpuLayerCacheTest.cpp
index b22809c..6fee532 100644
--- a/tests/GpuLayerCacheTest.cpp
+++ b/tests/GpuLayerCacheTest.cpp
@@ -9,11 +9,11 @@
// The test fails when we add a discard to a newly created render target.
#if 0
-#include "GrContext.h"
+#include "include/gpu/GrContext.h"
#include "GrLayerCache.h"
-#include "GrResourceCache.h"
-#include "SkPictureRecorder.h"
-#include "Test.h"
+#include "include/core/SkPictureRecorder.h"
+#include "src/gpu/GrResourceCache.h"
+#include "tests/Test.h"
class TestingAccess {
public:
diff --git a/tests/GpuRectanizerTest.cpp b/tests/GpuRectanizerTest.cpp
index 0035346..48c49a5 100644
--- a/tests/GpuRectanizerTest.cpp
+++ b/tests/GpuRectanizerTest.cpp
@@ -5,12 +5,12 @@
* found in the LICENSE file.
*/
-#include "GrRectanizer_pow2.h"
-#include "GrRectanizer_skyline.h"
-#include "SkRandom.h"
-#include "SkSize.h"
-#include "SkTDArray.h"
-#include "Test.h"
+#include "include/core/SkSize.h"
+#include "include/private/SkTDArray.h"
+#include "include/utils/SkRandom.h"
+#include "src/gpu/GrRectanizer_pow2.h"
+#include "src/gpu/GrRectanizer_skyline.h"
+#include "tests/Test.h"
static const int kWidth = 1024;
static const int kHeight = 1024;
diff --git a/tests/GrAHardwareBufferTest.cpp b/tests/GrAHardwareBufferTest.cpp
index 8fed798..f95f853 100644
--- a/tests/GrAHardwareBufferTest.cpp
+++ b/tests/GrAHardwareBufferTest.cpp
@@ -7,18 +7,18 @@
// This is a GPU-backend specific test. It relies on static intializers to work
-#include "SkTypes.h"
+#include "include/core/SkTypes.h"
#if SK_SUPPORT_GPU && defined(SK_BUILD_FOR_ANDROID) && __ANDROID_API__ >= 26
-#include "GrAHardwareBufferImageGenerator.h"
-#include "GrContext.h"
-#include "GrContextFactory.h"
-#include "GrContextPriv.h"
-#include "GrGpu.h"
-#include "SkImage.h"
-#include "SkSurface.h"
-#include "Test.h"
+#include "include/core/SkImage.h"
+#include "include/core/SkSurface.h"
+#include "include/gpu/GrContext.h"
+#include "src/gpu/GrAHardwareBufferImageGenerator.h"
+#include "src/gpu/GrContextPriv.h"
+#include "src/gpu/GrGpu.h"
+#include "tests/Test.h"
+#include "tools/gpu/GrContextFactory.h"
#include <android/hardware_buffer.h>
#include <cinttypes>
diff --git a/tests/GrAllocatorTest.cpp b/tests/GrAllocatorTest.cpp
index 7c1c1fa..68b2c42 100644
--- a/tests/GrAllocatorTest.cpp
+++ b/tests/GrAllocatorTest.cpp
@@ -5,8 +5,8 @@
* found in the LICENSE file.
*/
-#include "Test.h"
-#include "GrAllocator.h"
+#include "src/gpu/GrAllocator.h"
+#include "tests/Test.h"
namespace {
struct C {
diff --git a/tests/GrCCPRTest.cpp b/tests/GrCCPRTest.cpp
index 7cd8f10..5858724 100644
--- a/tests/GrCCPRTest.cpp
+++ b/tests/GrCCPRTest.cpp
@@ -5,28 +5,28 @@
* found in the LICENSE file.
*/
-#include "SkTypes.h"
-#include "Test.h"
+#include "include/core/SkTypes.h"
+#include "tests/Test.h"
-#include "GrClip.h"
-#include "GrContextPriv.h"
-#include "GrDrawingManager.h"
-#include "GrPaint.h"
-#include "GrPathRenderer.h"
-#include "GrRecordingContext.h"
-#include "GrRecordingContextPriv.h"
-#include "GrRenderTargetContext.h"
-#include "GrRenderTargetContextPriv.h"
-#include "GrShape.h"
-#include "GrTexture.h"
-#include "SkExchange.h"
-#include "SkMatrix.h"
-#include "SkPathPriv.h"
-#include "SkRect.h"
-#include "ToolUtils.h"
-#include "ccpr/GrCCPathCache.h"
-#include "ccpr/GrCoverageCountingPathRenderer.h"
-#include "mock/GrMockTypes.h"
+#include "include/core/SkMatrix.h"
+#include "include/core/SkRect.h"
+#include "include/gpu/GrTexture.h"
+#include "include/gpu/mock/GrMockTypes.h"
+#include "include/private/GrRecordingContext.h"
+#include "src/core/SkExchange.h"
+#include "src/core/SkPathPriv.h"
+#include "src/gpu/GrClip.h"
+#include "src/gpu/GrContextPriv.h"
+#include "src/gpu/GrDrawingManager.h"
+#include "src/gpu/GrPaint.h"
+#include "src/gpu/GrPathRenderer.h"
+#include "src/gpu/GrRecordingContextPriv.h"
+#include "src/gpu/GrRenderTargetContext.h"
+#include "src/gpu/GrRenderTargetContextPriv.h"
+#include "src/gpu/GrShape.h"
+#include "src/gpu/ccpr/GrCCPathCache.h"
+#include "src/gpu/ccpr/GrCoverageCountingPathRenderer.h"
+#include "tools/ToolUtils.h"
#include <cmath>
diff --git a/tests/GrContextAbandonTest.cpp b/tests/GrContextAbandonTest.cpp
index dcd18e2..0300caa 100644
--- a/tests/GrContextAbandonTest.cpp
+++ b/tests/GrContextAbandonTest.cpp
@@ -5,10 +5,10 @@
* found in the LICENSE file.
*/
-#include "SkTypes.h"
+#include "include/core/SkTypes.h"
-#include "GrContextFactory.h"
-#include "Test.h"
+#include "tests/Test.h"
+#include "tools/gpu/GrContextFactory.h"
using namespace sk_gpu_test;
diff --git a/tests/GrContextFactoryTest.cpp b/tests/GrContextFactoryTest.cpp
index f061009..6d413a8 100644
--- a/tests/GrContextFactoryTest.cpp
+++ b/tests/GrContextFactoryTest.cpp
@@ -5,13 +5,13 @@
* found in the LICENSE file.
*/
-#include "SkTypes.h"
+#include "include/core/SkTypes.h"
-#include "GrContextFactory.h"
-#include "GrContextPriv.h"
-#include "GrCaps.h"
-#include "SkExecutor.h"
-#include "Test.h"
+#include "include/core/SkExecutor.h"
+#include "src/gpu/GrCaps.h"
+#include "src/gpu/GrContextPriv.h"
+#include "tests/Test.h"
+#include "tools/gpu/GrContextFactory.h"
using namespace sk_gpu_test;
diff --git a/tests/GrFinishedFlushTest.cpp b/tests/GrFinishedFlushTest.cpp
index 2584113..f676b06 100644
--- a/tests/GrFinishedFlushTest.cpp
+++ b/tests/GrFinishedFlushTest.cpp
@@ -5,12 +5,12 @@
* found in the LICENSE file.
*/
-#include "Test.h"
+#include "tests/Test.h"
-#include "GrContext.h"
-#include "GrContextPriv.h"
-#include "GrGpu.h"
-#include "SkSurface.h"
+#include "include/core/SkSurface.h"
+#include "include/gpu/GrContext.h"
+#include "src/gpu/GrContextPriv.h"
+#include "src/gpu/GrGpu.h"
using namespace sk_gpu_test;
diff --git a/tests/GrGLExtensionsTest.cpp b/tests/GrGLExtensionsTest.cpp
index ca59ede..480e624 100644
--- a/tests/GrGLExtensionsTest.cpp
+++ b/tests/GrGLExtensionsTest.cpp
@@ -5,11 +5,11 @@
* found in the LICENSE file.
*/
-#include "SkTypes.h"
+#include "include/core/SkTypes.h"
-#include "gl/GrGLDefines.h"
-#include "gl/GrGLExtensions.h"
-#include "Test.h"
+#include "include/gpu/gl/GrGLExtensions.h"
+#include "src/gpu/gl/GrGLDefines.h"
+#include "tests/Test.h"
const GrGLubyte* simpleGetString(GrGLenum name) {
return (const GrGLubyte*)(name == GR_GL_VERSION ? "3.0" : "");
diff --git a/tests/GrMemoryPoolTest.cpp b/tests/GrMemoryPoolTest.cpp
index 38d68c1..3eb10ce 100644
--- a/tests/GrMemoryPoolTest.cpp
+++ b/tests/GrMemoryPoolTest.cpp
@@ -5,12 +5,12 @@
* found in the LICENSE file.
*/
-#include "Test.h"
-#include "GrMemoryPool.h"
-#include "SkRandom.h"
-#include "SkTArray.h"
-#include "SkTDArray.h"
-#include "SkTemplates.h"
+#include "include/private/SkTArray.h"
+#include "include/private/SkTDArray.h"
+#include "include/private/SkTemplates.h"
+#include "include/utils/SkRandom.h"
+#include "src/gpu/GrMemoryPool.h"
+#include "tests/Test.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/GrMeshTest.cpp b/tests/GrMeshTest.cpp
index ae8251f..2930867 100644
--- a/tests/GrMeshTest.cpp
+++ b/tests/GrMeshTest.cpp
@@ -5,28 +5,28 @@
* found in the LICENSE file.
*/
-#include "SkTypes.h"
-#include "Test.h"
+#include "include/core/SkTypes.h"
+#include "tests/Test.h"
#include <array>
#include <vector>
-#include "GrCaps.h"
-#include "GrContext.h"
-#include "GrContextPriv.h"
-#include "GrGeometryProcessor.h"
-#include "GrGpuCommandBuffer.h"
-#include "GrMemoryPool.h"
-#include "GrOpFlushState.h"
-#include "GrRenderTargetContext.h"
-#include "GrRenderTargetContextPriv.h"
-#include "GrResourceKey.h"
-#include "GrResourceProvider.h"
-#include "SkBitmap.h"
-#include "SkMakeUnique.h"
-#include "glsl/GrGLSLFragmentShaderBuilder.h"
-#include "glsl/GrGLSLGeometryProcessor.h"
-#include "glsl/GrGLSLVarying.h"
-#include "glsl/GrGLSLVertexGeoBuilder.h"
+#include "include/core/SkBitmap.h"
+#include "include/gpu/GrContext.h"
+#include "include/private/GrResourceKey.h"
+#include "src/core/SkMakeUnique.h"
+#include "src/gpu/GrCaps.h"
+#include "src/gpu/GrContextPriv.h"
+#include "src/gpu/GrGeometryProcessor.h"
+#include "src/gpu/GrGpuCommandBuffer.h"
+#include "src/gpu/GrMemoryPool.h"
+#include "src/gpu/GrOpFlushState.h"
+#include "src/gpu/GrRenderTargetContext.h"
+#include "src/gpu/GrRenderTargetContextPriv.h"
+#include "src/gpu/GrResourceProvider.h"
+#include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h"
+#include "src/gpu/glsl/GrGLSLGeometryProcessor.h"
+#include "src/gpu/glsl/GrGLSLVarying.h"
+#include "src/gpu/glsl/GrGLSLVertexGeoBuilder.h"
GR_DECLARE_STATIC_UNIQUE_KEY(gIndexBufferKey);
diff --git a/tests/GrMipMappedTest.cpp b/tests/GrMipMappedTest.cpp
index 7e26a44..592d399 100644
--- a/tests/GrMipMappedTest.cpp
+++ b/tests/GrMipMappedTest.cpp
@@ -5,25 +5,25 @@
* found in the LICENSE file.
*/
-#include "SkTypes.h"
+#include "include/core/SkTypes.h"
-#include "GrBackendSurface.h"
-#include "GrBackendTextureImageGenerator.h"
-#include "GrContext.h"
-#include "GrContextPriv.h"
-#include "GrGpu.h"
-#include "GrRenderTargetContext.h"
-#include "GrSemaphore.h"
-#include "GrSurfaceProxyPriv.h"
-#include "GrTexturePriv.h"
-#include "GrTextureProxy.h"
-#include "SkCanvas.h"
-#include "SkImage_Base.h"
-#include "SkGpuDevice.h"
-#include "SkPoint.h"
-#include "SkSurface.h"
-#include "SkSurface_Gpu.h"
-#include "Test.h"
+#include "include/core/SkCanvas.h"
+#include "include/core/SkPoint.h"
+#include "include/core/SkSurface.h"
+#include "include/gpu/GrBackendSurface.h"
+#include "include/gpu/GrContext.h"
+#include "include/private/GrTextureProxy.h"
+#include "src/gpu/GrBackendTextureImageGenerator.h"
+#include "src/gpu/GrContextPriv.h"
+#include "src/gpu/GrGpu.h"
+#include "src/gpu/GrRenderTargetContext.h"
+#include "src/gpu/GrSemaphore.h"
+#include "src/gpu/GrSurfaceProxyPriv.h"
+#include "src/gpu/GrTexturePriv.h"
+#include "src/gpu/SkGpuDevice.h"
+#include "src/image/SkImage_Base.h"
+#include "src/image/SkSurface_Gpu.h"
+#include "tests/Test.h"
static constexpr int kSize = 8;
diff --git a/tests/GrOpListFlushTest.cpp b/tests/GrOpListFlushTest.cpp
index f53a7e6..b413317 100644
--- a/tests/GrOpListFlushTest.cpp
+++ b/tests/GrOpListFlushTest.cpp
@@ -5,12 +5,12 @@
* found in the LICENSE file.
*/
-#include "GrContext.h"
-#include "GrContextPriv.h"
-#include "GrGpu.h"
-#include "SkCanvas.h"
-#include "SkSurface.h"
-#include "Test.h"
+#include "include/core/SkCanvas.h"
+#include "include/core/SkSurface.h"
+#include "include/gpu/GrContext.h"
+#include "src/gpu/GrContextPriv.h"
+#include "src/gpu/GrGpu.h"
+#include "tests/Test.h"
static bool check_read(skiatest::Reporter* reporter, const SkBitmap& bitmap) {
bool result = true;
diff --git a/tests/GrPipelineDynamicStateTest.cpp b/tests/GrPipelineDynamicStateTest.cpp
index a44990a..e01d98c 100644
--- a/tests/GrPipelineDynamicStateTest.cpp
+++ b/tests/GrPipelineDynamicStateTest.cpp
@@ -5,26 +5,26 @@
* found in the LICENSE file.
*/
-#include "SkTypes.h"
-#include "Test.h"
+#include "include/core/SkTypes.h"
+#include "tests/Test.h"
-#include "GrColor.h"
-#include "GrContext.h"
-#include "GrContextPriv.h"
-#include "GrGeometryProcessor.h"
-#include "GrGpuCommandBuffer.h"
-#include "GrMemoryPool.h"
-#include "GrOpFlushState.h"
-#include "GrRecordingContext.h"
-#include "GrRecordingContextPriv.h"
-#include "GrRenderTargetContext.h"
-#include "GrRenderTargetContextPriv.h"
-#include "GrResourceProvider.h"
-#include "SkMakeUnique.h"
-#include "glsl/GrGLSLVertexGeoBuilder.h"
-#include "glsl/GrGLSLFragmentShaderBuilder.h"
-#include "glsl/GrGLSLGeometryProcessor.h"
-#include "glsl/GrGLSLVarying.h"
+#include "include/gpu/GrContext.h"
+#include "include/private/GrColor.h"
+#include "include/private/GrRecordingContext.h"
+#include "src/core/SkMakeUnique.h"
+#include "src/gpu/GrContextPriv.h"
+#include "src/gpu/GrGeometryProcessor.h"
+#include "src/gpu/GrGpuCommandBuffer.h"
+#include "src/gpu/GrMemoryPool.h"
+#include "src/gpu/GrOpFlushState.h"
+#include "src/gpu/GrRecordingContextPriv.h"
+#include "src/gpu/GrRenderTargetContext.h"
+#include "src/gpu/GrRenderTargetContextPriv.h"
+#include "src/gpu/GrResourceProvider.h"
+#include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h"
+#include "src/gpu/glsl/GrGLSLGeometryProcessor.h"
+#include "src/gpu/glsl/GrGLSLVarying.h"
+#include "src/gpu/glsl/GrGLSLVertexGeoBuilder.h"
/**
* This is a GPU-backend specific test for dynamic pipeline state. It draws boxes using dynamic
diff --git a/tests/GrPorterDuffTest.cpp b/tests/GrPorterDuffTest.cpp
index d386090..372d864 100644
--- a/tests/GrPorterDuffTest.cpp
+++ b/tests/GrPorterDuffTest.cpp
@@ -5,18 +5,18 @@
* found in the LICENSE file.
*/
-#include "Test.h"
+#include "tests/Test.h"
-#include "GrBackendSurface.h"
-#include "GrContextFactory.h"
-#include "GrContextOptions.h"
-#include "GrContextPriv.h"
-#include "GrGpu.h"
-#include "GrProxyProvider.h"
-#include "GrXferProcessor.h"
-#include "effects/GrPorterDuffXferProcessor.h"
-#include "gl/GrGLCaps.h"
-#include "ops/GrMeshDrawOp.h"
+#include "include/gpu/GrBackendSurface.h"
+#include "include/gpu/GrContextOptions.h"
+#include "src/gpu/GrContextPriv.h"
+#include "src/gpu/GrGpu.h"
+#include "src/gpu/GrProxyProvider.h"
+#include "src/gpu/GrXferProcessor.h"
+#include "src/gpu/effects/GrPorterDuffXferProcessor.h"
+#include "src/gpu/gl/GrGLCaps.h"
+#include "src/gpu/ops/GrMeshDrawOp.h"
+#include "tools/gpu/GrContextFactory.h"
////////////////////////////////////////////////////////////////////////////////
diff --git a/tests/GrQuadListTest.cpp b/tests/GrQuadListTest.cpp
index fbbfab7..a9cd9b3 100644
--- a/tests/GrQuadListTest.cpp
+++ b/tests/GrQuadListTest.cpp
@@ -5,9 +5,9 @@
* found in the LICENSE file.
*/
-#include "Test.h"
+#include "tests/Test.h"
-#include "GrQuad.h"
+#include "src/gpu/GrQuad.h"
#define ASSERT(cond) REPORTER_ASSERT(r, cond)
#define ASSERTF(cond, ...) REPORTER_ASSERT(r, cond, __VA_ARGS__)
diff --git a/tests/GrShapeTest.cpp b/tests/GrShapeTest.cpp
index 95fd74e..047ec94 100644
--- a/tests/GrShapeTest.cpp
+++ b/tests/GrShapeTest.cpp
@@ -5,15 +5,15 @@
* found in the LICENSE file.
*/
-#include "Test.h"
-#include "GrShape.h"
-#include "SkCanvas.h"
-#include "SkDashPathEffect.h"
-#include "SkPath.h"
-#include "SkPathOps.h"
-#include "SkRectPriv.h"
-#include "SkSurface.h"
-#include "SkClipOpPriv.h"
+#include "include/core/SkCanvas.h"
+#include "include/core/SkPath.h"
+#include "include/core/SkSurface.h"
+#include "include/effects/SkDashPathEffect.h"
+#include "include/pathops/SkPathOps.h"
+#include "src/core/SkClipOpPriv.h"
+#include "src/core/SkRectPriv.h"
+#include "src/gpu/GrShape.h"
+#include "tests/Test.h"
#include <initializer_list>
#include <functional>
diff --git a/tests/GrSurfaceTest.cpp b/tests/GrSurfaceTest.cpp
index d85b6f1..ffacc95 100644
--- a/tests/GrSurfaceTest.cpp
+++ b/tests/GrSurfaceTest.cpp
@@ -6,19 +6,19 @@
*/
#include <set>
-#include "GrClip.h"
-#include "GrContext.h"
-#include "GrContextPriv.h"
-#include "GrGpu.h"
-#include "GrProxyProvider.h"
-#include "GrRenderTarget.h"
-#include "GrResourceProvider.h"
-#include "GrTexture.h"
-#include "GrTexturePriv.h"
-#include "SkAutoPixmapStorage.h"
-#include "SkMipMap.h"
-#include "SkSurface.h"
-#include "Test.h"
+#include "include/core/SkSurface.h"
+#include "include/gpu/GrContext.h"
+#include "include/gpu/GrRenderTarget.h"
+#include "include/gpu/GrTexture.h"
+#include "src/core/SkAutoPixmapStorage.h"
+#include "src/core/SkMipMap.h"
+#include "src/gpu/GrClip.h"
+#include "src/gpu/GrContextPriv.h"
+#include "src/gpu/GrGpu.h"
+#include "src/gpu/GrProxyProvider.h"
+#include "src/gpu/GrResourceProvider.h"
+#include "src/gpu/GrTexturePriv.h"
+#include "tests/Test.h"
// Tests that GrSurface::asTexture(), GrSurface::asRenderTarget(), and static upcasting of texture
// and render targets to GrSurface all work as expected.
@@ -152,9 +152,9 @@
}
}
-#include "GrDrawingManager.h"
-#include "GrSurfaceProxy.h"
-#include "GrTextureContext.h"
+#include "include/private/GrSurfaceProxy.h"
+#include "src/gpu/GrDrawingManager.h"
+#include "src/gpu/GrTextureContext.h"
DEF_GPUTEST_FOR_RENDERING_CONTEXTS(InitialTextureClear, reporter, context_info) {
static constexpr int kSize = 100;
diff --git a/tests/GrTRecorderTest.cpp b/tests/GrTRecorderTest.cpp
index fcdd4b6..b62954c 100644
--- a/tests/GrTRecorderTest.cpp
+++ b/tests/GrTRecorderTest.cpp
@@ -5,12 +5,12 @@
* found in the LICENSE file.
*/
-#include "SkMatrix.h"
-#include "SkRandom.h"
-#include "SkString.h"
-#include "Test.h"
+#include "include/core/SkMatrix.h"
+#include "include/core/SkString.h"
+#include "include/utils/SkRandom.h"
+#include "tests/Test.h"
-#include "GrTRecorder.h"
+#include "src/gpu/GrTRecorder.h"
////////////////////////////////////////////////////////////////////////////////
diff --git a/tests/GrTestingBackendTextureUploadTest.cpp b/tests/GrTestingBackendTextureUploadTest.cpp
index e42c1c6..0d4f205 100644
--- a/tests/GrTestingBackendTextureUploadTest.cpp
+++ b/tests/GrTestingBackendTextureUploadTest.cpp
@@ -5,14 +5,14 @@
* found in the LICENSE file.
*/
-#include "SkTypes.h"
+#include "include/core/SkTypes.h"
-#include "GrGpu.h"
-#include "GrContextPriv.h"
-#include "GrTexture.h"
-#include "SkConvertPixels.h"
-#include "Test.h"
-#include "TestUtils.h"
+#include "include/gpu/GrTexture.h"
+#include "src/core/SkConvertPixels.h"
+#include "src/gpu/GrContextPriv.h"
+#include "src/gpu/GrGpu.h"
+#include "tests/Test.h"
+#include "tests/TestUtils.h"
void testing_only_texture_test(skiatest::Reporter* reporter, GrContext* context, GrColorType ct,
bool renderTarget, bool doDataUpload, GrMipMapped mipMapped) {
diff --git a/tests/GrTextureMipMapInvalidationTest.cpp b/tests/GrTextureMipMapInvalidationTest.cpp
index d651e35..fb57060 100644
--- a/tests/GrTextureMipMapInvalidationTest.cpp
+++ b/tests/GrTextureMipMapInvalidationTest.cpp
@@ -5,13 +5,13 @@
* found in the LICENSE file.
*/
-#include "GrContext.h"
-#include "GrContextPriv.h"
-#include "GrTexturePriv.h"
-#include "SkCanvas.h"
-#include "SkImage_Base.h"
-#include "SkSurface.h"
-#include "Test.h"
+#include "include/core/SkCanvas.h"
+#include "include/core/SkSurface.h"
+#include "include/gpu/GrContext.h"
+#include "src/gpu/GrContextPriv.h"
+#include "src/gpu/GrTexturePriv.h"
+#include "src/image/SkImage_Base.h"
+#include "tests/Test.h"
// Tests that MIP maps are created and invalidated as expected when drawing to and from GrTextures.
DEF_GPUTEST_FOR_RENDERING_CONTEXTS(GrTextureMipMapInvalidationTest, reporter, ctxInfo) {
diff --git a/tests/GrUploadPixelsTests.cpp b/tests/GrUploadPixelsTests.cpp
index cd0bac0..8daeeea 100644
--- a/tests/GrUploadPixelsTests.cpp
+++ b/tests/GrUploadPixelsTests.cpp
@@ -7,15 +7,15 @@
// This is a GPU-backend specific test. It relies on static intializers to work
-#include "SkTypes.h"
+#include "include/core/SkTypes.h"
-#include "GrContextFactory.h"
-#include "GrContextPriv.h"
-#include "GrSurfaceProxy.h"
-#include "ProxyUtils.h"
-#include "SkGr.h"
-#include "Test.h"
-#include "TestUtils.h"
+#include "include/private/GrSurfaceProxy.h"
+#include "src/gpu/GrContextPriv.h"
+#include "src/gpu/SkGr.h"
+#include "tests/Test.h"
+#include "tests/TestUtils.h"
+#include "tools/gpu/GrContextFactory.h"
+#include "tools/gpu/ProxyUtils.h"
using sk_gpu_test::GrContextFactory;
diff --git a/tests/GradientTest.cpp b/tests/GradientTest.cpp
index 3bd11b1..7d2b5e5 100644
--- a/tests/GradientTest.cpp
+++ b/tests/GradientTest.cpp
@@ -5,15 +5,15 @@
* found in the LICENSE file.
*/
-#include "SkCanvas.h"
-#include "SkColorPriv.h"
-#include "SkColorShader.h"
-#include "SkGradientShader.h"
-#include "SkShader.h"
-#include "SkSurface.h"
-#include "SkTemplates.h"
-#include "SkTLazy.h"
-#include "Test.h"
+#include "include/core/SkCanvas.h"
+#include "include/core/SkColorPriv.h"
+#include "include/core/SkShader.h"
+#include "include/core/SkSurface.h"
+#include "include/effects/SkGradientShader.h"
+#include "include/private/SkTemplates.h"
+#include "src/core/SkTLazy.h"
+#include "src/shaders/SkColorShader.h"
+#include "tests/Test.h"
// https://code.google.com/p/chromium/issues/detail?id=448299
// Giant (inverse) matrix causes overflow when converting/computing using 32.32
diff --git a/tests/HSVRoundTripTest.cpp b/tests/HSVRoundTripTest.cpp
index ab4d400..ceae56a 100644
--- a/tests/HSVRoundTripTest.cpp
+++ b/tests/HSVRoundTripTest.cpp
@@ -5,9 +5,9 @@
* found in the LICENSE file.
*/
-#include "Test.h"
+#include "tests/Test.h"
-#include "SkColor.h"
+#include "include/core/SkColor.h"
DEF_TEST(ColorToHSVRoundTrip, reporter) {
SkScalar hsv[3];
diff --git a/tests/HashTest.cpp b/tests/HashTest.cpp
index f80bd79..b60025c 100644
--- a/tests/HashTest.cpp
+++ b/tests/HashTest.cpp
@@ -5,11 +5,11 @@
* found in the LICENSE file.
*/
-#include "SkChecksum.h"
-#include "SkRefCnt.h"
-#include "SkString.h"
-#include "SkTHash.h"
-#include "Test.h"
+#include "include/core/SkRefCnt.h"
+#include "include/core/SkString.h"
+#include "include/private/SkChecksum.h"
+#include "include/private/SkTHash.h"
+#include "tests/Test.h"
// Tests use of const foreach(). map.count() is of course the better way to do this.
static int count(const SkTHashMap<int, double>& map) {
diff --git a/tests/HighContrastFilterTest.cpp b/tests/HighContrastFilterTest.cpp
index 7c3fc84..052811d 100644
--- a/tests/HighContrastFilterTest.cpp
+++ b/tests/HighContrastFilterTest.cpp
@@ -5,10 +5,10 @@
* found in the LICENSE file.
*/
-#include "SkBitmap.h"
-#include "SkCanvas.h"
-#include "SkHighContrastFilter.h"
-#include "Test.h"
+#include "include/core/SkBitmap.h"
+#include "include/core/SkCanvas.h"
+#include "include/effects/SkHighContrastFilter.h"
+#include "tests/Test.h"
DEF_TEST(HighContrastFilter_FilterImage, reporter) {
SkHighContrastConfig config;
diff --git a/tests/ICCTest.cpp b/tests/ICCTest.cpp
index 9b2cdbfe..5a52f65 100644
--- a/tests/ICCTest.cpp
+++ b/tests/ICCTest.cpp
@@ -5,13 +5,13 @@
* found in the LICENSE file.
*/
-#include "SkTypes.h"
+#include "include/core/SkTypes.h"
-#include "Resources.h"
-#include "SkColorSpacePriv.h"
-#include "SkICC.h"
-#include "SkString.h"
-#include "Test.h"
+#include "include/core/SkICC.h"
+#include "include/core/SkString.h"
+#include "src/core/SkColorSpacePriv.h"
+#include "tests/Test.h"
+#include "tools/Resources.h"
#include "skcms.h"
diff --git a/tests/ImageCacheTest.cpp b/tests/ImageCacheTest.cpp
index 457df91..39c2e16 100644
--- a/tests/ImageCacheTest.cpp
+++ b/tests/ImageCacheTest.cpp
@@ -5,9 +5,9 @@
* found in the LICENSE file.
*/
-#include "SkDiscardableMemory.h"
-#include "SkResourceCache.h"
-#include "Test.h"
+#include "src/core/SkDiscardableMemory.h"
+#include "src/core/SkResourceCache.h"
+#include "tests/Test.h"
namespace {
static void* gGlobalAddress;
@@ -105,7 +105,7 @@
}
}
-#include "SkDiscardableMemoryPool.h"
+#include "src/lazy/SkDiscardableMemoryPool.h"
static SkDiscardableMemoryPool* gPool;
static SkDiscardableMemory* pool_factory(size_t bytes) {
diff --git a/tests/ImageFilterCacheTest.cpp b/tests/ImageFilterCacheTest.cpp
index a21538f..e4388d9 100644
--- a/tests/ImageFilterCacheTest.cpp
+++ b/tests/ImageFilterCacheTest.cpp
@@ -5,16 +5,16 @@
* found in the LICENSE file.
*/
-#include "Test.h"
+#include "tests/Test.h"
-#include "SkBitmap.h"
-#include "SkColorFilter.h"
-#include "SkColorFilterImageFilter.h"
-#include "SkImage.h"
-#include "SkImageFilter.h"
-#include "SkImageFilterCache.h"
-#include "SkMatrix.h"
-#include "SkSpecialImage.h"
+#include "include/core/SkBitmap.h"
+#include "include/core/SkColorFilter.h"
+#include "include/core/SkImage.h"
+#include "include/core/SkImageFilter.h"
+#include "include/core/SkMatrix.h"
+#include "include/effects/SkColorFilterImageFilter.h"
+#include "src/core/SkImageFilterCache.h"
+#include "src/core/SkSpecialImage.h"
static const int kSmallerSize = 10;
static const int kPad = 3;
@@ -191,13 +191,13 @@
test_image_backed(reporter, nullptr, srcImage);
}
-#include "GrContext.h"
-#include "GrContextPriv.h"
-#include "GrProxyProvider.h"
-#include "GrResourceProvider.h"
-#include "GrSurfaceProxyPriv.h"
-#include "GrTexture.h"
-#include "GrTextureProxy.h"
+#include "include/gpu/GrContext.h"
+#include "include/gpu/GrTexture.h"
+#include "include/private/GrTextureProxy.h"
+#include "src/gpu/GrContextPriv.h"
+#include "src/gpu/GrProxyProvider.h"
+#include "src/gpu/GrResourceProvider.h"
+#include "src/gpu/GrSurfaceProxyPriv.h"
static sk_sp<GrTextureProxy> create_proxy(GrProxyProvider* proxyProvider) {
SkBitmap srcBM = create_bm();
diff --git a/tests/ImageFilterTest.cpp b/tests/ImageFilterTest.cpp
index b40f17e..95d07d6 100644
--- a/tests/ImageFilterTest.cpp
+++ b/tests/ImageFilterTest.cpp
@@ -5,45 +5,45 @@
* found in the LICENSE file.
*/
-#include "Resources.h"
-#include "SkArithmeticImageFilter.h"
-#include "SkBitmap.h"
-#include "SkBlurImageFilter.h"
-#include "SkCanvas.h"
-#include "SkColorFilterImageFilter.h"
-#include "SkColorMatrixFilter.h"
-#include "SkComposeImageFilter.h"
-#include "SkDisplacementMapEffect.h"
-#include "SkDropShadowImageFilter.h"
-#include "SkGradientShader.h"
-#include "SkImage.h"
-#include "SkImageFilterPriv.h"
-#include "SkImageSource.h"
-#include "SkLightingImageFilter.h"
-#include "SkMatrixConvolutionImageFilter.h"
-#include "SkMergeImageFilter.h"
-#include "SkMorphologyImageFilter.h"
-#include "SkOffsetImageFilter.h"
-#include "SkPaintImageFilter.h"
-#include "SkPerlinNoiseShader.h"
-#include "SkPicture.h"
-#include "SkPictureImageFilter.h"
-#include "SkPictureRecorder.h"
-#include "SkPoint3.h"
-#include "SkReadBuffer.h"
-#include "SkRect.h"
-#include "SkSpecialImage.h"
-#include "SkSpecialSurface.h"
-#include "SkSurface.h"
-#include "SkTableColorFilter.h"
-#include "SkTileImageFilter.h"
-#include "SkXfermodeImageFilter.h"
-#include "Test.h"
-#include "ToolUtils.h"
+#include "include/core/SkBitmap.h"
+#include "include/core/SkCanvas.h"
+#include "include/core/SkImage.h"
+#include "include/core/SkPicture.h"
+#include "include/core/SkPictureRecorder.h"
+#include "include/core/SkPoint3.h"
+#include "include/core/SkRect.h"
+#include "include/core/SkSurface.h"
+#include "include/effects/SkArithmeticImageFilter.h"
+#include "include/effects/SkBlurImageFilter.h"
+#include "include/effects/SkColorFilterImageFilter.h"
+#include "include/effects/SkColorMatrixFilter.h"
+#include "include/effects/SkComposeImageFilter.h"
+#include "include/effects/SkDisplacementMapEffect.h"
+#include "include/effects/SkDropShadowImageFilter.h"
+#include "include/effects/SkGradientShader.h"
+#include "include/effects/SkImageSource.h"
+#include "include/effects/SkLightingImageFilter.h"
+#include "include/effects/SkMatrixConvolutionImageFilter.h"
+#include "include/effects/SkMergeImageFilter.h"
+#include "include/effects/SkMorphologyImageFilter.h"
+#include "include/effects/SkOffsetImageFilter.h"
+#include "include/effects/SkPaintImageFilter.h"
+#include "include/effects/SkPerlinNoiseShader.h"
+#include "include/effects/SkPictureImageFilter.h"
+#include "include/effects/SkTableColorFilter.h"
+#include "include/effects/SkTileImageFilter.h"
+#include "include/effects/SkXfermodeImageFilter.h"
+#include "src/core/SkImageFilterPriv.h"
+#include "src/core/SkReadBuffer.h"
+#include "src/core/SkSpecialImage.h"
+#include "src/core/SkSpecialSurface.h"
+#include "tests/Test.h"
+#include "tools/Resources.h"
+#include "tools/ToolUtils.h"
-#include "GrCaps.h"
-#include "GrContext.h"
-#include "GrContextPriv.h"
+#include "include/gpu/GrContext.h"
+#include "src/gpu/GrCaps.h"
+#include "src/gpu/GrContextPriv.h"
static const int kBitmapSize = 4;
diff --git a/tests/ImageFrom565Bitmap.cpp b/tests/ImageFrom565Bitmap.cpp
index 53f65df..037010e 100644
--- a/tests/ImageFrom565Bitmap.cpp
+++ b/tests/ImageFrom565Bitmap.cpp
@@ -5,10 +5,10 @@
* found in the LICENSE file.
*/
-#include "SkBitmap.h"
-#include "SkImageInfo.h"
-#include "SkImage.h"
-#include "Test.h"
+#include "include/core/SkBitmap.h"
+#include "include/core/SkImage.h"
+#include "include/core/SkImageInfo.h"
+#include "tests/Test.h"
DEF_TEST(ImageFrom565Bitmap, r) {
SkBitmap bm;
diff --git a/tests/ImageGeneratorTest.cpp b/tests/ImageGeneratorTest.cpp
index 790b422..c33ab96 100644
--- a/tests/ImageGeneratorTest.cpp
+++ b/tests/ImageGeneratorTest.cpp
@@ -5,19 +5,19 @@
* found in the LICENSE file.
*/
-#include "SkData.h"
-#include "SkCanvas.h"
+#include "include/core/SkCanvas.h"
+#include "include/core/SkData.h"
-#include "SkGraphics.h"
-#include "SkImageGenerator.h"
-#include "SkImageInfoPriv.h"
-#include "SkYUVAIndex.h"
-#include "Test.h"
+#include "include/core/SkGraphics.h"
+#include "include/core/SkImageGenerator.h"
+#include "include/core/SkYUVAIndex.h"
+#include "include/private/SkImageInfoPriv.h"
+#include "tests/Test.h"
#if defined(SK_BUILD_FOR_MAC) || defined(SK_BUILD_FOR_IOS)
- #include "SkImageGeneratorCG.h"
+ #include "include/ports/SkImageGeneratorCG.h"
#elif defined(SK_BUILD_FOR_WIN)
- #include "SkImageGeneratorWIC.h"
+ #include "include/ports/SkImageGeneratorWIC.h"
#endif
static bool gMyFactoryWasCalled;
@@ -96,8 +96,8 @@
}
}
-#include "SkAutoMalloc.h"
-#include "SkPictureRecorder.h"
+#include "include/core/SkPictureRecorder.h"
+#include "src/core/SkAutoMalloc.h"
static sk_sp<SkPicture> make_picture() {
SkPictureRecorder recorder;
diff --git a/tests/ImageIsOpaqueTest.cpp b/tests/ImageIsOpaqueTest.cpp
index 8a2c816..d7fced9 100644
--- a/tests/ImageIsOpaqueTest.cpp
+++ b/tests/ImageIsOpaqueTest.cpp
@@ -5,16 +5,16 @@
* found in the LICENSE file.
*/
-#include "SkTypes.h"
-#include "Resources.h"
-#include "Test.h"
+#include "include/core/SkTypes.h"
+#include "tests/Test.h"
+#include "tools/Resources.h"
-#include "GrContext.h"
-#include "SkCanvas.h"
-#include "SkImage.h"
-#include "SkSurface.h"
-#include "SkReadBuffer.h"
-#include "SkWriteBuffer.h"
+#include "include/core/SkCanvas.h"
+#include "include/core/SkImage.h"
+#include "include/core/SkSurface.h"
+#include "include/gpu/GrContext.h"
+#include "src/core/SkReadBuffer.h"
+#include "src/core/SkWriteBuffer.h"
static void check_isopaque(skiatest::Reporter* reporter, const sk_sp<SkSurface>& surface,
bool expectedOpaque) {
@@ -45,7 +45,7 @@
}
///////////////////////////////////////////////////////////////////////////////////////////////////
-#include "SkPictureRecorder.h"
+#include "include/core/SkPictureRecorder.h"
static sk_sp<SkPicture> make_picture() {
SkPictureRecorder recorder;
diff --git a/tests/ImageNewShaderTest.cpp b/tests/ImageNewShaderTest.cpp
index d96a59f..6dae947 100644
--- a/tests/ImageNewShaderTest.cpp
+++ b/tests/ImageNewShaderTest.cpp
@@ -5,14 +5,14 @@
* found in the LICENSE file.
*/
-#include "SkCanvas.h"
-#include "SkImage.h"
-#include "SkShader.h"
-#include "SkSurface.h"
-#include "SkTypes.h"
-#include "Test.h"
+#include "include/core/SkCanvas.h"
+#include "include/core/SkImage.h"
+#include "include/core/SkShader.h"
+#include "include/core/SkSurface.h"
+#include "include/core/SkTypes.h"
+#include "tests/Test.h"
-#include "GrContext.h"
+#include "include/gpu/GrContext.h"
static void test_bitmap_equality(skiatest::Reporter* reporter, SkBitmap& bm1, SkBitmap& bm2) {
REPORTER_ASSERT(reporter, bm1.computeByteSize() == bm2.computeByteSize());
diff --git a/tests/ImageTest.cpp b/tests/ImageTest.cpp
index f7fa7af..0bd5db1 100644
--- a/tests/ImageTest.cpp
+++ b/tests/ImageTest.cpp
@@ -9,34 +9,34 @@
#include <initializer_list>
#include <vector>
-#include "SkAutoPixmapStorage.h"
-#include "SkBitmap.h"
-#include "SkCanvas.h"
-#include "SkColorSpacePriv.h"
-#include "SkData.h"
-#include "SkImageEncoder.h"
-#include "SkImageGenerator.h"
-#include "SkImage_Base.h"
-#include "SkImagePriv.h"
-#include "SkMakeUnique.h"
-#include "SkPicture.h"
-#include "SkPictureRecorder.h"
-#include "SkRRect.h"
-#include "SkSerialProcs.h"
-#include "SkStream.h"
-#include "SkSurface.h"
-#include "SkUtils.h"
-#include "Test.h"
+#include "include/core/SkBitmap.h"
+#include "include/core/SkCanvas.h"
+#include "include/core/SkData.h"
+#include "include/core/SkImageEncoder.h"
+#include "include/core/SkImageGenerator.h"
+#include "include/core/SkPicture.h"
+#include "include/core/SkPictureRecorder.h"
+#include "include/core/SkRRect.h"
+#include "include/core/SkSerialProcs.h"
+#include "include/core/SkStream.h"
+#include "include/core/SkSurface.h"
+#include "src/core/SkAutoPixmapStorage.h"
+#include "src/core/SkColorSpacePriv.h"
+#include "src/core/SkImagePriv.h"
+#include "src/core/SkMakeUnique.h"
+#include "src/core/SkUtils.h"
+#include "src/image/SkImage_Base.h"
+#include "tests/Test.h"
-#include "Resources.h"
-#include "ToolUtils.h"
+#include "tools/Resources.h"
+#include "tools/ToolUtils.h"
-#include "GrContextPriv.h"
-#include "GrContextThreadSafeProxy.h"
-#include "GrGpu.h"
-#include "GrResourceCache.h"
-#include "GrTexture.h"
-#include "SkGr.h"
+#include "include/gpu/GrContextThreadSafeProxy.h"
+#include "include/gpu/GrTexture.h"
+#include "src/gpu/GrContextPriv.h"
+#include "src/gpu/GrGpu.h"
+#include "src/gpu/GrResourceCache.h"
+#include "src/gpu/SkGr.h"
using namespace sk_gpu_test;
@@ -324,7 +324,7 @@
///////////////////////////////////////////////////////////////////////////////////////////////////
-#include "SkBitmapCache.h"
+#include "src/core/SkBitmapCache.h"
/*
* This tests the caching (and preemptive purge) of the raster equivalent of a gpu-image.
diff --git a/tests/IncrTopoSortTest.cpp b/tests/IncrTopoSortTest.cpp
index a950785..93fedb7 100644
--- a/tests/IncrTopoSortTest.cpp
+++ b/tests/IncrTopoSortTest.cpp
@@ -5,11 +5,11 @@
* found in the LICENSE file.
*/
-#include "SkRefCnt.h"
-#include "SkTSort.h"
-#include "Test.h"
+#include "include/core/SkRefCnt.h"
+#include "src/core/SkTSort.h"
+#include "tests/Test.h"
-#include "ToolUtils.h"
+#include "tools/ToolUtils.h"
// A node in the graph. This corresponds to an opList in the MDB world.
class Node : public SkRefCnt {
diff --git a/tests/IndexedPngOverflowTest.cpp b/tests/IndexedPngOverflowTest.cpp
index 1a48b64..45d21e3 100644
--- a/tests/IndexedPngOverflowTest.cpp
+++ b/tests/IndexedPngOverflowTest.cpp
@@ -5,12 +5,12 @@
* found in the LICENSE file.
*/
-#include "CodecPriv.h"
-#include "SkBitmap.h"
-#include "SkCanvas.h"
-#include "SkImageInfo.h"
-#include "SkSurface.h"
-#include "Test.h"
+#include "include/core/SkBitmap.h"
+#include "include/core/SkCanvas.h"
+#include "include/core/SkImageInfo.h"
+#include "include/core/SkSurface.h"
+#include "tests/CodecPriv.h"
+#include "tests/Test.h"
// A 20x1 image with 8 bits per pixel and a palette size of 2. Pixel values are 255, 254... Run
// this test with ASAN to make sure we don't try to access before/after any palette-sized buffers.
diff --git a/tests/InfRectTest.cpp b/tests/InfRectTest.cpp
index af00bc9..5a6ec22 100644
--- a/tests/InfRectTest.cpp
+++ b/tests/InfRectTest.cpp
@@ -5,10 +5,10 @@
* found in the LICENSE file.
*/
-#include "SkFloatingPoint.h"
-#include "SkRandom.h"
-#include "SkRect.h"
-#include "Test.h"
+#include "include/core/SkRect.h"
+#include "include/private/SkFloatingPoint.h"
+#include "include/utils/SkRandom.h"
+#include "tests/Test.h"
static void check_invalid(skiatest::Reporter* reporter,
SkScalar l, SkScalar t, SkScalar r, SkScalar b) {
diff --git a/tests/InsetConvexPolyTest.cpp b/tests/InsetConvexPolyTest.cpp
index aaaf591..fa25843 100644
--- a/tests/InsetConvexPolyTest.cpp
+++ b/tests/InsetConvexPolyTest.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 "Test.h"
-#include "SkPolyUtils.h"
+#include "src/utils/SkPolyUtils.h"
+#include "tests/Test.h"
DEF_TEST(InsetConvexPoly, reporter) {
SkTDArray<SkPoint> rrectPoly;
diff --git a/tests/InterpolatorTest.cpp b/tests/InterpolatorTest.cpp
index 8ba1bda..813d2bf 100644
--- a/tests/InterpolatorTest.cpp
+++ b/tests/InterpolatorTest.cpp
@@ -5,9 +5,9 @@
* found in the LICENSE file.
*/
-#include "SkInterpolator.h"
+#include "include/utils/SkInterpolator.h"
-#include "Test.h"
+#include "tests/Test.h"
static SkScalar* iset(SkScalar array[3], int a, int b, int c) {
array[0] = SkIntToScalar(a);
diff --git a/tests/InvalidIndexedPngTest.cpp b/tests/InvalidIndexedPngTest.cpp
index 5d9632d..273648f 100644
--- a/tests/InvalidIndexedPngTest.cpp
+++ b/tests/InvalidIndexedPngTest.cpp
@@ -5,9 +5,9 @@
* found in the LICENSE file.
*/
-#include "CodecPriv.h"
-#include "SkBitmap.h"
-#include "Test.h"
+#include "include/core/SkBitmap.h"
+#include "tests/CodecPriv.h"
+#include "tests/Test.h"
// A valid 1x1 indexed PNG.
unsigned char gPngData[] = {
diff --git a/tests/IsClosedSingleContourTest.cpp b/tests/IsClosedSingleContourTest.cpp
index b550998..ad6a4a2 100644
--- a/tests/IsClosedSingleContourTest.cpp
+++ b/tests/IsClosedSingleContourTest.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 "Test.h"
-#include "SkPathPriv.h"
+#include "src/core/SkPathPriv.h"
+#include "tests/Test.h"
DEF_TEST(IsClosedSingleContourTest, reporter) {
SkPath p;
diff --git a/tests/JSONTest.cpp b/tests/JSONTest.cpp
index f5b71bb..fface4a 100644
--- a/tests/JSONTest.cpp
+++ b/tests/JSONTest.cpp
@@ -5,12 +5,12 @@
* found in the LICENSE file.
*/
-#include "Test.h"
+#include "tests/Test.h"
-#include "SkArenaAlloc.h"
-#include "SkJSON.h"
-#include "SkString.h"
-#include "SkStream.h"
+#include "include/core/SkStream.h"
+#include "include/core/SkString.h"
+#include "include/private/SkArenaAlloc.h"
+#include "src/utils/SkJSON.h"
using namespace skjson;
diff --git a/tests/LListTest.cpp b/tests/LListTest.cpp
index f11e325..9735aee 100644
--- a/tests/LListTest.cpp
+++ b/tests/LListTest.cpp
@@ -5,10 +5,10 @@
* found in the LICENSE file.
*/
-#include "SkRandom.h"
-#include "SkTInternalLList.h"
-#include "SkTLList.h"
-#include "Test.h"
+#include "include/private/SkTInternalLList.h"
+#include "include/utils/SkRandom.h"
+#include "src/core/SkTLList.h"
+#include "tests/Test.h"
class ListElement {
public:
diff --git a/tests/LRUCacheTest.cpp b/tests/LRUCacheTest.cpp
index 6a65e4a..5436fcd 100644
--- a/tests/LRUCacheTest.cpp
+++ b/tests/LRUCacheTest.cpp
@@ -5,8 +5,8 @@
* found in the LICENSE file.
*/
-#include "SkLRUCache.h"
-#include "Test.h"
+#include "src/core/SkLRUCache.h"
+#include "tests/Test.h"
struct Value {
Value(int value, int* counter)
diff --git a/tests/LayerDrawLooperTest.cpp b/tests/LayerDrawLooperTest.cpp
index e0d082a..18a756f 100644
--- a/tests/LayerDrawLooperTest.cpp
+++ b/tests/LayerDrawLooperTest.cpp
@@ -5,18 +5,18 @@
* found in the LICENSE file.
*/
-#include "SkArenaAlloc.h"
-#include "SkBitmap.h"
-#include "SkBitmapDevice.h"
-#include "SkCanvas.h"
-#include "SkDraw.h"
-#include "SkLayerDrawLooper.h"
-#include "SkMatrix.h"
-#include "SkPaint.h"
-#include "SkRect.h"
-#include "SkRefCnt.h"
-#include "SkScalar.h"
-#include "Test.h"
+#include "include/core/SkBitmap.h"
+#include "include/core/SkCanvas.h"
+#include "include/core/SkMatrix.h"
+#include "include/core/SkPaint.h"
+#include "include/core/SkRect.h"
+#include "include/core/SkRefCnt.h"
+#include "include/core/SkScalar.h"
+#include "include/effects/SkLayerDrawLooper.h"
+#include "include/private/SkArenaAlloc.h"
+#include "src/core/SkBitmapDevice.h"
+#include "src/core/SkDraw.h"
+#include "tests/Test.h"
static SkBitmap make_bm(int w, int h) {
SkBitmap bm;
diff --git a/tests/LazyProxyTest.cpp b/tests/LazyProxyTest.cpp
index 3e52d4a..e3a935f 100644
--- a/tests/LazyProxyTest.cpp
+++ b/tests/LazyProxyTest.cpp
@@ -5,26 +5,26 @@
* found in the LICENSE file.
*/
-#include "Test.h"
+#include "tests/Test.h"
-#include "GrClip.h"
-#include "GrContextPriv.h"
-#include "GrMemoryPool.h"
-#include "GrOnFlushResourceProvider.h"
-#include "GrProxyProvider.h"
-#include "GrRecordingContextPriv.h"
-#include "GrRenderTargetContext.h"
-#include "GrRenderTargetContextPriv.h"
-#include "GrSurfaceProxy.h"
-#include "GrSurfaceProxyPriv.h"
-#include "GrTexture.h"
-#include "GrTextureProxy.h"
-#include "GrTextureProxyPriv.h"
-#include "SkExchange.h"
-#include "SkMakeUnique.h"
-#include "SkRectPriv.h"
-#include "mock/GrMockGpu.h"
-#include "mock/GrMockTypes.h"
+#include "include/gpu/GrTexture.h"
+#include "include/gpu/mock/GrMockTypes.h"
+#include "include/private/GrSurfaceProxy.h"
+#include "include/private/GrTextureProxy.h"
+#include "src/core/SkExchange.h"
+#include "src/core/SkMakeUnique.h"
+#include "src/core/SkRectPriv.h"
+#include "src/gpu/GrClip.h"
+#include "src/gpu/GrContextPriv.h"
+#include "src/gpu/GrMemoryPool.h"
+#include "src/gpu/GrOnFlushResourceProvider.h"
+#include "src/gpu/GrProxyProvider.h"
+#include "src/gpu/GrRecordingContextPriv.h"
+#include "src/gpu/GrRenderTargetContext.h"
+#include "src/gpu/GrRenderTargetContextPriv.h"
+#include "src/gpu/GrSurfaceProxyPriv.h"
+#include "src/gpu/GrTextureProxyPriv.h"
+#include "src/gpu/mock/GrMockGpu.h"
// This test verifies that lazy proxy callbacks get invoked during flush, after onFlush callbacks,
// but before Ops are executed. It also ensures that lazy proxy callbacks are invoked both for
diff --git a/tests/MD5Test.cpp b/tests/MD5Test.cpp
index 9e08738..cf03d4f 100644
--- a/tests/MD5Test.cpp
+++ b/tests/MD5Test.cpp
@@ -5,8 +5,8 @@
* found in the LICENSE file.
*/
-#include "SkMD5.h"
-#include "Test.h"
+#include "src/core/SkMD5.h"
+#include "tests/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/MallocPixelRefTest.cpp b/tests/MallocPixelRefTest.cpp
index ac08099..fb1badb 100644
--- a/tests/MallocPixelRefTest.cpp
+++ b/tests/MallocPixelRefTest.cpp
@@ -5,10 +5,10 @@
* found in the LICENSE file.
*/
-#include "SkAutoMalloc.h"
-#include "SkData.h"
-#include "SkMallocPixelRef.h"
-#include "Test.h"
+#include "include/core/SkData.h"
+#include "include/core/SkMallocPixelRef.h"
+#include "src/core/SkAutoMalloc.h"
+#include "tests/Test.h"
static void delete_uint8_proc(void* ptr, void*) {
delete[] static_cast<uint8_t*>(ptr);
diff --git a/tests/MaskCacheTest.cpp b/tests/MaskCacheTest.cpp
index 34e3edf..6ed2ca4 100644
--- a/tests/MaskCacheTest.cpp
+++ b/tests/MaskCacheTest.cpp
@@ -5,10 +5,10 @@
* found in the LICENSE file.
*/
-#include "SkCachedData.h"
-#include "SkMaskCache.h"
-#include "SkResourceCache.h"
-#include "Test.h"
+#include "src/core/SkCachedData.h"
+#include "src/core/SkMaskCache.h"
+#include "src/core/SkResourceCache.h"
+#include "tests/Test.h"
enum LockedState {
kUnlocked,
diff --git a/tests/MathTest.cpp b/tests/MathTest.cpp
index 89e25b0..26eff95 100644
--- a/tests/MathTest.cpp
+++ b/tests/MathTest.cpp
@@ -5,16 +5,16 @@
* found in the LICENSE file.
*/
-#include "SkColorData.h"
-#include "SkEndian.h"
-#include "SkFDot6.h"
-#include "SkFixed.h"
-#include "SkHalf.h"
-#include "SkMathPriv.h"
-#include "SkPoint.h"
-#include "SkRandom.h"
-#include "SkTo.h"
-#include "Test.h"
+#include "include/core/SkPoint.h"
+#include "include/private/SkColorData.h"
+#include "include/private/SkFixed.h"
+#include "include/private/SkHalf.h"
+#include "include/private/SkTo.h"
+#include "include/utils/SkRandom.h"
+#include "src/core/SkEndian.h"
+#include "src/core/SkFDot6.h"
+#include "src/core/SkMathPriv.h"
+#include "tests/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 d0311f3..ceac97c 100644
--- a/tests/Matrix44Test.cpp
+++ b/tests/Matrix44Test.cpp
@@ -5,9 +5,9 @@
* found in the LICENSE file.
*/
-#include "SkMatrix44.h"
-#include "SkPoint3.h"
-#include "Test.h"
+#include "include/core/SkMatrix44.h"
+#include "include/core/SkPoint3.h"
+#include "tests/Test.h"
static bool nearly_equal_double(double a, double b) {
const double tolerance = 1e-7;
diff --git a/tests/MatrixClipCollapseTest.cpp b/tests/MatrixClipCollapseTest.cpp
index 3d2db4e..c38ed56 100644
--- a/tests/MatrixClipCollapseTest.cpp
+++ b/tests/MatrixClipCollapseTest.cpp
@@ -5,12 +5,12 @@
* found in the LICENSE file.
*/
-#include "DebugCanvas.h"
-#include "SkCanvas.h"
-#include "SkPicture.h"
-#include "SkPictureFlat.h"
-#include "SkPictureRecord.h"
-#include "Test.h"
+#include "include/core/SkCanvas.h"
+#include "include/core/SkPicture.h"
+#include "src/core/SkPictureFlat.h"
+#include "src/core/SkPictureRecord.h"
+#include "tests/Test.h"
+#include "tools/debugger/DebugCanvas.h"
// This test exercises the Matrix/Clip State collapsing system. It generates
// example skps and the compares the actual stored operations to the expected
diff --git a/tests/MatrixTest.cpp b/tests/MatrixTest.cpp
index 87b2623..9a996a9 100644
--- a/tests/MatrixTest.cpp
+++ b/tests/MatrixTest.cpp
@@ -5,12 +5,12 @@
* found in the LICENSE file.
*/
-#include "SkMath.h"
-#include "SkMatrixPriv.h"
-#include "SkMatrixUtils.h"
-#include "SkPoint3.h"
-#include "SkRandom.h"
-#include "Test.h"
+#include "include/core/SkMath.h"
+#include "include/core/SkPoint3.h"
+#include "include/utils/SkRandom.h"
+#include "src/core/SkMatrixPriv.h"
+#include "src/core/SkMatrixUtils.h"
+#include "tests/Test.h"
static bool nearly_equal_scalar(SkScalar a, SkScalar b) {
const SkScalar tolerance = SK_Scalar1 / 200000;
diff --git a/tests/MemoryTest.cpp b/tests/MemoryTest.cpp
index c7eff30..9e5d5d3 100644
--- a/tests/MemoryTest.cpp
+++ b/tests/MemoryTest.cpp
@@ -1,4 +1,4 @@
-#include "Test.h"
+#include "tests/Test.h"
DEF_TEST(memory_calloc, reporter) {
const size_t kNum = 200;
diff --git a/tests/MemsetTest.cpp b/tests/MemsetTest.cpp
index b68844c..2e4e028 100644
--- a/tests/MemsetTest.cpp
+++ b/tests/MemsetTest.cpp
@@ -5,9 +5,9 @@
* found in the LICENSE file.
*/
-#include "SkRandom.h"
-#include "SkUtils.h"
-#include "Test.h"
+#include "include/utils/SkRandom.h"
+#include "src/core/SkUtils.h"
+#include "tests/Test.h"
static void set_zero(void* dst, size_t bytes) {
char* ptr = (char*)dst;
diff --git a/tests/MessageBusTest.cpp b/tests/MessageBusTest.cpp
index d184149..1bc4dbb 100644
--- a/tests/MessageBusTest.cpp
+++ b/tests/MessageBusTest.cpp
@@ -5,8 +5,8 @@
* found in the LICENSE file.
*/
-#include "SkMessageBus.h"
-#include "Test.h"
+#include "include/private/SkMessageBus.h"
+#include "tests/Test.h"
namespace {
diff --git a/tests/MetaDataTest.cpp b/tests/MetaDataTest.cpp
index 2567398..7e9a774 100644
--- a/tests/MetaDataTest.cpp
+++ b/tests/MetaDataTest.cpp
@@ -5,9 +5,9 @@
* found in the LICENSE file.
*/
-#include "SkMetaData.h"
-#include "Test.h"
-#include "SkRefCnt.h"
+#include "include/core/SkRefCnt.h"
+#include "src/utils/SkMetaData.h"
+#include "tests/Test.h"
static void test_ptrs(skiatest::Reporter* reporter) {
SkRefCnt ref;
diff --git a/tests/MipMapTest.cpp b/tests/MipMapTest.cpp
index f90704f..da241de 100644
--- a/tests/MipMapTest.cpp
+++ b/tests/MipMapTest.cpp
@@ -5,10 +5,10 @@
* found in the LICENSE file.
*/
-#include "SkBitmap.h"
-#include "SkMipMap.h"
-#include "SkRandom.h"
-#include "Test.h"
+#include "include/core/SkBitmap.h"
+#include "include/utils/SkRandom.h"
+#include "src/core/SkMipMap.h"
+#include "tests/Test.h"
static void make_bitmap(SkBitmap* bm, int width, int height) {
bm->allocN32Pixels(width, height);
diff --git a/tests/NonlinearBlendingTest.cpp b/tests/NonlinearBlendingTest.cpp
index fdd4b74..9c1d286 100644
--- a/tests/NonlinearBlendingTest.cpp
+++ b/tests/NonlinearBlendingTest.cpp
@@ -6,9 +6,9 @@
*/
#include "skcms.h"
-#include "SkColorSpace.h"
-#include "SkColorSpaceXformSteps.h"
-#include "Test.h"
+#include "include/core/SkColorSpace.h"
+#include "src/core/SkColorSpaceXformSteps.h"
+#include "tests/Test.h"
DEF_TEST(SkColorSpaceXformSteps_vs_skcms, r) {
auto srgb = SkColorSpace::MakeSRGB();
diff --git a/tests/OSPathTest.cpp b/tests/OSPathTest.cpp
index 22deff8..9a39428 100644
--- a/tests/OSPathTest.cpp
+++ b/tests/OSPathTest.cpp
@@ -5,9 +5,9 @@
* found in the LICENSE file.
*/
-#include "SkOSPath.h"
-#include "SkString.h"
-#include "Test.h"
+#include "include/core/SkString.h"
+#include "src/utils/SkOSPath.h"
+#include "tests/Test.h"
/**
* Test SkOSPath::Join, SkOSPath::Basename, and SkOSPath::Dirname.
diff --git a/tests/OffsetSimplePolyTest.cpp b/tests/OffsetSimplePolyTest.cpp
index 0f4f18f..965a9c9 100644
--- a/tests/OffsetSimplePolyTest.cpp
+++ b/tests/OffsetSimplePolyTest.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 "Test.h"
-#include "SkPolyUtils.h"
+#include "src/utils/SkPolyUtils.h"
+#include "tests/Test.h"
DEF_TEST(OffsetSimplePoly, reporter) {
SkTDArray<SkPoint> rrectPoly;
diff --git a/tests/OnFlushCallbackTest.cpp b/tests/OnFlushCallbackTest.cpp
index c560d6c..12d2767 100644
--- a/tests/OnFlushCallbackTest.cpp
+++ b/tests/OnFlushCallbackTest.cpp
@@ -5,23 +5,23 @@
* found in the LICENSE file.
*/
-#include "Test.h"
+#include "tests/Test.h"
-#include "GrBackendSemaphore.h"
-#include "GrClip.h"
-#include "GrContextPriv.h"
-#include "GrDefaultGeoProcFactory.h"
-#include "GrOnFlushResourceProvider.h"
-#include "GrProxyProvider.h"
-#include "GrQuad.h"
-#include "GrRenderTargetContextPriv.h"
-#include "GrResourceProvider.h"
-#include "GrTexture.h"
+#include "include/gpu/GrBackendSemaphore.h"
+#include "include/gpu/GrTexture.h"
+#include "src/gpu/GrClip.h"
+#include "src/gpu/GrContextPriv.h"
+#include "src/gpu/GrDefaultGeoProcFactory.h"
+#include "src/gpu/GrOnFlushResourceProvider.h"
+#include "src/gpu/GrProxyProvider.h"
+#include "src/gpu/GrQuad.h"
+#include "src/gpu/GrRenderTargetContextPriv.h"
+#include "src/gpu/GrResourceProvider.h"
-#include "SkBitmap.h"
-#include "SkPointPriv.h"
-#include "effects/generated/GrSimpleTextureEffect.h"
-#include "ops/GrSimpleMeshDrawOpHelper.h"
+#include "include/core/SkBitmap.h"
+#include "src/core/SkPointPriv.h"
+#include "src/gpu/effects/generated/GrSimpleTextureEffect.h"
+#include "src/gpu/ops/GrSimpleMeshDrawOpHelper.h"
namespace {
// This is a simplified mesh drawing op that can be used in the atlas generation test.
@@ -473,8 +473,8 @@
// atlas
#if 0
#include "SkGrPriv.h"
-#include "SkImageEncoder.h"
-#include "ToolUtils.h"
+#include "include/core/SkImageEncoder.h"
+#include "tools/ToolUtils.h"
static void save_bm(const SkBitmap& bm, const char name[]) {
bool result = ToolUtils::EncodeImageToFile(name, bm, SkEncodedImageFormat::kPNG, 100);
diff --git a/tests/OnceTest.cpp b/tests/OnceTest.cpp
index ef8d3d9..fdc6437 100644
--- a/tests/OnceTest.cpp
+++ b/tests/OnceTest.cpp
@@ -5,9 +5,9 @@
* found in the LICENSE file.
*/
-#include "SkOnce.h"
-#include "SkTaskGroup.h"
-#include "Test.h"
+#include "include/private/SkOnce.h"
+#include "src/core/SkTaskGroup.h"
+#include "tests/Test.h"
static void add_five(int* x) {
*x += 5;
diff --git a/tests/OpChainTest.cpp b/tests/OpChainTest.cpp
index 576f807..046881f 100644
--- a/tests/OpChainTest.cpp
+++ b/tests/OpChainTest.cpp
@@ -5,13 +5,13 @@
* found in the LICENSE file.
*/
-#include "GrContext.h"
-#include "GrContextPriv.h"
-#include "GrMemoryPool.h"
-#include "GrOpFlushState.h"
-#include "GrRenderTargetOpList.h"
-#include "Test.h"
-#include "ops/GrOp.h"
+#include "include/gpu/GrContext.h"
+#include "src/gpu/GrContextPriv.h"
+#include "src/gpu/GrMemoryPool.h"
+#include "src/gpu/GrOpFlushState.h"
+#include "src/gpu/GrRenderTargetOpList.h"
+#include "src/gpu/ops/GrOp.h"
+#include "tests/Test.h"
// We create Ops that write a value into a range of a buffer. We create ranges from
// kNumOpPositions starting positions x kRanges canonical ranges. We repeat each range kNumRepeats
diff --git a/tests/OverAlignedTest.cpp b/tests/OverAlignedTest.cpp
index fcc3e16..879947e 100644
--- a/tests/OverAlignedTest.cpp
+++ b/tests/OverAlignedTest.cpp
@@ -5,8 +5,8 @@
* found in the LICENSE file.
*/
-#include "Test.h"
-#include "SkRandom.h"
+#include "include/utils/SkRandom.h"
+#include "tests/Test.h"
// Clang seems to think only 32-bit alignment is guaranteed on 32-bit x86 Android.
// See https://reviews.llvm.org/D8357
diff --git a/tests/PDFDeflateWStreamTest.cpp b/tests/PDFDeflateWStreamTest.cpp
index d32828c..20ee249 100644
--- a/tests/PDFDeflateWStreamTest.cpp
+++ b/tests/PDFDeflateWStreamTest.cpp
@@ -5,13 +5,13 @@
* found in the LICENSE file.
*/
-#include "Test.h"
+#include "tests/Test.h"
#ifdef SK_SUPPORT_PDF
-#include "SkDeflate.h"
-#include "SkRandom.h"
-#include "SkTo.h"
+#include "include/private/SkTo.h"
+#include "include/utils/SkRandom.h"
+#include "src/pdf/SkDeflate.h"
namespace {
diff --git a/tests/PDFDocumentTest.cpp b/tests/PDFDocumentTest.cpp
index c3d6ed2..a1c64ed 100644
--- a/tests/PDFDocumentTest.cpp
+++ b/tests/PDFDocumentTest.cpp
@@ -4,17 +4,17 @@
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
-#include "Test.h"
+#include "tests/Test.h"
-#include "Resources.h"
-#include "SkCanvas.h"
-#include "SkExecutor.h"
-#include "SkOSFile.h"
-#include "SkOSPath.h"
-#include "SkPDFDocument.h"
-#include "SkStream.h"
+#include "include/core/SkCanvas.h"
+#include "include/core/SkExecutor.h"
+#include "include/core/SkStream.h"
+#include "include/docs/SkPDFDocument.h"
+#include "src/core/SkOSFile.h"
+#include "src/utils/SkOSPath.h"
+#include "tools/Resources.h"
-#include "ToolUtils.h"
+#include "tools/ToolUtils.h"
static void test_empty(skiatest::Reporter* reporter) {
SkDynamicMemoryWStream stream;
diff --git a/tests/PDFGlyphsToUnicodeTest.cpp b/tests/PDFGlyphsToUnicodeTest.cpp
index 71d75dd..7b9131d 100644
--- a/tests/PDFGlyphsToUnicodeTest.cpp
+++ b/tests/PDFGlyphsToUnicodeTest.cpp
@@ -5,15 +5,15 @@
* found in the LICENSE file.
*/
-#include "Test.h"
+#include "tests/Test.h"
#ifdef SK_SUPPORT_PDF
-#include "SkBitSet.h"
-#include "SkData.h"
-#include "SkPDFMakeToUnicodeCmap.h"
-#include "SkStream.h"
-#include "SkTo.h"
+#include "include/core/SkData.h"
+#include "include/core/SkStream.h"
+#include "include/private/SkTo.h"
+#include "src/pdf/SkPDFMakeToUnicodeCmap.h"
+#include "src/utils/SkBitSet.h"
static constexpr SkGlyphID kMaximumGlyphIndex = UINT16_MAX;
diff --git a/tests/PDFJpegEmbedTest.cpp b/tests/PDFJpegEmbedTest.cpp
index 055f457..87577ac 100644
--- a/tests/PDFJpegEmbedTest.cpp
+++ b/tests/PDFJpegEmbedTest.cpp
@@ -5,14 +5,14 @@
* found in the LICENSE file.
*/
-#include "SkCanvas.h"
-#include "SkData.h"
-#include "SkImageGenerator.h"
-#include "SkPDFDocument.h"
-#include "SkStream.h"
+#include "include/core/SkCanvas.h"
+#include "include/core/SkData.h"
+#include "include/core/SkImageGenerator.h"
+#include "include/core/SkStream.h"
+#include "include/docs/SkPDFDocument.h"
-#include "Resources.h"
-#include "Test.h"
+#include "tests/Test.h"
+#include "tools/Resources.h"
static bool is_subset_of(SkData* smaller, SkData* larger) {
SkASSERT(smaller && larger);
@@ -81,7 +81,7 @@
#ifdef SK_SUPPORT_PDF
-#include "SkJpegInfo.h"
+#include "src/pdf/SkJpegInfo.h"
struct SkJFIFInfo {
SkISize fSize;
diff --git a/tests/PDFMetadataAttributeTest.cpp b/tests/PDFMetadataAttributeTest.cpp
index 964d0e7..e736fac 100644
--- a/tests/PDFMetadataAttributeTest.cpp
+++ b/tests/PDFMetadataAttributeTest.cpp
@@ -4,10 +4,10 @@
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
-#include "SkData.h"
-#include "SkPDFDocument.h"
-#include "SkStream.h"
-#include "Test.h"
+#include "include/core/SkData.h"
+#include "include/core/SkStream.h"
+#include "include/docs/SkPDFDocument.h"
+#include "tests/Test.h"
DEF_TEST(SkPDF_Metadata, r) {
REQUIRE_PDF_DOCUMENT(SkPDF_Metadata, r);
diff --git a/tests/PDFOpaqueSrcModeToSrcOverTest.cpp b/tests/PDFOpaqueSrcModeToSrcOverTest.cpp
index c3c5fbc..e01b159 100644
--- a/tests/PDFOpaqueSrcModeToSrcOverTest.cpp
+++ b/tests/PDFOpaqueSrcModeToSrcOverTest.cpp
@@ -5,10 +5,10 @@
* found in the LICENSE file.
*/
-#include "SkCanvas.h"
-#include "SkPDFDocument.h"
-#include "SkStream.h"
-#include "Test.h"
+#include "include/core/SkCanvas.h"
+#include "include/core/SkStream.h"
+#include "include/docs/SkPDFDocument.h"
+#include "tests/Test.h"
static void run_test(SkWStream* out, SkBlendMode mode, U8CPU alpha) {
auto pdfDoc = SkPDF::MakeDocument(out);
diff --git a/tests/PDFPrimitivesTest.cpp b/tests/PDFPrimitivesTest.cpp
index 42804b9..53a369a 100644
--- a/tests/PDFPrimitivesTest.cpp
+++ b/tests/PDFPrimitivesTest.cpp
@@ -5,34 +5,34 @@
* found in the LICENSE file.
*/
-#include "Test.h"
+#include "tests/Test.h"
#ifdef SK_SUPPORT_PDF
-#include "Resources.h"
-#include "SkBitmap.h"
-#include "SkCanvas.h"
-#include "SkClusterator.h"
-#include "SkData.h"
-#include "SkDeflate.h"
-#include "SkGlyphRun.h"
-#include "SkImageEncoder.h"
-#include "SkImageFilterPriv.h"
-#include "SkMakeUnique.h"
-#include "SkMatrix.h"
-#include "SkPDFDevice.h"
-#include "SkPDFDocumentPriv.h"
-#include "SkPDFFont.h"
-#include "SkPDFTypes.h"
-#include "SkPDFUnion.h"
-#include "SkPDFUtils.h"
-#include "SkReadBuffer.h"
-#include "SkScalar.h"
-#include "SkSpecialImage.h"
-#include "SkStream.h"
-#include "SkTo.h"
-#include "SkTypes.h"
-#include "ToolUtils.h"
+#include "include/core/SkBitmap.h"
+#include "include/core/SkCanvas.h"
+#include "include/core/SkData.h"
+#include "include/core/SkImageEncoder.h"
+#include "include/core/SkMatrix.h"
+#include "include/core/SkScalar.h"
+#include "include/core/SkStream.h"
+#include "include/core/SkTypes.h"
+#include "include/private/SkTo.h"
+#include "src/core/SkGlyphRun.h"
+#include "src/core/SkImageFilterPriv.h"
+#include "src/core/SkMakeUnique.h"
+#include "src/core/SkReadBuffer.h"
+#include "src/core/SkSpecialImage.h"
+#include "src/pdf/SkClusterator.h"
+#include "src/pdf/SkDeflate.h"
+#include "src/pdf/SkPDFDevice.h"
+#include "src/pdf/SkPDFDocumentPriv.h"
+#include "src/pdf/SkPDFFont.h"
+#include "src/pdf/SkPDFTypes.h"
+#include "src/pdf/SkPDFUnion.h"
+#include "src/pdf/SkPDFUtils.h"
+#include "tools/Resources.h"
+#include "tools/ToolUtils.h"
#include <cstdlib>
#include <cmath>
diff --git a/tests/PDFTaggedTest.cpp b/tests/PDFTaggedTest.cpp
index 60ae538..a4a11db 100644
--- a/tests/PDFTaggedTest.cpp
+++ b/tests/PDFTaggedTest.cpp
@@ -4,12 +4,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 "tests/Test.h"
-#include "SkCanvas.h"
-#include "SkPDFDocument.h"
-#include "SkStream.h"
-#include "SkFont.h"
+#include "include/core/SkCanvas.h"
+#include "include/core/SkFont.h"
+#include "include/core/SkStream.h"
+#include "include/docs/SkPDFDocument.h"
using PDFTag = SkPDF::StructureElementNode;
diff --git a/tests/PackBitsTest.cpp b/tests/PackBitsTest.cpp
index ac9a0ae..4d73372 100644
--- a/tests/PackBitsTest.cpp
+++ b/tests/PackBitsTest.cpp
@@ -5,10 +5,10 @@
* found in the LICENSE file.
*/
-#include "SkPackBits.h"
-#include "Test.h"
+#include "src/effects/SkPackBits.h"
+#include "tests/Test.h"
-#include "SkRandom.h"
+#include "include/utils/SkRandom.h"
static SkRandom gRand;
static const uint8_t gTest80[] = { 0, 0, 1, 1 };
static const uint8_t gTest81[] = { 1, 2, 3, 4, 5, 6 };
diff --git a/tests/PackedConfigsTextureTest.cpp b/tests/PackedConfigsTextureTest.cpp
index d66be09..f69b1db 100644
--- a/tests/PackedConfigsTextureTest.cpp
+++ b/tests/PackedConfigsTextureTest.cpp
@@ -11,13 +11,13 @@
* as valid texturing configs.
*/
-#include "Test.h"
+#include "tests/Test.h"
-#include "GrContext.h"
-#include "GrContextPriv.h"
-#include "GrProxyProvider.h"
-#include "GrTextureProxy.h"
-#include "ProxyUtils.h"
+#include "include/gpu/GrContext.h"
+#include "include/private/GrTextureProxy.h"
+#include "src/gpu/GrContextPriv.h"
+#include "src/gpu/GrProxyProvider.h"
+#include "tools/gpu/ProxyUtils.h"
static const int DEV_W = 10, DEV_H = 10;
static const uint8_t TOL = 0x4;
diff --git a/tests/PaintImageFilterTest.cpp b/tests/PaintImageFilterTest.cpp
index b9035a3..246896d 100644
--- a/tests/PaintImageFilterTest.cpp
+++ b/tests/PaintImageFilterTest.cpp
@@ -5,12 +5,12 @@
* found in the LICENSE file.
*/
-#include "SkBitmap.h"
-#include "SkCanvas.h"
-#include "SkGradientShader.h"
-#include "SkPaintImageFilter.h"
-#include "SkShader.h"
-#include "Test.h"
+#include "include/core/SkBitmap.h"
+#include "include/core/SkCanvas.h"
+#include "include/core/SkShader.h"
+#include "include/effects/SkGradientShader.h"
+#include "include/effects/SkPaintImageFilter.h"
+#include "tests/Test.h"
static void test_unscaled(skiatest::Reporter* reporter) {
int w = 10, h = 10;
diff --git a/tests/PaintTest.cpp b/tests/PaintTest.cpp
index 8641511..7c7dd51 100644
--- a/tests/PaintTest.cpp
+++ b/tests/PaintTest.cpp
@@ -5,20 +5,20 @@
* found in the LICENSE file.
*/
-#include "SkAutoMalloc.h"
-#include "SkBlurMask.h"
-#include "SkFont.h"
-#include "SkLayerDrawLooper.h"
-#include "SkMaskFilter.h"
-#include "SkPaintPriv.h"
-#include "SkPath.h"
-#include "SkRandom.h"
-#include "SkReadBuffer.h"
-#include "SkTo.h"
-#include "SkTypeface.h"
-#include "SkUTF.h"
-#include "SkWriteBuffer.h"
-#include "Test.h"
+#include "include/core/SkFont.h"
+#include "include/core/SkMaskFilter.h"
+#include "include/core/SkPath.h"
+#include "include/core/SkTypeface.h"
+#include "include/effects/SkLayerDrawLooper.h"
+#include "include/private/SkTo.h"
+#include "include/utils/SkRandom.h"
+#include "src/core/SkAutoMalloc.h"
+#include "src/core/SkBlurMask.h"
+#include "src/core/SkPaintPriv.h"
+#include "src/core/SkReadBuffer.h"
+#include "src/core/SkWriteBuffer.h"
+#include "src/utils/SkUTF.h"
+#include "tests/Test.h"
#undef ASSERT
// temparary api for bicubic, just be sure we can set/clear it
@@ -218,7 +218,7 @@
REPORTER_ASSERT(r, paint.getHash() == defaultHash);
}
-#include "SkColorMatrixFilter.h"
+#include "include/effects/SkColorMatrixFilter.h"
DEF_TEST(Paint_nothingToDraw, r) {
SkPaint paint;
diff --git a/tests/ParametricStageTest.cpp b/tests/ParametricStageTest.cpp
index 9dcaa00..6ec62b8 100644
--- a/tests/ParametricStageTest.cpp
+++ b/tests/ParametricStageTest.cpp
@@ -5,9 +5,9 @@
* found in the LICENSE file.
*/
-#include "SkColorSpace.h"
-#include "SkRasterPipeline.h"
-#include "Test.h"
+#include "include/core/SkColorSpace.h"
+#include "src/core/SkRasterPipeline.h"
+#include "tests/Test.h"
static void check_error(skiatest::Reporter* r, float limit, skcms_TransferFunction fn) {
float in[256], out[256];
diff --git a/tests/ParsePathTest.cpp b/tests/ParsePathTest.cpp
index 408f780..bfdea3a 100644
--- a/tests/ParsePathTest.cpp
+++ b/tests/ParsePathTest.cpp
@@ -5,8 +5,8 @@
* found in the LICENSE file.
*/
-#include "SkParsePath.h"
-#include "Test.h"
+#include "include/utils/SkParsePath.h"
+#include "tests/Test.h"
static void test_to_from(skiatest::Reporter* reporter, const SkPath& path) {
SkString str, str2;
@@ -72,8 +72,8 @@
REPORTER_ASSERT(r, !success);
}
-#include "random_parse_path.h"
-#include "SkRandom.h"
+#include "include/utils/SkRandom.h"
+#include "tools/random_parse_path.h"
DEF_TEST(ParsePathRandom, r) {
SkRandom rand;
diff --git a/tests/PathCoverageTest.cpp b/tests/PathCoverageTest.cpp
index ed5ed0e..a6f676b 100644
--- a/tests/PathCoverageTest.cpp
+++ b/tests/PathCoverageTest.cpp
@@ -5,10 +5,10 @@
* found in the LICENSE file.
*/
-#include "SkMathPriv.h"
-#include "SkPointPriv.h"
-#include "SkScalar.h"
-#include "Test.h"
+#include "include/core/SkScalar.h"
+#include "src/core/SkMathPriv.h"
+#include "src/core/SkPointPriv.h"
+#include "tests/Test.h"
/*
Duplicates lots of code from gpu/src/GrPathUtils.cpp
diff --git a/tests/PathMeasureTest.cpp b/tests/PathMeasureTest.cpp
index 166fe44..0873122 100644
--- a/tests/PathMeasureTest.cpp
+++ b/tests/PathMeasureTest.cpp
@@ -5,8 +5,8 @@
* found in the LICENSE file.
*/
-#include "SkPathMeasure.h"
-#include "Test.h"
+#include "include/core/SkPathMeasure.h"
+#include "tests/Test.h"
static void test_small_segment3() {
SkPath path;
@@ -228,7 +228,7 @@
REPORTER_ASSERT(reporter, !meas.nextContour());
}
-#include "SkContourMeasure.h"
+#include "include/core/SkContourMeasure.h"
static void test_90_degrees(sk_sp<SkContourMeasure> cm, SkScalar radius,
skiatest::Reporter* reporter) {
diff --git a/tests/PathOpsAngleIdeas.cpp b/tests/PathOpsAngleIdeas.cpp
index e6a75cd..bbf5e7a 100644
--- a/tests/PathOpsAngleIdeas.cpp
+++ b/tests/PathOpsAngleIdeas.cpp
@@ -4,14 +4,14 @@
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
-#include "PathOpsTestCommon.h"
-#include "SkIntersections.h"
-#include "SkOpContour.h"
-#include "SkOpSegment.h"
-#include "SkRandom.h"
-#include "SkTArray.h"
-#include "SkTSort.h"
-#include "Test.h"
+#include "include/private/SkTArray.h"
+#include "include/utils/SkRandom.h"
+#include "src/core/SkTSort.h"
+#include "src/pathops/SkIntersections.h"
+#include "src/pathops/SkOpContour.h"
+#include "src/pathops/SkOpSegment.h"
+#include "tests/PathOpsTestCommon.h"
+#include "tests/Test.h"
static bool gPathOpsAngleIdeasVerbose = false;
static bool gPathOpsAngleIdeasEnableBruteCheck = false;
diff --git a/tests/PathOpsAngleTest.cpp b/tests/PathOpsAngleTest.cpp
index cd99915..7d8c4bd 100644
--- a/tests/PathOpsAngleTest.cpp
+++ b/tests/PathOpsAngleTest.cpp
@@ -4,13 +4,13 @@
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
-#include "PathOpsTestCommon.h"
-#include "SkIntersections.h"
-#include "SkOpContour.h"
-#include "SkOpSegment.h"
-#include "SkRandom.h"
-#include "SkTSort.h"
-#include "Test.h"
+#include "include/utils/SkRandom.h"
+#include "src/core/SkTSort.h"
+#include "src/pathops/SkIntersections.h"
+#include "src/pathops/SkOpContour.h"
+#include "src/pathops/SkOpSegment.h"
+#include "tests/PathOpsTestCommon.h"
+#include "tests/Test.h"
static bool gDisableAngleTests = true;
diff --git a/tests/PathOpsAsWindingTest.cpp b/tests/PathOpsAsWindingTest.cpp
index 55d5130..e92dc0d 100644
--- a/tests/PathOpsAsWindingTest.cpp
+++ b/tests/PathOpsAsWindingTest.cpp
@@ -5,9 +5,9 @@
* found in the LICENSE file.
*/
-#include "PathOpsExtendedTest.h"
-#include "PathOpsThreadedCommon.h"
-#include "Test.h"
+#include "tests/PathOpsExtendedTest.h"
+#include "tests/PathOpsThreadedCommon.h"
+#include "tests/Test.h"
static SkPath build_squircle(SkPath::Verb verb, const SkRect& rect, SkPath::Direction dir) {
SkPath path;
diff --git a/tests/PathOpsBattles.cpp b/tests/PathOpsBattles.cpp
index 9927cde..f3c5140 100644
--- a/tests/PathOpsBattles.cpp
+++ b/tests/PathOpsBattles.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 "PathOpsExtendedTest.h"
-#include "PathOpsTestCommon.h"
+#include "tests/PathOpsExtendedTest.h"
+#include "tests/PathOpsTestCommon.h"
#define TEST(name) { name, #name }
diff --git a/tests/PathOpsBoundsTest.cpp b/tests/PathOpsBoundsTest.cpp
index 573a0ce..91856ca 100644
--- a/tests/PathOpsBoundsTest.cpp
+++ b/tests/PathOpsBoundsTest.cpp
@@ -4,10 +4,10 @@
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
-#include "PathOpsTestCommon.h"
-#include "SkPathOpsBounds.h"
-#include "SkPathOpsCurve.h"
-#include "Test.h"
+#include "src/pathops/SkPathOpsBounds.h"
+#include "src/pathops/SkPathOpsCurve.h"
+#include "tests/PathOpsTestCommon.h"
+#include "tests/Test.h"
static const SkRect sectTests[][2] = {
{{2, 0, 4, 1}, {4, 0, 6, 1}},
diff --git a/tests/PathOpsBuildUseTest.cpp b/tests/PathOpsBuildUseTest.cpp
index 0d72008..4ad239d 100644
--- a/tests/PathOpsBuildUseTest.cpp
+++ b/tests/PathOpsBuildUseTest.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 "PathOpsExtendedTest.h"
-#include "PathOpsTestCommon.h"
+#include "tests/PathOpsExtendedTest.h"
+#include "tests/PathOpsTestCommon.h"
#define TEST(name) { name, #name }
diff --git a/tests/PathOpsBuilderConicTest.cpp b/tests/PathOpsBuilderConicTest.cpp
index 297dc02..1addea7 100644
--- a/tests/PathOpsBuilderConicTest.cpp
+++ b/tests/PathOpsBuilderConicTest.cpp
@@ -5,10 +5,10 @@
* found in the LICENSE file.
*/
-#include "PathOpsExtendedTest.h"
-#include "SkRandom.h"
-#include "SkRegion.h"
-#include "SubsetPath.h"
+#include "include/core/SkRegion.h"
+#include "include/utils/SkRandom.h"
+#include "tests/PathOpsExtendedTest.h"
+#include "tests/SubsetPath.h"
#define DEBUG_SIMPLIFY_FAILS 0
@@ -88,7 +88,7 @@
testOne(reporter, set);
}
-#include "CommandLineFlags.h"
+#include "tools/flags/CommandLineFlags.h"
static DEFINE_int(processOffset, 0,
"Offset the test by this value. This permits multiple processes "
@@ -623,7 +623,7 @@
" Q 146.3946533203125 126.4554138183594 146.4066772460938 129.8022613525391"
" Q 146.4187316894531 133.1491088867188 146.4187316894531 136.5 Z";
-#include "SkParsePath.h"
+#include "include/utils/SkParsePath.h"
DEF_TEST(PathOpsOvalsAsQuads, reporter) {
return; // don't execute this for now
diff --git a/tests/PathOpsBuilderTest.cpp b/tests/PathOpsBuilderTest.cpp
index ffeff5f..9069802 100644
--- a/tests/PathOpsBuilderTest.cpp
+++ b/tests/PathOpsBuilderTest.cpp
@@ -5,10 +5,10 @@
* found in the LICENSE file.
*/
-#include "PathOpsExtendedTest.h"
-#include "PathOpsTestCommon.h"
-#include "SkBitmap.h"
-#include "Test.h"
+#include "include/core/SkBitmap.h"
+#include "tests/PathOpsExtendedTest.h"
+#include "tests/PathOpsTestCommon.h"
+#include "tests/Test.h"
DEF_TEST(PathOpsBuilder, reporter) {
SkOpBuilder builder;
diff --git a/tests/PathOpsChalkboardTest.cpp b/tests/PathOpsChalkboardTest.cpp
index cdf1fc6..6c03f2c 100644
--- a/tests/PathOpsChalkboardTest.cpp
+++ b/tests/PathOpsChalkboardTest.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 "PathOpsExtendedTest.h"
-#include "PathOpsThreadedCommon.h"
-#include "SkRandom.h"
+#include "include/utils/SkRandom.h"
+#include "tests/PathOpsExtendedTest.h"
+#include "tests/PathOpsThreadedCommon.h"
#include <atomic>
#define TEST(name) { name, #name }
diff --git a/tests/PathOpsConicIntersectionTest.cpp b/tests/PathOpsConicIntersectionTest.cpp
index 7389556..b9033f9 100644
--- a/tests/PathOpsConicIntersectionTest.cpp
+++ b/tests/PathOpsConicIntersectionTest.cpp
@@ -4,10 +4,10 @@
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
-#include "PathOpsTestCommon.h"
-#include "SkGeometry.h"
-#include "SkIntersections.h"
-#include "Test.h"
+#include "src/core/SkGeometry.h"
+#include "src/pathops/SkIntersections.h"
+#include "tests/PathOpsTestCommon.h"
+#include "tests/Test.h"
/*
manually compute the intersection of a pair of circles and see if the conic intersection matches
@@ -60,12 +60,12 @@
#endif
}
-#include "SkBitmap.h"
-#include "SkCanvas.h"
-#include "SkImageEncoder.h"
-#include "SkPathOpsRect.h"
-#include "SkPaint.h"
-#include "SkString.h"
+#include "include/core/SkBitmap.h"
+#include "include/core/SkCanvas.h"
+#include "include/core/SkImageEncoder.h"
+#include "include/core/SkPaint.h"
+#include "include/core/SkString.h"
+#include "src/pathops/SkPathOpsRect.h"
#define DEBUG_VISUALIZE_CONICS 0
diff --git a/tests/PathOpsConicLineIntersectionTest.cpp b/tests/PathOpsConicLineIntersectionTest.cpp
index 8a96519..40bb5f6 100644
--- a/tests/PathOpsConicLineIntersectionTest.cpp
+++ b/tests/PathOpsConicLineIntersectionTest.cpp
@@ -4,14 +4,14 @@
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
-#include "PathOpsExtendedTest.h"
-#include "PathOpsTestCommon.h"
-#include "SkGeometry.h"
-#include "SkIntersections.h"
-#include "SkPathOpsConic.h"
-#include "SkPathOpsLine.h"
-#include "SkReduceOrder.h"
-#include "Test.h"
+#include "src/core/SkGeometry.h"
+#include "src/pathops/SkIntersections.h"
+#include "src/pathops/SkPathOpsConic.h"
+#include "src/pathops/SkPathOpsLine.h"
+#include "src/pathops/SkReduceOrder.h"
+#include "tests/PathOpsExtendedTest.h"
+#include "tests/PathOpsTestCommon.h"
+#include "tests/Test.h"
#include <utility>
diff --git a/tests/PathOpsConicQuadIntersectionTest.cpp b/tests/PathOpsConicQuadIntersectionTest.cpp
index 8f47e76..fd46f18 100644
--- a/tests/PathOpsConicQuadIntersectionTest.cpp
+++ b/tests/PathOpsConicQuadIntersectionTest.cpp
@@ -4,12 +4,12 @@
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
-#include "PathOpsTestCommon.h"
-#include "SkIntersections.h"
-#include "SkPathOpsConic.h"
-#include "SkPathOpsQuad.h"
-#include "SkReduceOrder.h"
-#include "Test.h"
+#include "src/pathops/SkIntersections.h"
+#include "src/pathops/SkPathOpsConic.h"
+#include "src/pathops/SkPathOpsQuad.h"
+#include "src/pathops/SkReduceOrder.h"
+#include "tests/PathOpsTestCommon.h"
+#include "tests/Test.h"
static struct conicQuad {
ConicPts conic;
diff --git a/tests/PathOpsCubicConicIntersectionTest.cpp b/tests/PathOpsCubicConicIntersectionTest.cpp
index aa8a9d8..9f8034f 100644
--- a/tests/PathOpsCubicConicIntersectionTest.cpp
+++ b/tests/PathOpsCubicConicIntersectionTest.cpp
@@ -4,12 +4,12 @@
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
-#include "PathOpsTestCommon.h"
-#include "SkIntersections.h"
-#include "SkPathOpsConic.h"
-#include "SkPathOpsCubic.h"
-#include "SkReduceOrder.h"
-#include "Test.h"
+#include "src/pathops/SkIntersections.h"
+#include "src/pathops/SkPathOpsConic.h"
+#include "src/pathops/SkPathOpsCubic.h"
+#include "src/pathops/SkReduceOrder.h"
+#include "tests/PathOpsTestCommon.h"
+#include "tests/Test.h"
static struct cubicConic {
CubicPts cubic;
diff --git a/tests/PathOpsCubicIntersectionTest.cpp b/tests/PathOpsCubicIntersectionTest.cpp
index 8a7ec1a..30a0b38 100644
--- a/tests/PathOpsCubicIntersectionTest.cpp
+++ b/tests/PathOpsCubicIntersectionTest.cpp
@@ -4,13 +4,13 @@
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
-#include "PathOpsCubicIntersectionTestData.h"
-#include "PathOpsTestCommon.h"
-#include "SkGeometry.h"
-#include "SkIntersections.h"
-#include "SkPathOpsRect.h"
-#include "SkReduceOrder.h"
-#include "Test.h"
+#include "src/core/SkGeometry.h"
+#include "src/pathops/SkIntersections.h"
+#include "src/pathops/SkPathOpsRect.h"
+#include "src/pathops/SkReduceOrder.h"
+#include "tests/PathOpsCubicIntersectionTestData.h"
+#include "tests/PathOpsTestCommon.h"
+#include "tests/Test.h"
#include <stdlib.h>
diff --git a/tests/PathOpsCubicIntersectionTestData.cpp b/tests/PathOpsCubicIntersectionTestData.cpp
index 58dbfde..55eda4c 100644
--- a/tests/PathOpsCubicIntersectionTestData.cpp
+++ b/tests/PathOpsCubicIntersectionTestData.cpp
@@ -5,7 +5,7 @@
* found in the LICENSE file.
*/
-#include "PathOpsCubicIntersectionTestData.h"
+#include "tests/PathOpsCubicIntersectionTestData.h"
#include <limits>
diff --git a/tests/PathOpsCubicIntersectionTestData.h b/tests/PathOpsCubicIntersectionTestData.h
index 4c9894c..e70b907 100644
--- a/tests/PathOpsCubicIntersectionTestData.h
+++ b/tests/PathOpsCubicIntersectionTestData.h
@@ -4,7 +4,7 @@
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
-#include "PathOpsTestCommon.h"
+#include "tests/PathOpsTestCommon.h"
extern const CubicPts pointDegenerates[];
extern const CubicPts notPointDegenerates[];
diff --git a/tests/PathOpsCubicLineIntersectionIdeas.cpp b/tests/PathOpsCubicLineIntersectionIdeas.cpp
index 1555475..449cdb3 100644
--- a/tests/PathOpsCubicLineIntersectionIdeas.cpp
+++ b/tests/PathOpsCubicLineIntersectionIdeas.cpp
@@ -4,14 +4,14 @@
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
-#include "PathOpsTestCommon.h"
-#include "SkIntersections.h"
-#include "SkPathOpsCubic.h"
-#include "SkPathOpsLine.h"
-#include "SkPathOpsQuad.h"
-#include "SkRandom.h"
-#include "SkReduceOrder.h"
-#include "Test.h"
+#include "include/utils/SkRandom.h"
+#include "src/pathops/SkIntersections.h"
+#include "src/pathops/SkPathOpsCubic.h"
+#include "src/pathops/SkPathOpsLine.h"
+#include "src/pathops/SkPathOpsQuad.h"
+#include "src/pathops/SkReduceOrder.h"
+#include "tests/PathOpsTestCommon.h"
+#include "tests/Test.h"
static bool gPathOpsCubicLineIntersectionIdeasVerbose = false;
diff --git a/tests/PathOpsCubicLineIntersectionTest.cpp b/tests/PathOpsCubicLineIntersectionTest.cpp
index 87e6cea..ac13736 100644
--- a/tests/PathOpsCubicLineIntersectionTest.cpp
+++ b/tests/PathOpsCubicLineIntersectionTest.cpp
@@ -4,12 +4,12 @@
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
-#include "PathOpsTestCommon.h"
-#include "SkIntersections.h"
-#include "SkPathOpsCubic.h"
-#include "SkPathOpsLine.h"
-#include "SkReduceOrder.h"
-#include "Test.h"
+#include "src/pathops/SkIntersections.h"
+#include "src/pathops/SkPathOpsCubic.h"
+#include "src/pathops/SkPathOpsLine.h"
+#include "src/pathops/SkReduceOrder.h"
+#include "tests/PathOpsTestCommon.h"
+#include "tests/Test.h"
#include <utility>
diff --git a/tests/PathOpsCubicQuadIntersectionTest.cpp b/tests/PathOpsCubicQuadIntersectionTest.cpp
index 87c7e13..6f4b3db 100644
--- a/tests/PathOpsCubicQuadIntersectionTest.cpp
+++ b/tests/PathOpsCubicQuadIntersectionTest.cpp
@@ -4,13 +4,13 @@
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
-#include "PathOpsTestCommon.h"
-#include "SkIntersections.h"
-#include "SkPathOpsCubic.h"
-#include "SkPathOpsQuad.h"
-#include "SkRandom.h"
-#include "SkReduceOrder.h"
-#include "Test.h"
+#include "include/utils/SkRandom.h"
+#include "src/pathops/SkIntersections.h"
+#include "src/pathops/SkPathOpsCubic.h"
+#include "src/pathops/SkPathOpsQuad.h"
+#include "src/pathops/SkReduceOrder.h"
+#include "tests/PathOpsTestCommon.h"
+#include "tests/Test.h"
static struct quadCubic {
CubicPts cubic;
diff --git a/tests/PathOpsCubicReduceOrderTest.cpp b/tests/PathOpsCubicReduceOrderTest.cpp
index 89a263c..b3d4ef9 100644
--- a/tests/PathOpsCubicReduceOrderTest.cpp
+++ b/tests/PathOpsCubicReduceOrderTest.cpp
@@ -4,13 +4,13 @@
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
-#include "PathOpsCubicIntersectionTestData.h"
-#include "PathOpsQuadIntersectionTestData.h"
-#include "PathOpsTestCommon.h"
-#include "SkIntersections.h"
-#include "SkPathOpsRect.h"
-#include "SkReduceOrder.h"
-#include "Test.h"
+#include "src/pathops/SkIntersections.h"
+#include "src/pathops/SkPathOpsRect.h"
+#include "src/pathops/SkReduceOrder.h"
+#include "tests/PathOpsCubicIntersectionTestData.h"
+#include "tests/PathOpsQuadIntersectionTestData.h"
+#include "tests/PathOpsTestCommon.h"
+#include "tests/Test.h"
#if 0 // disable test until stroke reduction is supported
static bool controls_inside(const SkDCubic& cubic) {
diff --git a/tests/PathOpsDCubicTest.cpp b/tests/PathOpsDCubicTest.cpp
index b8c08df..e41135e 100644
--- a/tests/PathOpsDCubicTest.cpp
+++ b/tests/PathOpsDCubicTest.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 "PathOpsTestCommon.h"
-#include "SkPathOpsCubic.h"
-#include "Test.h"
+#include "src/pathops/SkPathOpsCubic.h"
+#include "tests/PathOpsTestCommon.h"
+#include "tests/Test.h"
static const CubicPts hullTests[] = {
{{{2.6250000819563866, 2.3750000223517418}, {2.833333432674408, 2.3333333432674408}, {3.1111112236976624, 2.3333333134651184}, {3.4074075222015381, 2.3333332538604736}}},
diff --git a/tests/PathOpsDLineTest.cpp b/tests/PathOpsDLineTest.cpp
index 1e16002..3d04ff8 100644
--- a/tests/PathOpsDLineTest.cpp
+++ b/tests/PathOpsDLineTest.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 "PathOpsTestCommon.h"
-#include "SkPathOpsLine.h"
-#include "Test.h"
+#include "src/pathops/SkPathOpsLine.h"
+#include "tests/PathOpsTestCommon.h"
+#include "tests/Test.h"
static const SkDLine tests[] = {
{{{2, 1}, {2, 1}}},
diff --git a/tests/PathOpsDPointTest.cpp b/tests/PathOpsDPointTest.cpp
index e197d5d..1b9a009 100644
--- a/tests/PathOpsDPointTest.cpp
+++ b/tests/PathOpsDPointTest.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 "PathOpsTestCommon.h"
-#include "SkPathOpsPoint.h"
-#include "Test.h"
+#include "src/pathops/SkPathOpsPoint.h"
+#include "tests/PathOpsTestCommon.h"
+#include "tests/Test.h"
static const SkDPoint tests[] = {
{0, 0},
diff --git a/tests/PathOpsDRectTest.cpp b/tests/PathOpsDRectTest.cpp
index fa52e78..72b7be0 100644
--- a/tests/PathOpsDRectTest.cpp
+++ b/tests/PathOpsDRectTest.cpp
@@ -4,12 +4,12 @@
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
-#include "PathOpsTestCommon.h"
-#include "SkPathOpsCubic.h"
-#include "SkPathOpsLine.h"
-#include "SkPathOpsQuad.h"
-#include "SkPathOpsRect.h"
-#include "Test.h"
+#include "src/pathops/SkPathOpsCubic.h"
+#include "src/pathops/SkPathOpsLine.h"
+#include "src/pathops/SkPathOpsQuad.h"
+#include "src/pathops/SkPathOpsRect.h"
+#include "tests/PathOpsTestCommon.h"
+#include "tests/Test.h"
static const QuadPts quadTests[] = {
{{{1, 1}, {2, 1}, {0, 2}}},
diff --git a/tests/PathOpsDVectorTest.cpp b/tests/PathOpsDVectorTest.cpp
index 5eced8f..e588193 100644
--- a/tests/PathOpsDVectorTest.cpp
+++ b/tests/PathOpsDVectorTest.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 "PathOpsTestCommon.h"
-#include "SkPathOpsPoint.h"
-#include "Test.h"
+#include "src/pathops/SkPathOpsPoint.h"
+#include "tests/PathOpsTestCommon.h"
+#include "tests/Test.h"
static const SkDPoint tests[] = {
{0, 0},
diff --git a/tests/PathOpsDebug.cpp b/tests/PathOpsDebug.cpp
index 428585b..94664c1 100644
--- a/tests/PathOpsDebug.cpp
+++ b/tests/PathOpsDebug.cpp
@@ -5,14 +5,14 @@
* found in the LICENSE file.
*/
-#include "PathOpsDebug.h"
-#include "PathOpsTSectDebug.h"
-#include "SkOpCoincidence.h"
-#include "SkOpContour.h"
-#include "SkIntersectionHelper.h"
-#include "SkMutex.h"
-#include "SkOpSegment.h"
-#include "SkString.h"
+#include "include/core/SkString.h"
+#include "include/private/SkMutex.h"
+#include "src/pathops/SkIntersectionHelper.h"
+#include "src/pathops/SkOpCoincidence.h"
+#include "src/pathops/SkOpContour.h"
+#include "src/pathops/SkOpSegment.h"
+#include "tests/PathOpsDebug.h"
+#include "tests/PathOpsTSectDebug.h"
bool PathOpsDebug::gJson;
bool PathOpsDebug::gMarkJsonFlaky;
diff --git a/tests/PathOpsExtendedTest.cpp b/tests/PathOpsExtendedTest.cpp
index 857ba63..f55cba3 100644
--- a/tests/PathOpsExtendedTest.cpp
+++ b/tests/PathOpsExtendedTest.cpp
@@ -5,17 +5,17 @@
* found in the LICENSE file.
*/
-#include "PathOpsDebug.h"
-#include "PathOpsExtendedTest.h"
-#include "PathOpsThreadedCommon.h"
-#include "SkBitmap.h"
-#include "SkCanvas.h"
-#include "SkMatrix.h"
-#include "SkMutex.h"
-#include "SkPaint.h"
-#include "SkParsePath.h"
-#include "SkRegion.h"
-#include "SkStream.h"
+#include "include/core/SkBitmap.h"
+#include "include/core/SkCanvas.h"
+#include "include/core/SkMatrix.h"
+#include "include/core/SkPaint.h"
+#include "include/core/SkRegion.h"
+#include "include/core/SkStream.h"
+#include "include/private/SkMutex.h"
+#include "include/utils/SkParsePath.h"
+#include "tests/PathOpsDebug.h"
+#include "tests/PathOpsExtendedTest.h"
+#include "tests/PathOpsThreadedCommon.h"
#include <stdlib.h>
#include <vector>
diff --git a/tests/PathOpsExtendedTest.h b/tests/PathOpsExtendedTest.h
index 37bc396..a9f2b25 100644
--- a/tests/PathOpsExtendedTest.h
+++ b/tests/PathOpsExtendedTest.h
@@ -7,11 +7,11 @@
#ifndef PathOpsExtendedTest_DEFINED
#define PathOpsExtendedTest_DEFINED
-#include "SkBitmap.h"
-#include "SkPath.h"
-#include "SkPathOpsTypes.h"
-#include "SkStream.h"
-#include "Test.h"
+#include "include/core/SkBitmap.h"
+#include "include/core/SkPath.h"
+#include "include/core/SkStream.h"
+#include "src/pathops/SkPathOpsTypes.h"
+#include "tests/Test.h"
struct PathOpsThreadState;
diff --git a/tests/PathOpsFuzz763Test.cpp b/tests/PathOpsFuzz763Test.cpp
index c9d13fc..3e864bf 100644
--- a/tests/PathOpsFuzz763Test.cpp
+++ b/tests/PathOpsFuzz763Test.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 "PathOpsExtendedTest.h"
-#include "PathOpsTestCommon.h"
+#include "tests/PathOpsExtendedTest.h"
+#include "tests/PathOpsTestCommon.h"
#define TEST(name) { name, #name }
diff --git a/tests/PathOpsInverseTest.cpp b/tests/PathOpsInverseTest.cpp
index a75522e..6f0034b 100644
--- a/tests/PathOpsInverseTest.cpp
+++ b/tests/PathOpsInverseTest.cpp
@@ -4,7 +4,7 @@
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
-#include "PathOpsExtendedTest.h"
+#include "tests/PathOpsExtendedTest.h"
DEF_TEST(PathOpsInverse, reporter) {
SkPath one, two;
diff --git a/tests/PathOpsIssue3651.cpp b/tests/PathOpsIssue3651.cpp
index 7b0392c..43d4092 100644
--- a/tests/PathOpsIssue3651.cpp
+++ b/tests/PathOpsIssue3651.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 "PathOpsExtendedTest.h"
-#include "PathOpsTestCommon.h"
+#include "tests/PathOpsExtendedTest.h"
+#include "tests/PathOpsTestCommon.h"
#define TEST(name) { name, #name }
diff --git a/tests/PathOpsLineIntersectionTest.cpp b/tests/PathOpsLineIntersectionTest.cpp
index bc0259c..e094978 100644
--- a/tests/PathOpsLineIntersectionTest.cpp
+++ b/tests/PathOpsLineIntersectionTest.cpp
@@ -4,10 +4,10 @@
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
-#include "PathOpsTestCommon.h"
-#include "SkIntersections.h"
-#include "SkPathOpsLine.h"
-#include "Test.h"
+#include "src/pathops/SkIntersections.h"
+#include "src/pathops/SkPathOpsLine.h"
+#include "tests/PathOpsTestCommon.h"
+#include "tests/Test.h"
// FIXME: add tests for intersecting, non-intersecting, degenerate, coincident
static const SkDLine tests[][2] = {
diff --git a/tests/PathOpsLineParametetersTest.cpp b/tests/PathOpsLineParametetersTest.cpp
index 66a4be2..696de71 100644
--- a/tests/PathOpsLineParametetersTest.cpp
+++ b/tests/PathOpsLineParametetersTest.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 "PathOpsTestCommon.h"
-#include "SkLineParameters.h"
-#include "Test.h"
+#include "src/pathops/SkLineParameters.h"
+#include "tests/PathOpsTestCommon.h"
+#include "tests/Test.h"
// tests to verify that distance calculations are coded correctly
static const CubicPts tests[] = {
diff --git a/tests/PathOpsOpCircleThreadedTest.cpp b/tests/PathOpsOpCircleThreadedTest.cpp
index b6c19d5..cb99acd 100644
--- a/tests/PathOpsOpCircleThreadedTest.cpp
+++ b/tests/PathOpsOpCircleThreadedTest.cpp
@@ -4,10 +4,10 @@
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
-#include "PathOpsDebug.h"
-#include "PathOpsExtendedTest.h"
-#include "PathOpsThreadedCommon.h"
-#include "SkString.h"
+#include "include/core/SkString.h"
+#include "tests/PathOpsDebug.h"
+#include "tests/PathOpsExtendedTest.h"
+#include "tests/PathOpsThreadedCommon.h"
#include <atomic>
diff --git a/tests/PathOpsOpCubicThreadedTest.cpp b/tests/PathOpsOpCubicThreadedTest.cpp
index b087cbe..50eb414 100644
--- a/tests/PathOpsOpCubicThreadedTest.cpp
+++ b/tests/PathOpsOpCubicThreadedTest.cpp
@@ -4,10 +4,10 @@
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
-#include "PathOpsDebug.h"
-#include "PathOpsExtendedTest.h"
-#include "PathOpsThreadedCommon.h"
-#include "SkString.h"
+#include "include/core/SkString.h"
+#include "tests/PathOpsDebug.h"
+#include "tests/PathOpsExtendedTest.h"
+#include "tests/PathOpsThreadedCommon.h"
#include <atomic>
diff --git a/tests/PathOpsOpLoopThreadedTest.cpp b/tests/PathOpsOpLoopThreadedTest.cpp
index 496bc8c..60528fb 100644
--- a/tests/PathOpsOpLoopThreadedTest.cpp
+++ b/tests/PathOpsOpLoopThreadedTest.cpp
@@ -4,10 +4,10 @@
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
-#include "PathOpsDebug.h"
-#include "PathOpsExtendedTest.h"
-#include "PathOpsThreadedCommon.h"
-#include "SkString.h"
+#include "include/core/SkString.h"
+#include "tests/PathOpsDebug.h"
+#include "tests/PathOpsExtendedTest.h"
+#include "tests/PathOpsThreadedCommon.h"
#include <atomic>
diff --git a/tests/PathOpsOpRectThreadedTest.cpp b/tests/PathOpsOpRectThreadedTest.cpp
index 5e69ef8..059ece2 100644
--- a/tests/PathOpsOpRectThreadedTest.cpp
+++ b/tests/PathOpsOpRectThreadedTest.cpp
@@ -4,10 +4,10 @@
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
-#include "PathOpsDebug.h"
-#include "PathOpsExtendedTest.h"
-#include "PathOpsThreadedCommon.h"
-#include "SkString.h"
+#include "include/core/SkString.h"
+#include "tests/PathOpsDebug.h"
+#include "tests/PathOpsExtendedTest.h"
+#include "tests/PathOpsThreadedCommon.h"
#include <atomic>
// four rects, of four sizes
diff --git a/tests/PathOpsOpTest.cpp b/tests/PathOpsOpTest.cpp
index 070f802..5c04a8f 100644
--- a/tests/PathOpsOpTest.cpp
+++ b/tests/PathOpsOpTest.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 "PathOpsDebug.h"
-#include "PathOpsExtendedTest.h"
-#include "PathOpsTestCommon.h"
+#include "tests/PathOpsDebug.h"
+#include "tests/PathOpsExtendedTest.h"
+#include "tests/PathOpsTestCommon.h"
class PathTest_Private {
public:
@@ -3590,7 +3590,7 @@
testPathOp(reporter, path, pathB, kIntersect_SkPathOp, filename);
}
-#include "SkPathOpsCubic.h"
+#include "src/pathops/SkPathOpsCubic.h"
static void loop1asQuad(skiatest::Reporter* reporter, const char* filename) {
CubicPts cubic1 = {{{0,1}, {1,5}, {-5.66666651f,3.33333349f}, {8.83333302f,2.33333349f}}};
@@ -3656,7 +3656,7 @@
testPathOp(reporter, path, pathB, kIntersect_SkPathOp, filename);
}
-#include "SkParsePath.h"
+#include "include/utils/SkParsePath.h"
static void issue3517(skiatest::Reporter* reporter, const char* filename) {
SkPath path, pathB;
@@ -3848,7 +3848,7 @@
testPathOp(reporter, path, pathB, kDifference_SkPathOp, filename);
}
-#include "SkGeometry.h"
+#include "src/core/SkGeometry.h"
static void complex_to_quads(const SkPoint pts[], SkPath* path) {
SkScalar loopT[3];
diff --git a/tests/PathOpsQuadIntersectionTest.cpp b/tests/PathOpsQuadIntersectionTest.cpp
index f5eb32f..e126c63 100644
--- a/tests/PathOpsQuadIntersectionTest.cpp
+++ b/tests/PathOpsQuadIntersectionTest.cpp
@@ -4,12 +4,12 @@
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
-#include "PathOpsQuadIntersectionTestData.h"
-#include "PathOpsTestCommon.h"
-#include "SkIntersections.h"
-#include "SkPathOpsRect.h"
-#include "SkReduceOrder.h"
-#include "Test.h"
+#include "src/pathops/SkIntersections.h"
+#include "src/pathops/SkPathOpsRect.h"
+#include "src/pathops/SkReduceOrder.h"
+#include "tests/PathOpsQuadIntersectionTestData.h"
+#include "tests/PathOpsTestCommon.h"
+#include "tests/Test.h"
static void standardTestCases(skiatest::Reporter* reporter) {
bool showSkipped = false;
diff --git a/tests/PathOpsQuadIntersectionTestData.cpp b/tests/PathOpsQuadIntersectionTestData.cpp
index 537b509..13b7677 100644
--- a/tests/PathOpsQuadIntersectionTestData.cpp
+++ b/tests/PathOpsQuadIntersectionTestData.cpp
@@ -5,7 +5,7 @@
* found in the LICENSE file.
*/
-#include "PathOpsQuadIntersectionTestData.h"
+#include "tests/PathOpsQuadIntersectionTestData.h"
const QuadPts quadraticPoints[] = {
{{{0, 0}, {1, 0}, {0, 0}}},
diff --git a/tests/PathOpsQuadIntersectionTestData.h b/tests/PathOpsQuadIntersectionTestData.h
index be46a33..6255922 100644
--- a/tests/PathOpsQuadIntersectionTestData.h
+++ b/tests/PathOpsQuadIntersectionTestData.h
@@ -4,7 +4,7 @@
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
-#include "PathOpsTestCommon.h"
+#include "tests/PathOpsTestCommon.h"
extern const QuadPts quadraticLines[];
extern const QuadPts quadraticPoints[];
diff --git a/tests/PathOpsQuadLineIntersectionTest.cpp b/tests/PathOpsQuadLineIntersectionTest.cpp
index 5bbd845..0bef7d3 100644
--- a/tests/PathOpsQuadLineIntersectionTest.cpp
+++ b/tests/PathOpsQuadLineIntersectionTest.cpp
@@ -4,13 +4,13 @@
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
-#include "PathOpsExtendedTest.h"
-#include "PathOpsTestCommon.h"
-#include "SkIntersections.h"
-#include "SkPathOpsLine.h"
-#include "SkPathOpsQuad.h"
-#include "SkReduceOrder.h"
-#include "Test.h"
+#include "src/pathops/SkIntersections.h"
+#include "src/pathops/SkPathOpsLine.h"
+#include "src/pathops/SkPathOpsQuad.h"
+#include "src/pathops/SkReduceOrder.h"
+#include "tests/PathOpsExtendedTest.h"
+#include "tests/PathOpsTestCommon.h"
+#include "tests/Test.h"
#include <utility>
diff --git a/tests/PathOpsQuadLineIntersectionThreadedTest.cpp b/tests/PathOpsQuadLineIntersectionThreadedTest.cpp
index c615894..bc2a516 100644
--- a/tests/PathOpsQuadLineIntersectionThreadedTest.cpp
+++ b/tests/PathOpsQuadLineIntersectionThreadedTest.cpp
@@ -4,14 +4,14 @@
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
-#include "PathOpsExtendedTest.h"
-#include "PathOpsTestCommon.h"
-#include "PathOpsThreadedCommon.h"
-#include "SkIntersections.h"
-#include "SkPathOpsLine.h"
-#include "SkPathOpsQuad.h"
-#include "SkReduceOrder.h"
-#include "SkString.h"
+#include "include/core/SkString.h"
+#include "src/pathops/SkIntersections.h"
+#include "src/pathops/SkPathOpsLine.h"
+#include "src/pathops/SkPathOpsQuad.h"
+#include "src/pathops/SkReduceOrder.h"
+#include "tests/PathOpsExtendedTest.h"
+#include "tests/PathOpsTestCommon.h"
+#include "tests/PathOpsThreadedCommon.h"
#include <utility>
diff --git a/tests/PathOpsQuadReduceOrderTest.cpp b/tests/PathOpsQuadReduceOrderTest.cpp
index 4f62026..0f0e334 100644
--- a/tests/PathOpsQuadReduceOrderTest.cpp
+++ b/tests/PathOpsQuadReduceOrderTest.cpp
@@ -4,11 +4,11 @@
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
-#include "PathOpsQuadIntersectionTestData.h"
-#include "SkIntersections.h"
-#include "SkPathOpsRect.h"
-#include "SkReduceOrder.h"
-#include "Test.h"
+#include "src/pathops/SkIntersections.h"
+#include "src/pathops/SkPathOpsRect.h"
+#include "src/pathops/SkReduceOrder.h"
+#include "tests/PathOpsQuadIntersectionTestData.h"
+#include "tests/Test.h"
static const QuadPts testSet[] = {
{{{1, 1}, {2, 2}, {1, 1.000003}}},
diff --git a/tests/PathOpsSimplifyDegenerateThreadedTest.cpp b/tests/PathOpsSimplifyDegenerateThreadedTest.cpp
index 3f49718..cf36924 100644
--- a/tests/PathOpsSimplifyDegenerateThreadedTest.cpp
+++ b/tests/PathOpsSimplifyDegenerateThreadedTest.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 "PathOpsExtendedTest.h"
-#include "PathOpsThreadedCommon.h"
-#include "SkString.h"
+#include "include/core/SkString.h"
+#include "tests/PathOpsExtendedTest.h"
+#include "tests/PathOpsThreadedCommon.h"
static void testSimplifyDegeneratesMain(PathOpsThreadState* data) {
SkASSERT(data);
diff --git a/tests/PathOpsSimplifyFailTest.cpp b/tests/PathOpsSimplifyFailTest.cpp
index e50d19e..6e7c650 100644
--- a/tests/PathOpsSimplifyFailTest.cpp
+++ b/tests/PathOpsSimplifyFailTest.cpp
@@ -4,11 +4,11 @@
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
-#include "PathOpsExtendedTest.h"
-#include "SkPath.h"
-#include "SkPathOps.h"
-#include "SkPoint.h"
-#include "Test.h"
+#include "include/core/SkPath.h"
+#include "include/core/SkPoint.h"
+#include "include/pathops/SkPathOps.h"
+#include "tests/PathOpsExtendedTest.h"
+#include "tests/Test.h"
static const SkPoint nonFinitePts[] = {
{ SK_ScalarInfinity, 0 },
diff --git a/tests/PathOpsSimplifyQuadThreadedTest.cpp b/tests/PathOpsSimplifyQuadThreadedTest.cpp
index 55dc07b..fc5f646 100644
--- a/tests/PathOpsSimplifyQuadThreadedTest.cpp
+++ b/tests/PathOpsSimplifyQuadThreadedTest.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 "PathOpsExtendedTest.h"
-#include "PathOpsThreadedCommon.h"
-#include "SkString.h"
+#include "include/core/SkString.h"
+#include "tests/PathOpsExtendedTest.h"
+#include "tests/PathOpsThreadedCommon.h"
static int quadTest = 66;
diff --git a/tests/PathOpsSimplifyQuadralateralsThreadedTest.cpp b/tests/PathOpsSimplifyQuadralateralsThreadedTest.cpp
index 6133042..2cfca49 100644
--- a/tests/PathOpsSimplifyQuadralateralsThreadedTest.cpp
+++ b/tests/PathOpsSimplifyQuadralateralsThreadedTest.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 "PathOpsExtendedTest.h"
-#include "PathOpsThreadedCommon.h"
-#include "SkString.h"
+#include "include/core/SkString.h"
+#include "tests/PathOpsExtendedTest.h"
+#include "tests/PathOpsThreadedCommon.h"
static int loopNo = 1;
diff --git a/tests/PathOpsSimplifyRectThreadedTest.cpp b/tests/PathOpsSimplifyRectThreadedTest.cpp
index d7c40b1..e3b58a3 100644
--- a/tests/PathOpsSimplifyRectThreadedTest.cpp
+++ b/tests/PathOpsSimplifyRectThreadedTest.cpp
@@ -5,10 +5,10 @@
* found in the LICENSE file.
*/
-#include "PathOpsExtendedTest.h"
-#include "PathOpsThreadedCommon.h"
-#include "SkMacros.h"
-#include "SkString.h"
+#include "include/core/SkString.h"
+#include "include/private/SkMacros.h"
+#include "tests/PathOpsExtendedTest.h"
+#include "tests/PathOpsThreadedCommon.h"
// four rects, of four sizes
// for 3 smaller sizes, tall, wide
diff --git a/tests/PathOpsSimplifyTest.cpp b/tests/PathOpsSimplifyTest.cpp
index b0a1110..e95a902 100644
--- a/tests/PathOpsSimplifyTest.cpp
+++ b/tests/PathOpsSimplifyTest.cpp
@@ -4,7 +4,7 @@
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
-#include "PathOpsExtendedTest.h"
+#include "tests/PathOpsExtendedTest.h"
#define TEST(name) { name, #name }
diff --git a/tests/PathOpsSimplifyTrianglesThreadedTest.cpp b/tests/PathOpsSimplifyTrianglesThreadedTest.cpp
index 372b667..52f0a84 100644
--- a/tests/PathOpsSimplifyTrianglesThreadedTest.cpp
+++ b/tests/PathOpsSimplifyTrianglesThreadedTest.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 "PathOpsExtendedTest.h"
-#include "PathOpsThreadedCommon.h"
-#include "SkString.h"
+#include "include/core/SkString.h"
+#include "tests/PathOpsExtendedTest.h"
+#include "tests/PathOpsThreadedCommon.h"
static void testSimplifyTrianglesMain(PathOpsThreadState* data) {
SkASSERT(data);
diff --git a/tests/PathOpsSkpTest.cpp b/tests/PathOpsSkpTest.cpp
index c89b408..efbe0e5 100644
--- a/tests/PathOpsSkpTest.cpp
+++ b/tests/PathOpsSkpTest.cpp
@@ -4,7 +4,7 @@
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
-#include "PathOpsExtendedTest.h"
+#include "tests/PathOpsExtendedTest.h"
#define TEST(name) { name, #name }
diff --git a/tests/PathOpsTSectDebug.h b/tests/PathOpsTSectDebug.h
index 7467d3e..c2224d5 100644
--- a/tests/PathOpsTSectDebug.h
+++ b/tests/PathOpsTSectDebug.h
@@ -7,7 +7,7 @@
#ifndef PathOpsTSectDebug_DEFINED
#define PathOpsTSectDebug_DEFINED
-#include "SkPathOpsTSect.h"
+#include "src/pathops/SkPathOpsTSect.h"
#endif // PathOpsTSectDebug_DEFINED
diff --git a/tests/PathOpsTestCommon.cpp b/tests/PathOpsTestCommon.cpp
index c067d1d..4d7ee1c 100644
--- a/tests/PathOpsTestCommon.cpp
+++ b/tests/PathOpsTestCommon.cpp
@@ -4,15 +4,15 @@
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
-#include "PathOpsTestCommon.h"
-#include "SkPathOpsBounds.h"
-#include "SkPathOpsConic.h"
-#include "SkPathOpsCubic.h"
-#include "SkPathOpsLine.h"
-#include "SkPathOpsQuad.h"
-#include "SkPathOpsTSect.h"
-#include "SkReduceOrder.h"
-#include "SkTSort.h"
+#include "src/core/SkTSort.h"
+#include "src/pathops/SkPathOpsBounds.h"
+#include "src/pathops/SkPathOpsConic.h"
+#include "src/pathops/SkPathOpsCubic.h"
+#include "src/pathops/SkPathOpsLine.h"
+#include "src/pathops/SkPathOpsQuad.h"
+#include "src/pathops/SkPathOpsTSect.h"
+#include "src/pathops/SkReduceOrder.h"
+#include "tests/PathOpsTestCommon.h"
#include <utility>
diff --git a/tests/PathOpsTestCommon.h b/tests/PathOpsTestCommon.h
index ba64d93..5b5cd0f 100644
--- a/tests/PathOpsTestCommon.h
+++ b/tests/PathOpsTestCommon.h
@@ -7,8 +7,8 @@
#ifndef PathOpsTestCommon_DEFINED
#define PathOpsTestCommon_DEFINED
-#include "SkPathOpsQuad.h"
-#include "SkTArray.h"
+#include "include/private/SkTArray.h"
+#include "src/pathops/SkPathOpsQuad.h"
struct SkPathOpsBounds;
diff --git a/tests/PathOpsThreadedCommon.cpp b/tests/PathOpsThreadedCommon.cpp
index a1a65b7..8717922 100644
--- a/tests/PathOpsThreadedCommon.cpp
+++ b/tests/PathOpsThreadedCommon.cpp
@@ -5,9 +5,9 @@
* found in the LICENSE file.
*/
-#include "PathOpsExtendedTest.h"
-#include "PathOpsThreadedCommon.h"
-#include "SkTaskGroup.h"
+#include "src/core/SkTaskGroup.h"
+#include "tests/PathOpsExtendedTest.h"
+#include "tests/PathOpsThreadedCommon.h"
PathOpsThreadedTestRunner::~PathOpsThreadedTestRunner() {
for (int index = 0; index < fRunnables.count(); index++) {
diff --git a/tests/PathOpsThreadedCommon.h b/tests/PathOpsThreadedCommon.h
index 32902c8..4b4c9b8 100644
--- a/tests/PathOpsThreadedCommon.h
+++ b/tests/PathOpsThreadedCommon.h
@@ -7,11 +7,11 @@
#ifndef PathOpsThreadedCommon_DEFINED
#define PathOpsThreadedCommon_DEFINED
-#include "SkBitmap.h"
-#include "SkGraphics.h"
-#include "SkPath.h"
-#include "SkPathOps.h"
-#include "SkTDArray.h"
+#include "include/core/SkBitmap.h"
+#include "include/core/SkGraphics.h"
+#include "include/core/SkPath.h"
+#include "include/pathops/SkPathOps.h"
+#include "include/private/SkTDArray.h"
#include <string>
diff --git a/tests/PathOpsThreeWayTest.cpp b/tests/PathOpsThreeWayTest.cpp
index b86ff65..0a4127b 100644
--- a/tests/PathOpsThreeWayTest.cpp
+++ b/tests/PathOpsThreeWayTest.cpp
@@ -4,10 +4,10 @@
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
-#include "PathOpsTestCommon.h"
-#include "SkIntersections.h"
-#include "SkTDArray.h"
-#include "Test.h"
+#include "include/private/SkTDArray.h"
+#include "src/pathops/SkIntersections.h"
+#include "tests/PathOpsTestCommon.h"
+#include "tests/Test.h"
// check intersections for consistency
diff --git a/tests/PathOpsTigerTest.cpp b/tests/PathOpsTigerTest.cpp
index 99af9b9..afcac8b 100644
--- a/tests/PathOpsTigerTest.cpp
+++ b/tests/PathOpsTigerTest.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 "PathOpsDebug.h"
-#include "PathOpsExtendedTest.h"
-#include "PathOpsThreadedCommon.h"
+#include "tests/PathOpsDebug.h"
+#include "tests/PathOpsExtendedTest.h"
+#include "tests/PathOpsThreadedCommon.h"
#include <atomic>
@@ -182,7 +182,7 @@
testSimplify(reporter, path, testName.c_str());
}
-#include "SkRandom.h"
+#include "include/utils/SkRandom.h"
static void tiger8a_h_1(skiatest::Reporter* reporter, const char* ) {
uint64_t testlines = 0x0000000000002008; // best so far: 0x0000001d14c14bb1;
diff --git a/tests/PathOpsTightBoundsTest.cpp b/tests/PathOpsTightBoundsTest.cpp
index a2e7bca..2af11be 100644
--- a/tests/PathOpsTightBoundsTest.cpp
+++ b/tests/PathOpsTightBoundsTest.cpp
@@ -4,12 +4,12 @@
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
-#include "PathOpsExtendedTest.h"
-#include "PathOpsThreadedCommon.h"
-#include "SkCanvas.h"
-#include "SkRandom.h"
-#include "SkTSort.h"
-#include "Test.h"
+#include "include/core/SkCanvas.h"
+#include "include/utils/SkRandom.h"
+#include "src/core/SkTSort.h"
+#include "tests/PathOpsExtendedTest.h"
+#include "tests/PathOpsThreadedCommon.h"
+#include "tests/Test.h"
static void testTightBoundsLines(PathOpsThreadState* data) {
SkRandom ran;
diff --git a/tests/PathOpsTypesTest.cpp b/tests/PathOpsTypesTest.cpp
index a3b051e..e513c95 100644
--- a/tests/PathOpsTypesTest.cpp
+++ b/tests/PathOpsTypesTest.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 "PathOpsTestCommon.h"
-#include "Test.h"
+#include "tests/PathOpsTestCommon.h"
+#include "tests/Test.h"
static const double roughlyTests[][2] = {
{5.0402503619650929e-005, 4.3178054475078825e-005}
diff --git a/tests/PathRendererCacheTests.cpp b/tests/PathRendererCacheTests.cpp
index b02517c..ae59b55 100644
--- a/tests/PathRendererCacheTests.cpp
+++ b/tests/PathRendererCacheTests.cpp
@@ -5,18 +5,18 @@
* found in the LICENSE file.
*/
-#include "Test.h"
+#include "tests/Test.h"
-#include "GrClip.h"
-#include "GrContext.h"
-#include "GrContextPriv.h"
-#include "GrResourceCache.h"
-#include "GrShape.h"
-#include "GrSoftwarePathRenderer.h"
-#include "GrStyle.h"
-#include "SkPath.h"
-#include "effects/GrPorterDuffXferProcessor.h"
-#include "ops/GrTessellatingPathRenderer.h"
+#include "include/core/SkPath.h"
+#include "include/gpu/GrContext.h"
+#include "src/gpu/GrClip.h"
+#include "src/gpu/GrContextPriv.h"
+#include "src/gpu/GrResourceCache.h"
+#include "src/gpu/GrShape.h"
+#include "src/gpu/GrSoftwarePathRenderer.h"
+#include "src/gpu/GrStyle.h"
+#include "src/gpu/effects/GrPorterDuffXferProcessor.h"
+#include "src/gpu/ops/GrTessellatingPathRenderer.h"
static SkPath create_concave_path() {
SkPath path;
diff --git a/tests/PathTest.cpp b/tests/PathTest.cpp
index a1e170c..beaafd0 100644
--- a/tests/PathTest.cpp
+++ b/tests/PathTest.cpp
@@ -5,26 +5,26 @@
* found in the LICENSE file.
*/
-#include "SkAutoMalloc.h"
-#include "SkCanvas.h"
-#include "SkFont.h"
-#include "SkGeometry.h"
-#include "SkNullCanvas.h"
-#include "SkPaint.h"
-#include "SkParse.h"
-#include "SkParsePath.h"
-#include "SkPathEffect.h"
-#include "SkPathPriv.h"
-#include "SkRRect.h"
-#include "SkRandom.h"
-#include "SkReader32.h"
-#include "SkSize.h"
-#include "SkStream.h"
-#include "SkStrokeRec.h"
-#include "SkSurface.h"
-#include "SkTo.h"
-#include "SkWriter32.h"
-#include "Test.h"
+#include "include/core/SkCanvas.h"
+#include "include/core/SkFont.h"
+#include "include/core/SkPaint.h"
+#include "include/core/SkPathEffect.h"
+#include "include/core/SkRRect.h"
+#include "include/core/SkSize.h"
+#include "include/core/SkStream.h"
+#include "include/core/SkStrokeRec.h"
+#include "include/core/SkSurface.h"
+#include "include/private/SkTo.h"
+#include "include/utils/SkNullCanvas.h"
+#include "include/utils/SkParse.h"
+#include "include/utils/SkParsePath.h"
+#include "include/utils/SkRandom.h"
+#include "src/core/SkAutoMalloc.h"
+#include "src/core/SkGeometry.h"
+#include "src/core/SkPathPriv.h"
+#include "src/core/SkReader32.h"
+#include "src/core/SkWriter32.h"
+#include "tests/Test.h"
#include <cmath>
#include <utility>
@@ -733,7 +733,7 @@
#endif
}
-#include "SkSurface.h"
+#include "include/core/SkSurface.h"
static void test_fuzz_crbug_627414(skiatest::Reporter* reporter) {
SkPath path;
path.moveTo(0, 0);
@@ -4606,7 +4606,7 @@
test_interp(reporter);
}
-#include "SkSurface.h"
+#include "include/core/SkSurface.h"
DEF_TEST(PathBigCubic, reporter) {
SkPath path;
path.moveTo(SkBits2Float(0x00000000), SkBits2Float(0x00000000)); // 0, 0
@@ -4837,7 +4837,7 @@
}
}
-#include "SkPathOps.h"
+#include "include/pathops/SkPathOps.h"
DEF_TEST(path_tight_bounds, reporter) {
SkRandom rand;
@@ -5202,7 +5202,7 @@
}
}
-#include "SkVertices.h"
+#include "include/core/SkVertices.h"
static void draw_triangle(SkCanvas* canvas, const SkPoint pts[]) {
// draw in different ways, looking for an assert
diff --git a/tests/PictureBBHTest.cpp b/tests/PictureBBHTest.cpp
index da8543c..c80eee5 100644
--- a/tests/PictureBBHTest.cpp
+++ b/tests/PictureBBHTest.cpp
@@ -5,15 +5,15 @@
* found in the LICENSE file.
*/
-#include "SkBitmap.h"
-#include "SkCanvas.h"
-#include "SkBBoxHierarchy.h"
-#include "SkPaint.h"
-#include "SkPicture.h"
-#include "SkPictureRecorder.h"
-#include "SkRectPriv.h"
+#include "include/core/SkBitmap.h"
+#include "include/core/SkCanvas.h"
+#include "include/core/SkPaint.h"
+#include "include/core/SkPicture.h"
+#include "include/core/SkPictureRecorder.h"
+#include "src/core/SkBBoxHierarchy.h"
+#include "src/core/SkRectPriv.h"
-#include "Test.h"
+#include "tests/Test.h"
class PictureBBHTestBase {
public:
diff --git a/tests/PictureShaderTest.cpp b/tests/PictureShaderTest.cpp
index 6970ffe..1698724 100644
--- a/tests/PictureShaderTest.cpp
+++ b/tests/PictureShaderTest.cpp
@@ -5,13 +5,13 @@
* found in the LICENSE file.
*/
-#include "SkCanvas.h"
-#include "SkPicture.h"
-#include "SkPictureRecorder.h"
-#include "SkPictureShader.h"
-#include "SkShader.h"
-#include "SkSurface.h"
-#include "Test.h"
+#include "include/core/SkCanvas.h"
+#include "include/core/SkPicture.h"
+#include "include/core/SkPictureRecorder.h"
+#include "include/core/SkShader.h"
+#include "include/core/SkSurface.h"
+#include "src/shaders/SkPictureShader.h"
+#include "tests/Test.h"
// Test that the SkPictureShader cache is purged on shader deletion.
DEF_TEST(PictureShader_caching, reporter) {
diff --git a/tests/PictureTest.cpp b/tests/PictureTest.cpp
index 068189f..e851cfb 100644
--- a/tests/PictureTest.cpp
+++ b/tests/PictureTest.cpp
@@ -5,34 +5,34 @@
* found in the LICENSE file.
*/
-#include "SkBBHFactory.h"
-#include "SkBBoxHierarchy.h"
-#include "SkBigPicture.h"
-#include "SkBitmap.h"
-#include "SkCanvas.h"
-#include "SkClipOp.h"
-#include "SkClipOpPriv.h"
-#include "SkColor.h"
-#include "SkData.h"
-#include "SkFontStyle.h"
-#include "SkImageInfo.h"
-#include "SkMatrix.h"
-#include "SkMiniRecorder.h"
-#include "SkPaint.h"
-#include "SkPath.h"
-#include "SkPicturePriv.h"
-#include "SkPictureRecorder.h"
-#include "SkPixelRef.h"
-#include "SkRandom.h"
-#include "SkRect.h"
-#include "SkRectPriv.h"
-#include "SkRefCnt.h"
-#include "SkScalar.h"
-#include "SkShader.h"
-#include "SkStream.h"
-#include "SkTypeface.h"
-#include "SkTypes.h"
-#include "Test.h"
+#include "include/core/SkBBHFactory.h"
+#include "include/core/SkBitmap.h"
+#include "include/core/SkCanvas.h"
+#include "include/core/SkClipOp.h"
+#include "include/core/SkColor.h"
+#include "include/core/SkData.h"
+#include "include/core/SkFontStyle.h"
+#include "include/core/SkImageInfo.h"
+#include "include/core/SkMatrix.h"
+#include "include/core/SkPaint.h"
+#include "include/core/SkPath.h"
+#include "include/core/SkPictureRecorder.h"
+#include "include/core/SkPixelRef.h"
+#include "include/core/SkRect.h"
+#include "include/core/SkRefCnt.h"
+#include "include/core/SkScalar.h"
+#include "include/core/SkShader.h"
+#include "include/core/SkStream.h"
+#include "include/core/SkTypeface.h"
+#include "include/core/SkTypes.h"
+#include "include/utils/SkRandom.h"
+#include "src/core/SkBBoxHierarchy.h"
+#include "src/core/SkBigPicture.h"
+#include "src/core/SkClipOpPriv.h"
+#include "src/core/SkMiniRecorder.h"
+#include "src/core/SkPicturePriv.h"
+#include "src/core/SkRectPriv.h"
+#include "tests/Test.h"
#include <memory>
diff --git a/tests/PinnedImageTest.cpp b/tests/PinnedImageTest.cpp
index 00720a5..6ec2bb0 100644
--- a/tests/PinnedImageTest.cpp
+++ b/tests/PinnedImageTest.cpp
@@ -7,15 +7,15 @@
// This is a GPU-backend specific test.
-#include "Test.h"
+#include "tests/Test.h"
using namespace sk_gpu_test;
-#include "GrContextFactory.h"
+#include "tools/gpu/GrContextFactory.h"
-#include "SkCanvas.h"
-#include "SkImagePriv.h"
-#include "SkSurface.h"
+#include "include/core/SkCanvas.h"
+#include "include/core/SkSurface.h"
+#include "src/core/SkImagePriv.h"
static bool surface_is_expected_color(SkSurface* surf, const SkImageInfo& ii, SkColor color) {
SkBitmap bm;
diff --git a/tests/PixelRefTest.cpp b/tests/PixelRefTest.cpp
index c978d81..734c952 100644
--- a/tests/PixelRefTest.cpp
+++ b/tests/PixelRefTest.cpp
@@ -5,10 +5,10 @@
* found in the LICENSE file.
*/
-#include "Test.h"
+#include "tests/Test.h"
-#include "SkMallocPixelRef.h"
-#include "SkPixelRef.h"
+#include "include/core/SkMallocPixelRef.h"
+#include "include/core/SkPixelRef.h"
static void decrement_counter_proc(void* pixels, void* ctx) {
int* counter = (int*)ctx;
diff --git a/tests/Point3Test.cpp b/tests/Point3Test.cpp
index d131007..9a20a04 100644
--- a/tests/Point3Test.cpp
+++ b/tests/Point3Test.cpp
@@ -7,9 +7,9 @@
// Unit tests for src/core/SkPoint3.cpp and its header
-#include "SkPoint3.h"
-#include "SkRandom.h"
-#include "Test.h"
+#include "include/core/SkPoint3.h"
+#include "include/utils/SkRandom.h"
+#include "tests/Test.h"
static void test_eq_ops(skiatest::Reporter* reporter) {
const SkPoint3 p0 = SkPoint3::Make(0, 0, 0);
diff --git a/tests/PointTest.cpp b/tests/PointTest.cpp
index 23729b5..ea01ad0 100644
--- a/tests/PointTest.cpp
+++ b/tests/PointTest.cpp
@@ -6,9 +6,9 @@
*/
// Unit tests for src/core/SkPoint.cpp and its header
-#include "SkPointPriv.h"
-#include "SkRect.h"
-#include "Test.h"
+#include "include/core/SkRect.h"
+#include "src/core/SkPointPriv.h"
+#include "tests/Test.h"
static void test_casts(skiatest::Reporter* reporter) {
SkPoint p = { 0, 0 };
diff --git a/tests/PolyUtilsTest.cpp b/tests/PolyUtilsTest.cpp
index 837443e..8535157 100644
--- a/tests/PolyUtilsTest.cpp
+++ b/tests/PolyUtilsTest.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 "Test.h"
-#include "SkPolyUtils.h"
+#include "src/utils/SkPolyUtils.h"
+#include "tests/Test.h"
DEF_TEST(PolyUtils, reporter) {
diff --git a/tests/PremulAlphaRoundTripTest.cpp b/tests/PremulAlphaRoundTripTest.cpp
index 3c26df5..168ea01 100644
--- a/tests/PremulAlphaRoundTripTest.cpp
+++ b/tests/PremulAlphaRoundTripTest.cpp
@@ -5,12 +5,12 @@
* found in the LICENSE file.
*/
-#include "SkCanvas.h"
-#include "SkSurface.h"
-#include "Test.h"
-#include "ToolUtils.h"
+#include "include/core/SkCanvas.h"
+#include "include/core/SkSurface.h"
+#include "tests/Test.h"
+#include "tools/ToolUtils.h"
-#include "GrContext.h"
+#include "include/gpu/GrContext.h"
static uint32_t pack_unpremul_rgba(SkColor c) {
uint32_t packed;
diff --git a/tests/PrimitiveProcessorTest.cpp b/tests/PrimitiveProcessorTest.cpp
index 38b3270..ef4d102 100644
--- a/tests/PrimitiveProcessorTest.cpp
+++ b/tests/PrimitiveProcessorTest.cpp
@@ -7,23 +7,23 @@
// This is a GPU-backend specific test. It relies on static intializers to work
-#include "SkTypes.h"
-#include "Test.h"
+#include "include/core/SkTypes.h"
+#include "tests/Test.h"
-#include "GrContext.h"
-#include "GrContextPriv.h"
-#include "GrGeometryProcessor.h"
-#include "GrGpu.h"
-#include "GrMemoryPool.h"
-#include "GrOpFlushState.h"
-#include "GrRenderTargetContext.h"
-#include "GrRenderTargetContextPriv.h"
-#include "SkPointPriv.h"
-#include "SkString.h"
-#include "glsl/GrGLSLFragmentShaderBuilder.h"
-#include "glsl/GrGLSLGeometryProcessor.h"
-#include "glsl/GrGLSLVarying.h"
-#include "ops/GrMeshDrawOp.h"
+#include "include/core/SkString.h"
+#include "include/gpu/GrContext.h"
+#include "src/core/SkPointPriv.h"
+#include "src/gpu/GrContextPriv.h"
+#include "src/gpu/GrGeometryProcessor.h"
+#include "src/gpu/GrGpu.h"
+#include "src/gpu/GrMemoryPool.h"
+#include "src/gpu/GrOpFlushState.h"
+#include "src/gpu/GrRenderTargetContext.h"
+#include "src/gpu/GrRenderTargetContextPriv.h"
+#include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h"
+#include "src/gpu/glsl/GrGLSLGeometryProcessor.h"
+#include "src/gpu/glsl/GrGLSLVarying.h"
+#include "src/gpu/ops/GrMeshDrawOp.h"
namespace {
class Op : public GrMeshDrawOp {
diff --git a/tests/ProcessorTest.cpp b/tests/ProcessorTest.cpp
index 4fd7fea..8068701 100644
--- a/tests/ProcessorTest.cpp
+++ b/tests/ProcessorTest.cpp
@@ -5,23 +5,23 @@
* found in the LICENSE file.
*/
-#include "SkTypes.h"
-#include "Test.h"
+#include "include/core/SkTypes.h"
+#include "tests/Test.h"
-#include "GrClip.h"
-#include "GrContext.h"
-#include "GrContextPriv.h"
-#include "GrGpuResource.h"
-#include "GrMemoryPool.h"
-#include "GrProxyProvider.h"
-#include "GrRenderTargetContext.h"
-#include "GrRenderTargetContextPriv.h"
-#include "GrResourceProvider.h"
-#include "glsl/GrGLSLFragmentProcessor.h"
-#include "glsl/GrGLSLFragmentShaderBuilder.h"
-#include "ops/GrFillRectOp.h"
-#include "ops/GrMeshDrawOp.h"
-#include "TestUtils.h"
+#include "include/gpu/GrContext.h"
+#include "include/gpu/GrGpuResource.h"
+#include "src/gpu/GrClip.h"
+#include "src/gpu/GrContextPriv.h"
+#include "src/gpu/GrMemoryPool.h"
+#include "src/gpu/GrProxyProvider.h"
+#include "src/gpu/GrRenderTargetContext.h"
+#include "src/gpu/GrRenderTargetContextPriv.h"
+#include "src/gpu/GrResourceProvider.h"
+#include "src/gpu/glsl/GrGLSLFragmentProcessor.h"
+#include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h"
+#include "src/gpu/ops/GrFillRectOp.h"
+#include "src/gpu/ops/GrMeshDrawOp.h"
+#include "tests/TestUtils.h"
#include <atomic>
#include <random>
@@ -230,7 +230,7 @@
// This test uses the random GrFragmentProcessor test factory, which relies on static initializers.
#if SK_ALLOW_STATIC_GLOBAL_INITIALIZERS
-#include "CommandLineFlags.h"
+#include "tools/flags/CommandLineFlags.h"
static DEFINE_bool(randomProcessorTest, false,
"Use non-deterministic seed for random processor tests?");
static DEFINE_int(processorSeed, 0,
diff --git a/tests/PromiseImageTest.cpp b/tests/PromiseImageTest.cpp
index 89bcefa..7aaf84c 100644
--- a/tests/PromiseImageTest.cpp
+++ b/tests/PromiseImageTest.cpp
@@ -5,15 +5,15 @@
* found in the LICENSE file.
*/
-#include "Test.h"
+#include "tests/Test.h"
-#include "GrBackendSurface.h"
-#include "GrContextPriv.h"
-#include "GrGpu.h"
-#include "GrTexture.h"
-#include "SkImage_Gpu.h"
-#include "SkColorFilter.h"
-#include "SkPromiseImageTexture.h"
+#include "include/core/SkColorFilter.h"
+#include "include/core/SkPromiseImageTexture.h"
+#include "include/gpu/GrBackendSurface.h"
+#include "include/gpu/GrTexture.h"
+#include "src/gpu/GrContextPriv.h"
+#include "src/gpu/GrGpu.h"
+#include "src/image/SkImage_Gpu.h"
using namespace sk_gpu_test;
diff --git a/tests/ProxyConversionTest.cpp b/tests/ProxyConversionTest.cpp
index 58ba26b..3573d19 100644
--- a/tests/ProxyConversionTest.cpp
+++ b/tests/ProxyConversionTest.cpp
@@ -7,17 +7,17 @@
// This is a GPU-backend specific test.
-#include "Test.h"
+#include "tests/Test.h"
-#include "GrBackendSurface.h"
-#include "GrContextPriv.h"
-#include "GrGpu.h"
-#include "GrProxyProvider.h"
-#include "GrRenderTarget.h"
-#include "GrRenderTargetProxy.h"
-#include "GrSurfaceProxy.h"
-#include "GrTexture.h"
-#include "GrTextureProxy.h"
+#include "include/gpu/GrBackendSurface.h"
+#include "include/gpu/GrRenderTarget.h"
+#include "include/gpu/GrTexture.h"
+#include "include/private/GrRenderTargetProxy.h"
+#include "include/private/GrSurfaceProxy.h"
+#include "include/private/GrTextureProxy.h"
+#include "src/gpu/GrContextPriv.h"
+#include "src/gpu/GrGpu.h"
+#include "src/gpu/GrProxyProvider.h"
static sk_sp<GrSurfaceProxy> make_wrapped_rt(GrProxyProvider* provider,
GrGpu* gpu,
diff --git a/tests/ProxyRefTest.cpp b/tests/ProxyRefTest.cpp
index 90aac0c..3358079 100644
--- a/tests/ProxyRefTest.cpp
+++ b/tests/ProxyRefTest.cpp
@@ -7,16 +7,16 @@
// This is a GPU-backend specific test.
-#include "Test.h"
+#include "tests/Test.h"
-#include "GrContextPriv.h"
-#include "GrPendingIOResource.h"
-#include "GrProxyProvider.h"
-#include "GrRenderTargetProxy.h"
-#include "GrResourceProvider.h"
-#include "GrSurfaceProxy.h"
-#include "GrTexture.h"
-#include "GrTextureProxy.h"
+#include "include/gpu/GrTexture.h"
+#include "include/private/GrRenderTargetProxy.h"
+#include "include/private/GrSurfaceProxy.h"
+#include "include/private/GrTextureProxy.h"
+#include "src/gpu/GrContextPriv.h"
+#include "src/gpu/GrPendingIOResource.h"
+#include "src/gpu/GrProxyProvider.h"
+#include "src/gpu/GrResourceProvider.h"
int32_t GrIORefProxy::getBackingRefCnt_TestOnly() const {
if (fTarget) {
diff --git a/tests/ProxyTest.cpp b/tests/ProxyTest.cpp
index c65d221..bd646e8 100644
--- a/tests/ProxyTest.cpp
+++ b/tests/ProxyTest.cpp
@@ -7,20 +7,20 @@
// This is a GPU-backend specific test.
-#include "Test.h"
+#include "tests/Test.h"
-#include "GrBackendSurface.h"
-#include "GrContextPriv.h"
-#include "GrProxyProvider.h"
-#include "GrRenderTargetPriv.h"
-#include "GrRenderTargetProxy.h"
-#include "GrResourceProvider.h"
-#include "GrSurfacePriv.h"
-#include "GrSurfaceProxyPriv.h"
-#include "GrTexture.h"
-#include "GrTextureProxy.h"
-#include "SkGr.h"
-#include "gl/GrGLDefines.h"
+#include "include/gpu/GrBackendSurface.h"
+#include "include/gpu/GrTexture.h"
+#include "include/private/GrRenderTargetProxy.h"
+#include "include/private/GrTextureProxy.h"
+#include "src/gpu/GrContextPriv.h"
+#include "src/gpu/GrProxyProvider.h"
+#include "src/gpu/GrRenderTargetPriv.h"
+#include "src/gpu/GrResourceProvider.h"
+#include "src/gpu/GrSurfacePriv.h"
+#include "src/gpu/GrSurfaceProxyPriv.h"
+#include "src/gpu/SkGr.h"
+#include "src/gpu/gl/GrGLDefines.h"
// Check that the surface proxy's member vars are set as expected
static void check_surface(skiatest::Reporter* reporter,
diff --git a/tests/QuickRejectTest.cpp b/tests/QuickRejectTest.cpp
index 4f5ad8f..580ba78 100644
--- a/tests/QuickRejectTest.cpp
+++ b/tests/QuickRejectTest.cpp
@@ -5,14 +5,14 @@
* found in the LICENSE file.
*/
-#include "SkArenaAlloc.h"
-#include "SkBitmap.h"
-#include "SkCanvas.h"
-#include "SkDrawLooper.h"
-#include "SkLightingImageFilter.h"
-#include "SkPoint3.h"
-#include "SkTypes.h"
-#include "Test.h"
+#include "include/core/SkBitmap.h"
+#include "include/core/SkCanvas.h"
+#include "include/core/SkDrawLooper.h"
+#include "include/core/SkPoint3.h"
+#include "include/core/SkTypes.h"
+#include "include/effects/SkLightingImageFilter.h"
+#include "include/private/SkArenaAlloc.h"
+#include "tests/Test.h"
/*
* Subclass of looper that just draws once, with an offset in X.
@@ -166,8 +166,8 @@
canvas.quickReject(SkRect::MakeWH(100.0f, 100.0f));
}
-#include "SkLayerDrawLooper.h"
-#include "SkSurface.h"
+#include "include/core/SkSurface.h"
+#include "include/effects/SkLayerDrawLooper.h"
DEF_TEST(looper_nothingtodraw, reporter) {
auto surf = SkSurface::MakeRasterN32Premul(20, 20);
diff --git a/tests/RRectInPathTest.cpp b/tests/RRectInPathTest.cpp
index 5ad3403..a25ad45 100644
--- a/tests/RRectInPathTest.cpp
+++ b/tests/RRectInPathTest.cpp
@@ -5,11 +5,11 @@
* found in the LICENSE file.
*/
-#include "SkMatrix.h"
-#include "SkPath.h"
-#include "SkPathPriv.h"
-#include "SkRRect.h"
-#include "Test.h"
+#include "include/core/SkMatrix.h"
+#include "include/core/SkPath.h"
+#include "include/core/SkRRect.h"
+#include "src/core/SkPathPriv.h"
+#include "tests/Test.h"
static SkRRect path_contains_rrect(skiatest::Reporter* reporter, const SkPath& path,
SkPath::Direction* dir, unsigned* start) {
diff --git a/tests/RTreeTest.cpp b/tests/RTreeTest.cpp
index 9b451d1..061e4d3 100644
--- a/tests/RTreeTest.cpp
+++ b/tests/RTreeTest.cpp
@@ -5,9 +5,9 @@
* found in the LICENSE file.
*/
-#include "SkRTree.h"
-#include "SkRandom.h"
-#include "Test.h"
+#include "include/utils/SkRandom.h"
+#include "src/core/SkRTree.h"
+#include "tests/Test.h"
static const int NUM_RECTS = 200;
static const size_t NUM_ITERATIONS = 100;
diff --git a/tests/RandomTest.cpp b/tests/RandomTest.cpp
index 448f073..0e206ee 100644
--- a/tests/RandomTest.cpp
+++ b/tests/RandomTest.cpp
@@ -5,9 +5,9 @@
* found in the LICENSE file.
*/
-#include "SkRandom.h"
-#include "SkTSort.h"
-#include "Test.h"
+#include "include/utils/SkRandom.h"
+#include "src/core/SkTSort.h"
+#include "tests/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 46c7d14..316db79 100644
--- a/tests/ReadPixelsTest.cpp
+++ b/tests/ReadPixelsTest.cpp
@@ -6,20 +6,20 @@
*/
#include <initializer_list>
-#include "SkCanvas.h"
-#include "SkColorData.h"
-#include "SkHalf.h"
-#include "SkImageInfoPriv.h"
-#include "SkMathPriv.h"
-#include "SkSurface.h"
-#include "Test.h"
+#include "include/core/SkCanvas.h"
+#include "include/core/SkSurface.h"
+#include "include/private/SkColorData.h"
+#include "include/private/SkHalf.h"
+#include "include/private/SkImageInfoPriv.h"
+#include "src/core/SkMathPriv.h"
+#include "tests/Test.h"
-#include "GrContext.h"
-#include "GrContextFactory.h"
-#include "GrContextPriv.h"
-#include "GrProxyProvider.h"
-#include "ProxyUtils.h"
-#include "SkGr.h"
+#include "include/gpu/GrContext.h"
+#include "src/gpu/GrContextPriv.h"
+#include "src/gpu/GrProxyProvider.h"
+#include "src/gpu/SkGr.h"
+#include "tools/gpu/GrContextFactory.h"
+#include "tools/gpu/ProxyUtils.h"
static const int DEV_W = 100, DEV_H = 100;
diff --git a/tests/ReadWriteAlphaTest.cpp b/tests/ReadWriteAlphaTest.cpp
index 826ea9a..2cb39e1 100644
--- a/tests/ReadWriteAlphaTest.cpp
+++ b/tests/ReadWriteAlphaTest.cpp
@@ -5,20 +5,20 @@
* found in the LICENSE file.
*/
-#include "Test.h"
+#include "tests/Test.h"
// This test is specific to the GPU backend.
-#include "GrContext.h"
-#include "GrContextPriv.h"
-#include "GrProxyProvider.h"
-#include "GrResourceProvider.h"
-#include "GrSurfaceContext.h"
-#include "GrSurfaceProxy.h"
-#include "GrTextureProxy.h"
-#include "ProxyUtils.h"
-#include "SkCanvas.h"
-#include "SkSurface.h"
-#include "SkTo.h"
+#include "include/core/SkCanvas.h"
+#include "include/core/SkSurface.h"
+#include "include/gpu/GrContext.h"
+#include "include/private/GrSurfaceProxy.h"
+#include "include/private/GrTextureProxy.h"
+#include "include/private/SkTo.h"
+#include "src/gpu/GrContextPriv.h"
+#include "src/gpu/GrProxyProvider.h"
+#include "src/gpu/GrResourceProvider.h"
+#include "src/gpu/GrSurfaceContext.h"
+#include "tools/gpu/ProxyUtils.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/Reader32Test.cpp b/tests/Reader32Test.cpp
index 301f67c..0aebc9e 100644
--- a/tests/Reader32Test.cpp
+++ b/tests/Reader32Test.cpp
@@ -5,8 +5,8 @@
* found in the LICENSE file.
*/
-#include "SkReader32.h"
-#include "Test.h"
+#include "src/core/SkReader32.h"
+#include "tests/Test.h"
static void assert_eof(skiatest::Reporter* reporter, const SkReader32& reader) {
REPORTER_ASSERT(reporter, reader.eof());
diff --git a/tests/RecordDrawTest.cpp b/tests/RecordDrawTest.cpp
index 7a82aeb..8d579bc 100644
--- a/tests/RecordDrawTest.cpp
+++ b/tests/RecordDrawTest.cpp
@@ -5,18 +5,18 @@
* found in the LICENSE file.
*/
-#include "Test.h"
-#include "RecordTestUtils.h"
+#include "tests/RecordTestUtils.h"
+#include "tests/Test.h"
-#include "DebugCanvas.h"
-#include "SkDropShadowImageFilter.h"
-#include "SkImagePriv.h"
-#include "SkRecord.h"
-#include "SkRecordDraw.h"
-#include "SkRecordOpts.h"
-#include "SkRecorder.h"
-#include "SkRecords.h"
-#include "SkSurface.h"
+#include "include/core/SkSurface.h"
+#include "include/effects/SkDropShadowImageFilter.h"
+#include "src/core/SkImagePriv.h"
+#include "src/core/SkRecord.h"
+#include "src/core/SkRecordDraw.h"
+#include "src/core/SkRecordOpts.h"
+#include "src/core/SkRecorder.h"
+#include "src/core/SkRecords.h"
+#include "tools/debugger/DebugCanvas.h"
static const int W = 1920, H = 1080;
diff --git a/tests/RecordOptsTest.cpp b/tests/RecordOptsTest.cpp
index 9037753..cd882cf 100644
--- a/tests/RecordOptsTest.cpp
+++ b/tests/RecordOptsTest.cpp
@@ -5,18 +5,18 @@
* found in the LICENSE file.
*/
-#include "Test.h"
-#include "RecordTestUtils.h"
+#include "tests/RecordTestUtils.h"
+#include "tests/Test.h"
-#include "SkBlurImageFilter.h"
-#include "SkColorFilter.h"
-#include "SkRecord.h"
-#include "SkRecordOpts.h"
-#include "SkRecorder.h"
-#include "SkRecords.h"
-#include "SkPictureRecorder.h"
-#include "SkPictureImageFilter.h"
-#include "SkSurface.h"
+#include "include/core/SkColorFilter.h"
+#include "include/core/SkPictureRecorder.h"
+#include "include/core/SkSurface.h"
+#include "include/effects/SkBlurImageFilter.h"
+#include "include/effects/SkPictureImageFilter.h"
+#include "src/core/SkRecord.h"
+#include "src/core/SkRecordOpts.h"
+#include "src/core/SkRecorder.h"
+#include "src/core/SkRecords.h"
static const int W = 1920, H = 1080;
diff --git a/tests/RecordPatternTest.cpp b/tests/RecordPatternTest.cpp
index 33a0114..816ac3a 100644
--- a/tests/RecordPatternTest.cpp
+++ b/tests/RecordPatternTest.cpp
@@ -5,12 +5,12 @@
* found in the LICENSE file.
*/
-#include "Test.h"
+#include "tests/Test.h"
-#include "SkRecord.h"
-#include "SkRecordPattern.h"
-#include "SkRecorder.h"
-#include "SkRecords.h"
+#include "src/core/SkRecord.h"
+#include "src/core/SkRecordPattern.h"
+#include "src/core/SkRecorder.h"
+#include "src/core/SkRecords.h"
using namespace SkRecords;
typedef Pattern<Is<Save>,
diff --git a/tests/RecordTest.cpp b/tests/RecordTest.cpp
index 165532c..f1056c2 100644
--- a/tests/RecordTest.cpp
+++ b/tests/RecordTest.cpp
@@ -5,13 +5,13 @@
* found in the LICENSE file.
*/
-#include "RecordTestUtils.h"
-#include "SkBitmap.h"
-#include "SkImageInfo.h"
-#include "SkRecord.h"
-#include "SkRecords.h"
-#include "SkShader.h"
-#include "Test.h"
+#include "include/core/SkBitmap.h"
+#include "include/core/SkImageInfo.h"
+#include "include/core/SkShader.h"
+#include "src/core/SkRecord.h"
+#include "src/core/SkRecords.h"
+#include "tests/RecordTestUtils.h"
+#include "tests/Test.h"
#include <new>
diff --git a/tests/RecordTestUtils.h b/tests/RecordTestUtils.h
index 853ee21..2984bad 100644
--- a/tests/RecordTestUtils.h
+++ b/tests/RecordTestUtils.h
@@ -8,9 +8,9 @@
#ifndef RecordTestUtils_DEFINED
#define RecordTestUtils_DEFINED
-#include "SkRecord.h"
-#include "SkRecords.h"
-#include "Test.h"
+#include "src/core/SkRecord.h"
+#include "src/core/SkRecords.h"
+#include "tests/Test.h"
// If the command we're reading is a U, set ptr to it, otherwise set it to nullptr.
template <typename U>
diff --git a/tests/RecorderTest.cpp b/tests/RecorderTest.cpp
index 3e989e2..987cfbe 100644
--- a/tests/RecorderTest.cpp
+++ b/tests/RecorderTest.cpp
@@ -5,14 +5,14 @@
* found in the LICENSE file.
*/
-#include "Test.h"
+#include "tests/Test.h"
-#include "SkPictureRecorder.h"
-#include "SkRecord.h"
-#include "SkRecorder.h"
-#include "SkRecords.h"
-#include "SkShader.h"
-#include "SkSurface.h"
+#include "include/core/SkPictureRecorder.h"
+#include "include/core/SkShader.h"
+#include "include/core/SkSurface.h"
+#include "src/core/SkRecord.h"
+#include "src/core/SkRecorder.h"
+#include "src/core/SkRecords.h"
#define COUNT(T) + 1
static const int kRecordTypes = SK_RECORD_TYPES(COUNT);
diff --git a/tests/RecordingXfermodeTest.cpp b/tests/RecordingXfermodeTest.cpp
index 41c1469..676198a 100644
--- a/tests/RecordingXfermodeTest.cpp
+++ b/tests/RecordingXfermodeTest.cpp
@@ -5,15 +5,15 @@
* found in the LICENSE file.
*/
-#include "Test.h"
+#include "tests/Test.h"
-#include "../include/core/SkBitmap.h"
-#include "../include/core/SkCanvas.h"
-#include "../include/core/SkPicture.h"
-#include "../include/core/SkStream.h"
-#include "../include/core/SkString.h"
-#include "../include/core/SkPictureRecorder.h"
-#include "../src/core/SkBlendModePriv.h"
+#include "include/core/SkBitmap.h"
+#include "include/core/SkCanvas.h"
+#include "include/core/SkPicture.h"
+#include "include/core/SkPictureRecorder.h"
+#include "include/core/SkStream.h"
+#include "include/core/SkString.h"
+#include "src/core/SkBlendModePriv.h"
#include <cstring>
diff --git a/tests/RectTest.cpp b/tests/RectTest.cpp
index 72adc9a..f9dd6e2 100644
--- a/tests/RectTest.cpp
+++ b/tests/RectTest.cpp
@@ -5,12 +5,12 @@
* found in the LICENSE file.
*/
-#include "SkBitmap.h"
-#include "SkCanvas.h"
-#include "SkPath.h"
-#include "SkRect.h"
-#include "SkRectPriv.h"
-#include "Test.h"
+#include "include/core/SkBitmap.h"
+#include "include/core/SkCanvas.h"
+#include "include/core/SkPath.h"
+#include "include/core/SkRect.h"
+#include "src/core/SkRectPriv.h"
+#include "tests/Test.h"
static bool has_green_pixels(const SkBitmap& bm) {
for (int j = 0; j < bm.height(); ++j) {
@@ -160,7 +160,7 @@
REPORTER_ASSERT(reporter, !SkScalarIsFinite(r.height()));
}
-#include "SkSurface.h"
+#include "include/core/SkSurface.h"
// Before the fix, this sequence would trigger a release_assert in the Tiler
// in SkBitmapDevice.cpp
diff --git a/tests/RectangleTextureTest.cpp b/tests/RectangleTextureTest.cpp
index ce6122a..d429adb 100644
--- a/tests/RectangleTextureTest.cpp
+++ b/tests/RectangleTextureTest.cpp
@@ -5,20 +5,20 @@
* found in the LICENSE file.
*/
-#include "Test.h"
-#include "TestUtils.h"
+#include "tests/Test.h"
+#include "tests/TestUtils.h"
-#include "GrClip.h"
-#include "GrContext.h"
-#include "GrContextPriv.h"
-#include "GrProxyProvider.h"
-#include "GrRenderTargetContext.h"
-#include "GrSurfacePriv.h"
-#include "GrTexturePriv.h"
-#include "GrTextureProxyPriv.h"
-#include "gl/GLTestContext.h"
-#include "gl/GrGLGpu.h"
-#include "gl/GrGLUtil.h"
+#include "include/gpu/GrContext.h"
+#include "src/gpu/GrClip.h"
+#include "src/gpu/GrContextPriv.h"
+#include "src/gpu/GrProxyProvider.h"
+#include "src/gpu/GrRenderTargetContext.h"
+#include "src/gpu/GrSurfacePriv.h"
+#include "src/gpu/GrTexturePriv.h"
+#include "src/gpu/GrTextureProxyPriv.h"
+#include "src/gpu/gl/GrGLGpu.h"
+#include "src/gpu/gl/GrGLUtil.h"
+#include "tools/gpu/gl/GLTestContext.h"
// skbug.com/5932
static void test_basic_draw_as_src(skiatest::Reporter* reporter, GrContext* context,
diff --git a/tests/RefCntTest.cpp b/tests/RefCntTest.cpp
index c79e87f..16e96fa 100644
--- a/tests/RefCntTest.cpp
+++ b/tests/RefCntTest.cpp
@@ -5,10 +5,10 @@
* found in the LICENSE file.
*/
-#include "SkRefCnt.h"
-#include "SkTypes.h"
-#include "SkWeakRefCnt.h"
-#include "Test.h"
+#include "include/core/SkRefCnt.h"
+#include "include/core/SkTypes.h"
+#include "include/private/SkWeakRefCnt.h"
+#include "tests/Test.h"
#include <thread>
diff --git a/tests/RegionTest.cpp b/tests/RegionTest.cpp
index 821c36c..707cd3f 100644
--- a/tests/RegionTest.cpp
+++ b/tests/RegionTest.cpp
@@ -5,11 +5,11 @@
* found in the LICENSE file.
*/
-#include "SkAutoMalloc.h"
-#include "SkPath.h"
-#include "SkRandom.h"
-#include "SkRegion.h"
-#include "Test.h"
+#include "include/core/SkPath.h"
+#include "include/core/SkRegion.h"
+#include "include/utils/SkRandom.h"
+#include "src/core/SkAutoMalloc.h"
+#include "tests/Test.h"
static void Union(SkRegion* rgn, const SkIRect& rect) {
rgn->op(rect, SkRegion::kUnion_Op);
diff --git a/tests/RenderTargetContextTest.cpp b/tests/RenderTargetContextTest.cpp
index c93a608..1f0ed4b 100644
--- a/tests/RenderTargetContextTest.cpp
+++ b/tests/RenderTargetContextTest.cpp
@@ -7,14 +7,14 @@
// This is a GPU-backend specific test.
-#include "Test.h"
+#include "tests/Test.h"
// MDB TODO: the early instantiation of the renderTargetContext's backing GrRenderTargetProxy
// mixes this test up. Re-enable once backing GPU resources are distributed by MDB at flush time.
#if 0
-#include "GrTextureProxy.h"
-#include "GrRenderTargetContext.h"
+#include "include/private/GrTextureProxy.h"
+#include "src/gpu/GrRenderTargetContext.h"
static const int kSize = 64;
diff --git a/tests/ResourceAllocatorTest.cpp b/tests/ResourceAllocatorTest.cpp
index b40107a..11984f5 100644
--- a/tests/ResourceAllocatorTest.cpp
+++ b/tests/ResourceAllocatorTest.cpp
@@ -5,21 +5,21 @@
* found in the LICENSE file.
*/
-#include "SkTypes.h"
+#include "include/core/SkTypes.h"
-#include "Test.h"
+#include "tests/Test.h"
-#include "GrContextPriv.h"
-#include "GrDeinstantiateProxyTracker.h"
-#include "GrGpu.h"
-#include "GrProxyProvider.h"
-#include "GrResourceAllocator.h"
-#include "GrResourceProvider.h"
-#include "GrSurfaceProxyPriv.h"
-#include "GrTexture.h"
-#include "GrTextureProxy.h"
+#include "include/gpu/GrTexture.h"
+#include "include/private/GrTextureProxy.h"
+#include "src/gpu/GrContextPriv.h"
+#include "src/gpu/GrDeinstantiateProxyTracker.h"
+#include "src/gpu/GrGpu.h"
+#include "src/gpu/GrProxyProvider.h"
+#include "src/gpu/GrResourceAllocator.h"
+#include "src/gpu/GrResourceProvider.h"
+#include "src/gpu/GrSurfaceProxyPriv.h"
-#include "SkSurface.h"
+#include "include/core/SkSurface.h"
struct ProxyParams {
int fSize;
diff --git a/tests/ResourceCacheTest.cpp b/tests/ResourceCacheTest.cpp
index 747bf2c..c7bfc72 100644
--- a/tests/ResourceCacheTest.cpp
+++ b/tests/ResourceCacheTest.cpp
@@ -5,26 +5,26 @@
* found in the LICENSE file.
*/
-#include "SkTypes.h"
+#include "include/core/SkTypes.h"
-#include "GrContext.h"
-#include "GrContextPriv.h"
-#include "GrContextFactory.h"
-#include "GrGpu.h"
-#include "GrGpuResourceCacheAccess.h"
-#include "GrGpuResourcePriv.h"
-#include "GrProxyProvider.h"
-#include "GrRenderTargetPriv.h"
-#include "GrResourceCache.h"
-#include "GrResourceProvider.h"
-#include "GrTexture.h"
+#include "include/gpu/GrContext.h"
+#include "include/gpu/GrTexture.h"
+#include "src/gpu/GrContextPriv.h"
+#include "src/gpu/GrGpu.h"
+#include "src/gpu/GrGpuResourceCacheAccess.h"
+#include "src/gpu/GrGpuResourcePriv.h"
+#include "src/gpu/GrProxyProvider.h"
+#include "src/gpu/GrRenderTargetPriv.h"
+#include "src/gpu/GrResourceCache.h"
+#include "src/gpu/GrResourceProvider.h"
+#include "tools/gpu/GrContextFactory.h"
-#include "SkCanvas.h"
-#include "SkGr.h"
-#include "SkMessageBus.h"
-#include "SkMipMap.h"
-#include "SkSurface.h"
-#include "Test.h"
+#include "include/core/SkCanvas.h"
+#include "include/core/SkSurface.h"
+#include "include/private/SkMessageBus.h"
+#include "src/core/SkMipMap.h"
+#include "src/gpu/SkGr.h"
+#include "tests/Test.h"
#include <thread>
diff --git a/tests/RoundRectTest.cpp b/tests/RoundRectTest.cpp
index f2f1eb8..171dbbb 100644
--- a/tests/RoundRectTest.cpp
+++ b/tests/RoundRectTest.cpp
@@ -5,10 +5,10 @@
* found in the LICENSE file.
*/
-#include "SkMatrix.h"
-#include "SkPointPriv.h"
-#include "SkRRect.h"
-#include "Test.h"
+#include "include/core/SkMatrix.h"
+#include "include/core/SkRRect.h"
+#include "src/core/SkPointPriv.h"
+#include "tests/Test.h"
static void test_tricky_radii(skiatest::Reporter* reporter) {
{
diff --git a/tests/SRGBReadWritePixelsTest.cpp b/tests/SRGBReadWritePixelsTest.cpp
index 54a1193..84f37ff 100644
--- a/tests/SRGBReadWritePixelsTest.cpp
+++ b/tests/SRGBReadWritePixelsTest.cpp
@@ -5,14 +5,14 @@
* found in the LICENSE file.
*/
-#include "Test.h"
-#include "GrCaps.h"
-#include "GrContext.h"
-#include "GrContextPriv.h"
-#include "GrSurfaceContext.h"
-#include "SkCanvas.h"
-#include "SkGr.h"
-#include "SkSurface.h"
+#include "include/core/SkCanvas.h"
+#include "include/core/SkSurface.h"
+#include "include/gpu/GrContext.h"
+#include "src/gpu/GrCaps.h"
+#include "src/gpu/GrContextPriv.h"
+#include "src/gpu/GrSurfaceContext.h"
+#include "src/gpu/SkGr.h"
+#include "tests/Test.h"
// using anonymous namespace because these functions are used as template params.
namespace {
diff --git a/tests/SRGBTest.cpp b/tests/SRGBTest.cpp
index cd0fa59..a2c09d9 100644
--- a/tests/SRGBTest.cpp
+++ b/tests/SRGBTest.cpp
@@ -5,10 +5,10 @@
* found in the LICENSE file.
*/
-#include "SkColorSpaceXformSteps.h"
-#include "SkRasterPipeline.h"
-#include "SkTypes.h"
-#include "Test.h"
+#include "include/core/SkTypes.h"
+#include "src/core/SkColorSpaceXformSteps.h"
+#include "src/core/SkRasterPipeline.h"
+#include "tests/Test.h"
#include <math.h>
diff --git a/tests/SVGDeviceTest.cpp b/tests/SVGDeviceTest.cpp
index 9a99c0f..e9e58e7 100644
--- a/tests/SVGDeviceTest.cpp
+++ b/tests/SVGDeviceTest.cpp
@@ -13,26 +13,26 @@
} \
} while (0)
-#include "SkBitmap.h"
-#include "SkCanvas.h"
-#include "SkColorFilter.h"
-#include "SkData.h"
-#include "SkImage.h"
-#include "SkImageShader.h"
-#include "SkMakeUnique.h"
-#include "SkParse.h"
-#include "SkShader.h"
-#include "SkStream.h"
-#include "SkTo.h"
-#include "Test.h"
+#include "include/core/SkBitmap.h"
+#include "include/core/SkCanvas.h"
+#include "include/core/SkColorFilter.h"
+#include "include/core/SkData.h"
+#include "include/core/SkImage.h"
+#include "include/core/SkShader.h"
+#include "include/core/SkStream.h"
+#include "include/private/SkTo.h"
+#include "include/utils/SkParse.h"
+#include "src/core/SkMakeUnique.h"
+#include "src/shaders/SkImageShader.h"
+#include "tests/Test.h"
#include <string.h>
#ifdef SK_XML
-#include "SkDOM.h"
-#include "../src/svg/SkSVGDevice.h"
-#include "SkXMLWriter.h"
+#include "src/svg/SkSVGDevice.h"
+#include "src/xml/SkDOM.h"
+#include "src/xml/SkXMLWriter.h"
static std::unique_ptr<SkCanvas> MakeDOMCanvas(SkDOM* dom) {
auto svgDevice = SkSVGDevice::Make(SkISize::Make(100, 100),
diff --git a/tests/SafeMathTest.cpp b/tests/SafeMathTest.cpp
index 7f59739..99a16e0 100644
--- a/tests/SafeMathTest.cpp
+++ b/tests/SafeMathTest.cpp
@@ -5,8 +5,8 @@
* found in the LICENSE file.
*/
-#include "Test.h"
-#include "SkSafeMath.h"
+#include "src/core/SkSafeMath.h"
+#include "tests/Test.h"
DEF_TEST(SafeMath, r) {
size_t max = std::numeric_limits<size_t>::max();
diff --git a/tests/SamplePatternDictionaryTest.cpp b/tests/SamplePatternDictionaryTest.cpp
index 66b9b68..3cb7b4c 100644
--- a/tests/SamplePatternDictionaryTest.cpp
+++ b/tests/SamplePatternDictionaryTest.cpp
@@ -5,15 +5,15 @@
* found in the LICENSE file.
*/
-#include "SkTypes.h"
-#include "SkPoint.h"
-#include "SkRandom.h"
-#include "Test.h"
+#include "include/core/SkPoint.h"
+#include "include/core/SkTypes.h"
+#include "include/utils/SkRandom.h"
+#include "tests/Test.h"
#include <vector>
#if SK_SUPPORT_GPU
-#include "GrSamplePatternDictionary.h"
+#include "src/gpu/GrSamplePatternDictionary.h"
static SkTArray<SkPoint> make_sample_pattern(const std::vector<SkPoint>& sampleLocations) {
return SkTArray<SkPoint>(sampleLocations.data(), sampleLocations.size());
diff --git a/tests/ScalarTest.cpp b/tests/ScalarTest.cpp
index f2f924e..2209f0d 100644
--- a/tests/ScalarTest.cpp
+++ b/tests/ScalarTest.cpp
@@ -5,12 +5,12 @@
* found in the LICENSE file.
*/
-#include "SkFloatingPoint.h"
-#include "SkMath.h"
-#include "SkPoint.h"
-#include "SkRandom.h"
-#include "SkRect.h"
-#include "Test.h"
+#include "include/core/SkMath.h"
+#include "include/core/SkPoint.h"
+#include "include/core/SkRect.h"
+#include "include/private/SkFloatingPoint.h"
+#include "include/utils/SkRandom.h"
+#include "tests/Test.h"
static void test_roundtoint(skiatest::Reporter* reporter) {
SkScalar x = 0.49999997f;
diff --git a/tests/ScaleToSidesTest.cpp b/tests/ScaleToSidesTest.cpp
index b56df0d..79d2678 100644
--- a/tests/ScaleToSidesTest.cpp
+++ b/tests/ScaleToSidesTest.cpp
@@ -5,9 +5,9 @@
* found in the LICENSE file.
*/
-#include "SkScaleToSides.h"
+#include "src/core/SkScaleToSides.h"
-#include "Test.h"
+#include "tests/Test.h"
#include <algorithm>
diff --git a/tests/SerialProcsTest.cpp b/tests/SerialProcsTest.cpp
index 2e11a0e..fd42de0 100644
--- a/tests/SerialProcsTest.cpp
+++ b/tests/SerialProcsTest.cpp
@@ -5,15 +5,15 @@
* found in the LICENSE file.
*/
-#include "Resources.h"
-#include "SkCanvas.h"
-#include "SkImageSource.h"
-#include "SkPicture.h"
-#include "SkPictureRecorder.h"
-#include "SkSerialProcs.h"
-#include "SkSurface.h"
-#include "Test.h"
-#include "ToolUtils.h"
+#include "include/core/SkCanvas.h"
+#include "include/core/SkPicture.h"
+#include "include/core/SkPictureRecorder.h"
+#include "include/core/SkSerialProcs.h"
+#include "include/core/SkSurface.h"
+#include "include/effects/SkImageSource.h"
+#include "tests/Test.h"
+#include "tools/Resources.h"
+#include "tools/ToolUtils.h"
static sk_sp<SkImage> picture_to_image(sk_sp<SkPicture> pic) {
SkIRect r = pic->cullRect().round();
diff --git a/tests/SerializationTest.cpp b/tests/SerializationTest.cpp
index ddfe073..724991a 100644
--- a/tests/SerializationTest.cpp
+++ b/tests/SerializationTest.cpp
@@ -5,32 +5,32 @@
* found in the LICENSE file.
*/
-#include "Resources.h"
-#include "SkAnnotationKeys.h"
-#include "SkCanvas.h"
-#include "SkDashPathEffect.h"
-#include "SkFixed.h"
-#include "SkFontDescriptor.h"
-#include "SkImage.h"
-#include "SkImageSource.h"
-#include "SkLightingShader.h"
-#include "SkMakeUnique.h"
-#include "SkMallocPixelRef.h"
-#include "SkMatrixPriv.h"
-#include "SkNormalSource.h"
-#include "SkOSFile.h"
-#include "SkPicturePriv.h"
-#include "SkPictureRecorder.h"
-#include "SkReadBuffer.h"
-#include "SkShaderBase.h"
-#include "SkTableColorFilter.h"
-#include "SkTemplates.h"
-#include "SkTextBlob.h"
-#include "SkTypeface.h"
-#include "SkWriteBuffer.h"
-#include "SkXfermodeImageFilter.h"
-#include "Test.h"
-#include "ToolUtils.h"
+#include "include/core/SkCanvas.h"
+#include "include/core/SkImage.h"
+#include "include/core/SkMallocPixelRef.h"
+#include "include/core/SkPictureRecorder.h"
+#include "include/core/SkTextBlob.h"
+#include "include/core/SkTypeface.h"
+#include "include/effects/SkDashPathEffect.h"
+#include "include/effects/SkImageSource.h"
+#include "include/effects/SkTableColorFilter.h"
+#include "include/effects/SkXfermodeImageFilter.h"
+#include "include/private/SkFixed.h"
+#include "include/private/SkTemplates.h"
+#include "src/core/SkAnnotationKeys.h"
+#include "src/core/SkFontDescriptor.h"
+#include "src/core/SkMakeUnique.h"
+#include "src/core/SkMatrixPriv.h"
+#include "src/core/SkNormalSource.h"
+#include "src/core/SkOSFile.h"
+#include "src/core/SkPicturePriv.h"
+#include "src/core/SkReadBuffer.h"
+#include "src/core/SkWriteBuffer.h"
+#include "src/shaders/SkLightingShader.h"
+#include "src/shaders/SkShaderBase.h"
+#include "tests/Test.h"
+#include "tools/Resources.h"
+#include "tools/ToolUtils.h"
static const uint32_t kArraySize = 64;
static const int kBitmapSize = 256;
@@ -631,7 +631,7 @@
}
///////////////////////////////////////////////////////////////////////////////////////////////////
-#include "SkAnnotation.h"
+#include "include/core/SkAnnotation.h"
static sk_sp<SkPicture> copy_picture_via_serialization(SkPicture* src) {
SkDynamicMemoryWStream wstream;
diff --git a/tests/ShaderOpacityTest.cpp b/tests/ShaderOpacityTest.cpp
index 53f3146..bfdf3e7 100644
--- a/tests/ShaderOpacityTest.cpp
+++ b/tests/ShaderOpacityTest.cpp
@@ -5,11 +5,11 @@
* found in the LICENSE file.
*/
-#include "SkBitmap.h"
-#include "SkColorShader.h"
-#include "SkGradientShader.h"
-#include "SkShader.h"
-#include "Test.h"
+#include "include/core/SkBitmap.h"
+#include "include/core/SkShader.h"
+#include "include/effects/SkGradientShader.h"
+#include "src/shaders/SkColorShader.h"
+#include "tests/Test.h"
static void test_bitmap(skiatest::Reporter* reporter) {
SkImageInfo info = SkImageInfo::MakeN32Premul(2, 2);
diff --git a/tests/ShaderTest.cpp b/tests/ShaderTest.cpp
index d2e9379..0320054 100644
--- a/tests/ShaderTest.cpp
+++ b/tests/ShaderTest.cpp
@@ -5,15 +5,15 @@
* found in the LICENSE file.
*/
-#include "Test.h"
-#include "SkBitmap.h"
-#include "SkCanvas.h"
-#include "SkImage.h"
-#include "SkPerlinNoiseShader.h"
-#include "SkRRect.h"
-#include "SkShader.h"
-#include "SkSurface.h"
-#include "SkData.h"
+#include "include/core/SkBitmap.h"
+#include "include/core/SkCanvas.h"
+#include "include/core/SkData.h"
+#include "include/core/SkImage.h"
+#include "include/core/SkRRect.h"
+#include "include/core/SkShader.h"
+#include "include/core/SkSurface.h"
+#include "include/effects/SkPerlinNoiseShader.h"
+#include "tests/Test.h"
static void check_isaimage(skiatest::Reporter* reporter, SkShader* shader,
int expectedW, int expectedH,
diff --git a/tests/ShadowTest.cpp b/tests/ShadowTest.cpp
index f7522ba..ff4def4 100644
--- a/tests/ShadowTest.cpp
+++ b/tests/ShadowTest.cpp
@@ -5,13 +5,13 @@
* found in the LICENSE file.
*/
-#include "SkCanvas.h"
-#include "SkDrawShadowInfo.h"
-#include "SkPath.h"
-#include "SkShadowTessellator.h"
-#include "SkShadowUtils.h"
-#include "SkVertices.h"
-#include "Test.h"
+#include "include/core/SkCanvas.h"
+#include "include/core/SkPath.h"
+#include "include/core/SkVertices.h"
+#include "include/utils/SkShadowUtils.h"
+#include "src/core/SkDrawShadowInfo.h"
+#include "src/utils/SkShadowTessellator.h"
+#include "tests/Test.h"
enum ExpectVerts {
kDont_ExpectVerts,
diff --git a/tests/SizeTest.cpp b/tests/SizeTest.cpp
index 9dccdeb..100da02 100644
--- a/tests/SizeTest.cpp
+++ b/tests/SizeTest.cpp
@@ -5,9 +5,9 @@
* found in the LICENSE file.
*/
-#include "SkSize.h"
+#include "include/core/SkSize.h"
-#include "Test.h"
+#include "tests/Test.h"
DEF_TEST(ISize, reporter) {
SkISize a, b;
diff --git a/tests/SkBase64Test.cpp b/tests/SkBase64Test.cpp
index 39bc1c2..2820e37 100644
--- a/tests/SkBase64Test.cpp
+++ b/tests/SkBase64Test.cpp
@@ -5,10 +5,10 @@
* found in the LICENSE file.
*/
-#include "SkBase64.h"
-#include "SkTo.h"
+#include "include/private/SkTo.h"
+#include "include/utils/SkBase64.h"
-#include "Test.h"
+#include "tests/Test.h"
DEF_TEST(SkBase64, reporter) {
char all[256];
diff --git a/tests/SkColor4fTest.cpp b/tests/SkColor4fTest.cpp
index 3d9fd02..302d306 100644
--- a/tests/SkColor4fTest.cpp
+++ b/tests/SkColor4fTest.cpp
@@ -5,8 +5,8 @@
* found in the LICENSE file.
*/
-#include "SkColor.h"
-#include "Test.h"
+#include "include/core/SkColor.h"
+#include "tests/Test.h"
DEF_TEST(SkColor4f_FromColor, reporter) {
const struct {
diff --git a/tests/SkColorSpaceXformStepsTest.cpp b/tests/SkColorSpaceXformStepsTest.cpp
index 6b15385..c3308ab 100644
--- a/tests/SkColorSpaceXformStepsTest.cpp
+++ b/tests/SkColorSpaceXformStepsTest.cpp
@@ -5,9 +5,9 @@
* found in the LICENSE file.
*/
-#include "SkColorSpacePriv.h"
-#include "SkColorSpaceXformSteps.h"
-#include "Test.h"
+#include "src/core/SkColorSpacePriv.h"
+#include "src/core/SkColorSpaceXformSteps.h"
+#include "tests/Test.h"
DEF_TEST(SkColorSpaceXformSteps, r) {
auto srgb = SkColorSpace::MakeSRGB(),
diff --git a/tests/SkDOMTest.cpp b/tests/SkDOMTest.cpp
index 6ea4e78..b6b9f5f 100644
--- a/tests/SkDOMTest.cpp
+++ b/tests/SkDOMTest.cpp
@@ -5,12 +5,12 @@
* found in the LICENSE file.
*/
-#include "SkStream.h"
-#include "Test.h"
+#include "include/core/SkStream.h"
+#include "tests/Test.h"
#if defined(SK_XML)
-#include "SkDOM.h"
+#include "src/xml/SkDOM.h"
static const SkDOM::Node* check_node(skiatest::Reporter* r, const SkDOM& dom,
const SkDOM::Node* node, const char* expectedName,
diff --git a/tests/SkFixed15Test.cpp b/tests/SkFixed15Test.cpp
index df957b1..f5a57c9 100644
--- a/tests/SkFixed15Test.cpp
+++ b/tests/SkFixed15Test.cpp
@@ -5,8 +5,8 @@
* found in the LICENSE file.
*/
-#include "Test.h"
-#include "SkFixed15.h"
+#include "src/core/SkFixed15.h"
+#include "tests/Test.h"
DEF_TEST(SkFixed15, r) {
// For all v, v*0 == 0, v*1 == v.
diff --git a/tests/SkGaussFilterTest.cpp b/tests/SkGaussFilterTest.cpp
index b04b4af..f065d8f 100644
--- a/tests/SkGaussFilterTest.cpp
+++ b/tests/SkGaussFilterTest.cpp
@@ -5,12 +5,12 @@
* found in the LICENSE file.
*/
-#include "SkGaussFilter.h"
+#include "src/core/SkGaussFilter.h"
#include <cmath>
#include <tuple>
#include <vector>
-#include "Test.h"
+#include "tests/Test.h"
// one part in a million
static constexpr double kEpsilon = 0.000001;
diff --git a/tests/SkImageTest.cpp b/tests/SkImageTest.cpp
index 426883b..f539726 100644
--- a/tests/SkImageTest.cpp
+++ b/tests/SkImageTest.cpp
@@ -5,9 +5,9 @@
* found in the LICENSE file.
*/
-#include "SkCanvas.h"
-#include "SkImagePriv.h"
-#include "Test.h"
+#include "include/core/SkCanvas.h"
+#include "src/core/SkImagePriv.h"
+#include "tests/Test.h"
static const int gWidth = 20;
static const int gHeight = 20;
diff --git a/tests/SkLiteDLTest.cpp b/tests/SkLiteDLTest.cpp
index e64e5aa..a9bc253 100644
--- a/tests/SkLiteDLTest.cpp
+++ b/tests/SkLiteDLTest.cpp
@@ -5,10 +5,10 @@
* found in the LICENSE file.
*/
-#include "SkLiteDL.h"
-#include "SkLiteRecorder.h"
-#include "SkRSXform.h"
-#include "Test.h"
+#include "include/core/SkRSXform.h"
+#include "src/core/SkLiteDL.h"
+#include "src/core/SkLiteRecorder.h"
+#include "tests/Test.h"
DEF_TEST(SkLiteDL_basics, r) {
SkLiteDL p;
diff --git a/tests/SkNxTest.cpp b/tests/SkNxTest.cpp
index f210974..b6b0085 100644
--- a/tests/SkNxTest.cpp
+++ b/tests/SkNxTest.cpp
@@ -5,10 +5,10 @@
* found in the LICENSE file.
*/
-#include "Sk4px.h"
-#include "SkNx.h"
-#include "SkRandom.h"
-#include "Test.h"
+#include "include/private/SkNx.h"
+#include "include/utils/SkRandom.h"
+#include "src/core/Sk4px.h"
+#include "tests/Test.h"
template <int N>
static void test_Nf(skiatest::Reporter* r) {
@@ -281,7 +281,7 @@
REPORTER_ASSERT(r, f[3] == 0.0f);
}
-#include "SkRandom.h"
+#include "include/utils/SkRandom.h"
DEF_TEST(SkNx_u16_float, r) {
{
diff --git a/tests/SkPEGTest.cpp b/tests/SkPEGTest.cpp
index 2b51dfd..db43f5c 100644
--- a/tests/SkPEGTest.cpp
+++ b/tests/SkPEGTest.cpp
@@ -5,11 +5,11 @@
* found in the LICENSE file.
*/
-#include "Test.h"
+#include "tests/Test.h"
#if defined(SK_XML)
-#include "SkPEG.h"
-#include "SkTo.h"
+#include "experimental/svg/model/SkPEG.h"
+#include "include/private/SkTo.h"
using namespace skpeg;
diff --git a/tests/SkRasterPipelineTest.cpp b/tests/SkRasterPipelineTest.cpp
index 4568c07..0c6354b 100644
--- a/tests/SkRasterPipelineTest.cpp
+++ b/tests/SkRasterPipelineTest.cpp
@@ -5,10 +5,10 @@
* found in the LICENSE file.
*/
-#include "SkHalf.h"
-#include "SkRasterPipeline.h"
-#include "SkTo.h"
-#include "Test.h"
+#include "include/private/SkHalf.h"
+#include "include/private/SkTo.h"
+#include "src/core/SkRasterPipeline.h"
+#include "tests/Test.h"
DEF_TEST(SkRasterPipeline, r) {
// Build and run a simple pipeline to exercise SkRasterPipeline,
diff --git a/tests/SkRemoteGlyphCacheTest.cpp b/tests/SkRemoteGlyphCacheTest.cpp
index 7e6cdec..88d577a 100644
--- a/tests/SkRemoteGlyphCacheTest.cpp
+++ b/tests/SkRemoteGlyphCacheTest.cpp
@@ -5,23 +5,23 @@
* found in the LICENSE file.
*/
-#include "Resources.h"
-#include "SkDraw.h"
-#include "SkGraphics.h"
-#include "SkMutex.h"
-#include "SkRemoteGlyphCache.h"
-#include "SkRemoteGlyphCacheImpl.h"
-#include "SkStrike.h"
-#include "SkStrikeCache.h"
-#include "SkSurface.h"
-#include "SkSurfacePriv.h"
-#include "SkTextBlob.h"
-#include "SkTypeface_remote.h"
-#include "Test.h"
-#include "TestEmptyTypeface.h"
-#include "ToolUtils.h"
+#include "include/core/SkGraphics.h"
+#include "include/core/SkSurface.h"
+#include "include/core/SkTextBlob.h"
+#include "include/private/SkMutex.h"
+#include "src/core/SkDraw.h"
+#include "src/core/SkRemoteGlyphCache.h"
+#include "src/core/SkRemoteGlyphCacheImpl.h"
+#include "src/core/SkStrike.h"
+#include "src/core/SkStrikeCache.h"
+#include "src/core/SkSurfacePriv.h"
+#include "src/core/SkTypeface_remote.h"
+#include "tests/Test.h"
+#include "tools/Resources.h"
+#include "tools/ToolUtils.h"
+#include "tools/fonts/TestEmptyTypeface.h"
-#include "text/GrTextContext.h"
+#include "src/gpu/text/GrTextContext.h"
class DiscardableManager : public SkStrikeServer::DiscardableHandleManager,
public SkStrikeClient::DiscardableHandleManager {
diff --git a/tests/SkResourceCacheTest.cpp b/tests/SkResourceCacheTest.cpp
index 9701ae1..28d7616 100644
--- a/tests/SkResourceCacheTest.cpp
+++ b/tests/SkResourceCacheTest.cpp
@@ -5,18 +5,18 @@
* found in the LICENSE file.
*/
-#include "Test.h"
-#include "SkBitmapCache.h"
-#include "SkBitmapProvider.h"
-#include "SkCanvas.h"
-#include "SkDiscardableMemoryPool.h"
-#include "SkGraphics.h"
-#include "SkMakeUnique.h"
-#include "SkMipMap.h"
-#include "SkPicture.h"
-#include "SkPictureRecorder.h"
-#include "SkResourceCache.h"
-#include "SkSurface.h"
+#include "include/core/SkCanvas.h"
+#include "include/core/SkGraphics.h"
+#include "include/core/SkPicture.h"
+#include "include/core/SkPictureRecorder.h"
+#include "include/core/SkSurface.h"
+#include "src/core/SkBitmapCache.h"
+#include "src/core/SkBitmapProvider.h"
+#include "src/core/SkMakeUnique.h"
+#include "src/core/SkMipMap.h"
+#include "src/core/SkResourceCache.h"
+#include "src/lazy/SkDiscardableMemoryPool.h"
+#include "tests/Test.h"
////////////////////////////////////////////////////////////////////////////////////////
@@ -110,7 +110,7 @@
}
}
-#include "SkDiscardableMemoryPool.h"
+#include "src/lazy/SkDiscardableMemoryPool.h"
static SkDiscardableMemoryPool* gPool = nullptr;
static SkDiscardableMemory* pool_factory(size_t bytes) {
diff --git a/tests/SkSLErrorTest.cpp b/tests/SkSLErrorTest.cpp
index e875221..4645339 100644
--- a/tests/SkSLErrorTest.cpp
+++ b/tests/SkSLErrorTest.cpp
@@ -5,9 +5,9 @@
* found in the LICENSE file.
*/
-#include "SkSLCompiler.h"
+#include "src/sksl/SkSLCompiler.h"
-#include "Test.h"
+#include "tests/Test.h"
static void test_failure(skiatest::Reporter* r, const char* src, const char* error) {
SkSL::Compiler compiler;
diff --git a/tests/SkSLFPTest.cpp b/tests/SkSLFPTest.cpp
index c4597f2..0586b5a 100644
--- a/tests/SkSLFPTest.cpp
+++ b/tests/SkSLFPTest.cpp
@@ -5,9 +5,9 @@
* found in the LICENSE file.
*/
-#include "SkSLCompiler.h"
+#include "src/sksl/SkSLCompiler.h"
-#include "Test.h"
+#include "tests/Test.h"
static void test(skiatest::Reporter* r, const char* src, const GrShaderCaps& caps,
std::vector<const char*> expectedH, std::vector<const char*> expectedCPP) {
@@ -72,9 +72,9 @@
" **************************************************************************************************/\n"
"#ifndef GrTest_DEFINED\n"
"#define GrTest_DEFINED\n"
- "#include \"SkTypes.h\"\n"
- "#include \"GrFragmentProcessor.h\"\n"
- "#include \"GrCoordTransform.h\"\n"
+ "#include \"include/core/SkTypes.h\"\n\n"
+ "#include \"src/gpu/GrCoordTransform.h\"\n"
+ "#include \"src/gpu/GrFragmentProcessor.h\"\n"
"class GrTest : public GrFragmentProcessor {\n"
"public:\n"
" static std::unique_ptr<GrFragmentProcessor> Make() {\n"
@@ -100,13 +100,13 @@
"/**************************************************************************************************\n"
" *** This file was autogenerated from GrTest.fp; do not modify.\n"
" **************************************************************************************************/\n"
- "#include \"GrTest.h\"\n"
- "#include \"glsl/GrGLSLFragmentProcessor.h\"\n"
- "#include \"glsl/GrGLSLFragmentShaderBuilder.h\"\n"
- "#include \"glsl/GrGLSLProgramBuilder.h\"\n"
- "#include \"GrTexture.h\"\n"
- "#include \"SkSLCPP.h\"\n"
- "#include \"SkSLUtil.h\"\n"
+ "#include \"GrTest.h\"\n\n"
+ "#include \"include/gpu/GrTexture.h\"\n"
+ "#include \"src/gpu/glsl/GrGLSLFragmentProcessor.h\"\n"
+ "#include \"src/gpu/glsl/GrGLSLFragmentShaderBuilder.h\"\n"
+ "#include \"src/gpu/glsl/GrGLSLProgramBuilder.h\"\n"
+ "#include \"src/sksl/SkSLCPP.h\"\n"
+ "#include \"src/sksl/SkSLUtil.h\"\n"
"class GrGLSLTest : public GrGLSLFragmentProcessor {\n"
"public:\n"
" GrGLSLTest() {}\n"
diff --git a/tests/SkSLGLSLTest.cpp b/tests/SkSLGLSLTest.cpp
index 6d0dae2..c31e1f3 100644
--- a/tests/SkSLGLSLTest.cpp
+++ b/tests/SkSLGLSLTest.cpp
@@ -5,9 +5,9 @@
* found in the LICENSE file.
*/
-#include "SkSLCompiler.h"
+#include "src/sksl/SkSLCompiler.h"
-#include "Test.h"
+#include "tests/Test.h"
// Note that the optimizer will aggressively kill dead code and substitute constants in place of
// variables, so we have to jump through a few hoops to ensure that the code in these tests has the
diff --git a/tests/SkSLInterpreterTest.cpp b/tests/SkSLInterpreterTest.cpp
index aa88e09..9031bb1 100644
--- a/tests/SkSLInterpreterTest.cpp
+++ b/tests/SkSLInterpreterTest.cpp
@@ -5,10 +5,10 @@
* found in the LICENSE file.
*/
-#include "SkSLCompiler.h"
-#include "SkSLInterpreter.h"
+#include "src/sksl/SkSLCompiler.h"
+#include "src/sksl/SkSLInterpreter.h"
-#include "Test.h"
+#include "tests/Test.h"
void test(skiatest::Reporter* r, const char* src, SkSL::Interpreter::Value* in, int expectedCount,
SkSL::Interpreter::Value* expected) {
diff --git a/tests/SkSLJITTest.cpp b/tests/SkSLJITTest.cpp
index 7561e13..a435b3a 100644
--- a/tests/SkSLJITTest.cpp
+++ b/tests/SkSLJITTest.cpp
@@ -5,9 +5,9 @@
* found in the LICENSE file.
*/
-#include "SkSLJIT.h"
+#include "src/sksl/SkSLJIT.h"
-#include "Test.h"
+#include "tests/Test.h"
#ifdef SK_LLVM_AVAILABLE
diff --git a/tests/SkSLMemoryLayoutTest.cpp b/tests/SkSLMemoryLayoutTest.cpp
index f4df89e..7fb80bc 100644
--- a/tests/SkSLMemoryLayoutTest.cpp
+++ b/tests/SkSLMemoryLayoutTest.cpp
@@ -5,10 +5,10 @@
* found in the LICENSE file.
*/
-#include "SkSLContext.h"
-#include "SkSLMemoryLayout.h"
+#include "src/sksl/SkSLContext.h"
+#include "src/sksl/SkSLMemoryLayout.h"
-#include "Test.h"
+#include "tests/Test.h"
DEF_TEST(SkSLMemoryLayout140Test, r) {
SkSL::Context context;
diff --git a/tests/SkSLMetalTest.cpp b/tests/SkSLMetalTest.cpp
index bd6daa5..13cecb9 100644
--- a/tests/SkSLMetalTest.cpp
+++ b/tests/SkSLMetalTest.cpp
@@ -5,9 +5,9 @@
* found in the LICENSE file.
*/
-#include "SkSLCompiler.h"
+#include "src/sksl/SkSLCompiler.h"
-#include "Test.h"
+#include "tests/Test.h"
static void test(skiatest::Reporter* r, const char* src, const SkSL::Program::Settings& settings,
const char* expected, SkSL::Program::Inputs* inputs,
diff --git a/tests/SkSLSPIRVTest.cpp b/tests/SkSLSPIRVTest.cpp
index 355faec..126be45 100644
--- a/tests/SkSLSPIRVTest.cpp
+++ b/tests/SkSLSPIRVTest.cpp
@@ -5,9 +5,9 @@
* found in the LICENSE file.
*/
-#include "SkSLCompiler.h"
+#include "src/sksl/SkSLCompiler.h"
-#include "Test.h"
+#include "tests/Test.h"
static void test_failure(skiatest::Reporter* r, const char* src, const char* error) {
SkSL::Compiler compiler;
diff --git a/tests/SkSharedMutexTest.cpp b/tests/SkSharedMutexTest.cpp
index 8458891..a9a80b1 100644
--- a/tests/SkSharedMutexTest.cpp
+++ b/tests/SkSharedMutexTest.cpp
@@ -5,10 +5,10 @@
* found in the LICENSE file.
*/
-#include "SkSharedMutex.h"
-#include "SkTaskGroup.h"
+#include "src/core/SkSharedMutex.h"
+#include "src/core/SkTaskGroup.h"
-#include "Test.h"
+#include "tests/Test.h"
DEF_TEST(SkSharedMutexBasic, r) {
SkSharedMutex sm;
diff --git a/tests/SkUTFTest.cpp b/tests/SkUTFTest.cpp
index 5481ef9..5caba4b 100644
--- a/tests/SkUTFTest.cpp
+++ b/tests/SkUTFTest.cpp
@@ -1,8 +1,8 @@
// Copyright 2018 Google LLC.
// Use of this source code is governed by a BSD-style license that can be found in the LICENSE file.
-#include "SkUTF.h"
-#include "Test.h"
+#include "src/utils/SkUTF.h"
+#include "tests/Test.h"
DEF_TEST(SkUTF_UTF16, reporter) {
// Test non-basic-multilingual-plane unicode.
diff --git a/tests/SkVxTest.cpp b/tests/SkVxTest.cpp
index 270d64c..2860e6d 100644
--- a/tests/SkVxTest.cpp
+++ b/tests/SkVxTest.cpp
@@ -5,8 +5,8 @@
* found in the LICENSE file.
*/
-#include "SkVx.h"
-#include "Test.h"
+#include "include/private/SkVx.h"
+#include "tests/Test.h"
using float2 = skvx::Vec<2,float>;
using float4 = skvx::Vec<4,float>;
diff --git a/tests/SortTest.cpp b/tests/SortTest.cpp
index d544ebd..7cf05c7 100644
--- a/tests/SortTest.cpp
+++ b/tests/SortTest.cpp
@@ -5,9 +5,9 @@
* found in the LICENSE file.
*/
-#include "SkRandom.h"
-#include "SkTSort.h"
-#include "Test.h"
+#include "include/utils/SkRandom.h"
+#include "src/core/SkTSort.h"
+#include "tests/Test.h"
#include <stdlib.h>
diff --git a/tests/SpecialImageTest.cpp b/tests/SpecialImageTest.cpp
index 529e906..d22534d 100644
--- a/tests/SpecialImageTest.cpp
+++ b/tests/SpecialImageTest.cpp
@@ -5,23 +5,23 @@
* found in the LICENSE file
*/
-#include "SkAutoPixmapStorage.h"
-#include "SkBitmap.h"
-#include "SkCanvas.h"
-#include "SkImage.h"
-#include "SkPixmap.h"
-#include "SkSpecialImage.h"
-#include "SkSpecialSurface.h"
-#include "SkSurface.h"
-#include "Test.h"
+#include "include/core/SkBitmap.h"
+#include "include/core/SkCanvas.h"
+#include "include/core/SkImage.h"
+#include "include/core/SkPixmap.h"
+#include "include/core/SkSurface.h"
+#include "src/core/SkAutoPixmapStorage.h"
+#include "src/core/SkSpecialImage.h"
+#include "src/core/SkSpecialSurface.h"
+#include "tests/Test.h"
-#include "GrBackendSurface.h"
-#include "GrContext.h"
-#include "GrContextPriv.h"
-#include "GrProxyProvider.h"
-#include "GrSurfaceProxy.h"
-#include "GrTextureProxy.h"
-#include "SkGr.h"
+#include "include/gpu/GrBackendSurface.h"
+#include "include/gpu/GrContext.h"
+#include "include/private/GrSurfaceProxy.h"
+#include "include/private/GrTextureProxy.h"
+#include "src/gpu/GrContextPriv.h"
+#include "src/gpu/GrProxyProvider.h"
+#include "src/gpu/SkGr.h"
// This test creates backing resources exactly sized to [kFullSize x kFullSize].
diff --git a/tests/SpecialSurfaceTest.cpp b/tests/SpecialSurfaceTest.cpp
index 44df070..f94d22b 100644
--- a/tests/SpecialSurfaceTest.cpp
+++ b/tests/SpecialSurfaceTest.cpp
@@ -5,16 +5,16 @@
* found in the LICENSE file
*/
-#include "SkBitmap.h"
-#include "SkCanvas.h"
-#include "SkSpecialImage.h"
-#include "SkSpecialSurface.h"
-#include "Test.h"
+#include "include/core/SkBitmap.h"
+#include "include/core/SkCanvas.h"
+#include "src/core/SkSpecialImage.h"
+#include "src/core/SkSpecialSurface.h"
+#include "tests/Test.h"
-#include "GrCaps.h"
-#include "GrContext.h"
-#include "GrContextPriv.h"
-#include "SkGr.h"
+#include "include/gpu/GrContext.h"
+#include "src/gpu/GrCaps.h"
+#include "src/gpu/GrContextPriv.h"
+#include "src/gpu/SkGr.h"
class TestingSpecialSurfaceAccess {
public:
diff --git a/tests/SrcOverTest.cpp b/tests/SrcOverTest.cpp
index e8726d1..92237e2 100644
--- a/tests/SrcOverTest.cpp
+++ b/tests/SrcOverTest.cpp
@@ -5,8 +5,8 @@
* found in the LICENSE file.
*/
-#include "SkColorData.h"
-#include "Test.h"
+#include "include/private/SkColorData.h"
+#include "tests/Test.h"
// our std SkAlpha255To256
static int test_srcover0(unsigned dst, unsigned alpha) {
diff --git a/tests/StreamBufferTest.cpp b/tests/StreamBufferTest.cpp
index 5435bf9..67e596c 100644
--- a/tests/StreamBufferTest.cpp
+++ b/tests/StreamBufferTest.cpp
@@ -5,14 +5,14 @@
* found in the LICENSE file.
*/
-#include "SkData.h"
-#include "SkMakeUnique.h"
-#include "SkOSPath.h"
-#include "SkStream.h"
-#include "SkStreamBuffer.h"
+#include "include/core/SkData.h"
+#include "include/core/SkStream.h"
+#include "src/codec/SkStreamBuffer.h"
+#include "src/core/SkMakeUnique.h"
+#include "src/utils/SkOSPath.h"
-#include "FakeStreams.h"
-#include "Test.h"
+#include "tests/FakeStreams.h"
+#include "tests/Test.h"
static const char* gText = "Four score and seven years ago";
diff --git a/tests/StreamTest.cpp b/tests/StreamTest.cpp
index 3372ee8..bc00f45 100644
--- a/tests/StreamTest.cpp
+++ b/tests/StreamTest.cpp
@@ -5,17 +5,17 @@
* found in the LICENSE file.
*/
-#include "Resources.h"
-#include "SkAutoMalloc.h"
-#include "SkData.h"
-#include "SkFrontBufferedStream.h"
-#include "SkOSFile.h"
-#include "SkOSPath.h"
-#include "SkRandom.h"
-#include "SkStream.h"
-#include "SkStreamPriv.h"
-#include "SkTo.h"
-#include "Test.h"
+#include "include/core/SkData.h"
+#include "include/core/SkStream.h"
+#include "include/private/SkTo.h"
+#include "include/utils/SkFrontBufferedStream.h"
+#include "include/utils/SkRandom.h"
+#include "src/core/SkAutoMalloc.h"
+#include "src/core/SkOSFile.h"
+#include "src/core/SkStreamPriv.h"
+#include "src/utils/SkOSPath.h"
+#include "tests/Test.h"
+#include "tools/Resources.h"
#include <functional>
#include <limits>
@@ -637,7 +637,7 @@
test_all(&stream2, true);
}
-#include "SkBuffer.h"
+#include "src/core/SkBuffer.h"
DEF_TEST(RBuffer, reporter) {
int32_t value = 0;
diff --git a/tests/StringTest.cpp b/tests/StringTest.cpp
index ca0c698..68be50c 100644
--- a/tests/StringTest.cpp
+++ b/tests/StringTest.cpp
@@ -5,10 +5,10 @@
* found in the LICENSE file.
*/
-#include "Test.h"
+#include "tests/Test.h"
-#include "SkString.h"
-#include "SkStringUtils.h"
+#include "include/core/SkString.h"
+#include "src/core/SkStringUtils.h"
#include <stdarg.h>
#include <stdio.h>
diff --git a/tests/StrokeTest.cpp b/tests/StrokeTest.cpp
index 2feaea0..1adb3a5 100644
--- a/tests/StrokeTest.cpp
+++ b/tests/StrokeTest.cpp
@@ -5,12 +5,12 @@
* found in the LICENSE file.
*/
-#include "SkPaint.h"
-#include "SkPath.h"
-#include "SkRect.h"
-#include "SkStroke.h"
-#include "SkStrokeRec.h"
-#include "Test.h"
+#include "include/core/SkPaint.h"
+#include "include/core/SkPath.h"
+#include "include/core/SkRect.h"
+#include "include/core/SkStrokeRec.h"
+#include "src/core/SkStroke.h"
+#include "tests/Test.h"
static bool equal(const SkRect& a, const SkRect& b) {
return SkScalarNearlyEqual(a.left(), b.left()) &&
diff --git a/tests/StrokerTest.cpp b/tests/StrokerTest.cpp
index 04307a1..c851523 100644
--- a/tests/StrokerTest.cpp
+++ b/tests/StrokerTest.cpp
@@ -5,17 +5,17 @@
* found in the LICENSE file.
*/
-#include "CommandLineFlags.h"
-#include "PathOpsCubicIntersectionTestData.h"
-#include "PathOpsQuadIntersectionTestData.h"
-#include "SkPaint.h"
-#include "SkPath.h"
-#include "SkPathOpsCubic.h"
-#include "SkPointPriv.h"
-#include "SkRandom.h"
-#include "SkStrokerPriv.h"
-#include "SkTime.h"
-#include "Test.h"
+#include "include/core/SkPaint.h"
+#include "include/core/SkPath.h"
+#include "include/core/SkTime.h"
+#include "include/utils/SkRandom.h"
+#include "src/core/SkPointPriv.h"
+#include "src/core/SkStrokerPriv.h"
+#include "src/pathops/SkPathOpsCubic.h"
+#include "tests/PathOpsCubicIntersectionTestData.h"
+#include "tests/PathOpsQuadIntersectionTestData.h"
+#include "tests/Test.h"
+#include "tools/flags/CommandLineFlags.h"
static DEFINE_bool(timeout, true, "run until alloted time expires");
diff --git a/tests/SubsetPath.cpp b/tests/SubsetPath.cpp
index 6a7660e..9a88b50 100644
--- a/tests/SubsetPath.cpp
+++ b/tests/SubsetPath.cpp
@@ -5,8 +5,8 @@
* found in the LICENSE file.
*/
-#include "SubsetPath.h"
-#include "SkMathPriv.h"
+#include "src/core/SkMathPriv.h"
+#include "tests/SubsetPath.h"
SubsetPath::SubsetPath(const SkPath& path)
: fPath(path)
diff --git a/tests/SubsetPath.h b/tests/SubsetPath.h
index 9e4d231..2486eb7 100644
--- a/tests/SubsetPath.h
+++ b/tests/SubsetPath.h
@@ -7,8 +7,8 @@
#ifndef SubsetPath_DEFINED
#define SubsetPath_DEFINED
-#include "SkPath.h"
-#include "SkTDArray.h"
+#include "include/core/SkPath.h"
+#include "include/private/SkTDArray.h"
/* Given a path, generate a the desired minimal subset of the original.
diff --git a/tests/SurfaceSemaphoreTest.cpp b/tests/SurfaceSemaphoreTest.cpp
index bc2d53c..ecc1821 100644
--- a/tests/SurfaceSemaphoreTest.cpp
+++ b/tests/SurfaceSemaphoreTest.cpp
@@ -5,25 +5,25 @@
* found in the LICENSE file.
*/
-#include "vk/GrVkVulkan.h"
+#include "include/gpu/vk/GrVkVulkan.h"
-#include "GrContextPriv.h"
-#include "GrContextFactory.h"
-#include "Test.h"
+#include "src/gpu/GrContextPriv.h"
+#include "tests/Test.h"
+#include "tools/gpu/GrContextFactory.h"
-#include "GrBackendSemaphore.h"
-#include "GrBackendSurface.h"
-#include "SkCanvas.h"
-#include "SkSurface.h"
+#include "include/core/SkCanvas.h"
+#include "include/core/SkSurface.h"
+#include "include/gpu/GrBackendSemaphore.h"
+#include "include/gpu/GrBackendSurface.h"
-#include "gl/GrGLGpu.h"
-#include "gl/GrGLUtil.h"
+#include "src/gpu/gl/GrGLGpu.h"
+#include "src/gpu/gl/GrGLUtil.h"
#ifdef SK_VULKAN
-#include "vk/GrVkCommandPool.h"
-#include "vk/GrVkGpu.h"
-#include "vk/GrVkTypes.h"
-#include "vk/GrVkUtil.h"
+#include "include/gpu/vk/GrVkTypes.h"
+#include "src/gpu/vk/GrVkCommandPool.h"
+#include "src/gpu/vk/GrVkGpu.h"
+#include "src/gpu/vk/GrVkUtil.h"
#ifdef VK_USE_PLATFORM_WIN32_KHR
// windows wants to define this as CreateSemaphoreA or CreateSemaphoreW
diff --git a/tests/SurfaceTest.cpp b/tests/SurfaceTest.cpp
index f2279b8..7d2bff3 100644
--- a/tests/SurfaceTest.cpp
+++ b/tests/SurfaceTest.cpp
@@ -5,33 +5,33 @@
* found in the LICENSE file.
*/
-#include "GrBackendSurface.h"
-#include "GrContext.h"
-#include "GrContextPriv.h"
-#include "GrGpu.h"
-#include "GrGpuResourcePriv.h"
-#include "GrRenderTargetContext.h"
-#include "GrResourceProvider.h"
-#include "SkCanvas.h"
-#include "SkData.h"
-#include "SkDevice.h"
-#include "SkGpuDevice.h"
-#include "SkImage_Base.h"
-#include "SkImage_Gpu.h"
-#include "SkOverdrawCanvas.h"
-#include "SkPath.h"
-#include "SkRegion.h"
-#include "SkRRect.h"
-#include "SkSurface.h"
-#include "SkSurface_Gpu.h"
-#include "SkUtils.h"
-#include "Test.h"
+#include "include/core/SkCanvas.h"
+#include "include/core/SkData.h"
+#include "include/core/SkOverdrawCanvas.h"
+#include "include/core/SkPath.h"
+#include "include/core/SkRRect.h"
+#include "include/core/SkRegion.h"
+#include "include/core/SkSurface.h"
+#include "include/gpu/GrBackendSurface.h"
+#include "include/gpu/GrContext.h"
+#include "src/core/SkDevice.h"
+#include "src/core/SkUtils.h"
+#include "src/gpu/GrContextPriv.h"
+#include "src/gpu/GrGpu.h"
+#include "src/gpu/GrGpuResourcePriv.h"
+#include "src/gpu/GrRenderTargetContext.h"
+#include "src/gpu/GrResourceProvider.h"
+#include "src/gpu/SkGpuDevice.h"
+#include "src/image/SkImage_Base.h"
+#include "src/image/SkImage_Gpu.h"
+#include "src/image/SkSurface_Gpu.h"
+#include "tests/Test.h"
#include <functional>
#include <initializer_list>
#include <vector>
-#include "ToolUtils.h"
+#include "tools/ToolUtils.h"
static void release_direct_surface_storage(void* pixels, void* context) {
SkASSERT(pixels == context);
diff --git a/tests/SwizzlerTest.cpp b/tests/SwizzlerTest.cpp
index cfcf93b..8a96b56 100644
--- a/tests/SwizzlerTest.cpp
+++ b/tests/SwizzlerTest.cpp
@@ -5,11 +5,11 @@
* found in the LICENSE file.
*/
-#include "SkImageInfoPriv.h"
-#include "SkSwizzle.h"
-#include "SkSwizzler.h"
-#include "Test.h"
-#include "SkOpts.h"
+#include "include/core/SkSwizzle.h"
+#include "include/private/SkImageInfoPriv.h"
+#include "src/codec/SkSwizzler.h"
+#include "src/core/SkOpts.h"
+#include "tests/Test.h"
static void check_fill(skiatest::Reporter* r,
const SkImageInfo& imageInfo,
diff --git a/tests/TArrayTest.cpp b/tests/TArrayTest.cpp
index b8f0a54..4baedb8 100644
--- a/tests/TArrayTest.cpp
+++ b/tests/TArrayTest.cpp
@@ -5,10 +5,10 @@
* found in the LICENSE file.
*/
-#include "SkRandom.h"
-#include "SkRefCnt.h"
-#include "SkTArray.h"
-#include "Test.h"
+#include "include/core/SkRefCnt.h"
+#include "include/private/SkTArray.h"
+#include "include/utils/SkRandom.h"
+#include "tests/Test.h"
// Tests the SkTArray<T> class template.
diff --git a/tests/TDPQueueTest.cpp b/tests/TDPQueueTest.cpp
index 75eab25..279b640 100644
--- a/tests/TDPQueueTest.cpp
+++ b/tests/TDPQueueTest.cpp
@@ -5,9 +5,9 @@
* found in the LICENSE file.
*/
-#include "SkTDPQueue.h"
-#include "SkRandom.h"
-#include "Test.h"
+#include "include/utils/SkRandom.h"
+#include "src/core/SkTDPQueue.h"
+#include "tests/Test.h"
namespace { bool intless(const int& a, const int& b) { return a < b; } }
diff --git a/tests/TLazyTest.cpp b/tests/TLazyTest.cpp
index 7be514f..ef88930 100644
--- a/tests/TLazyTest.cpp
+++ b/tests/TLazyTest.cpp
@@ -5,8 +5,8 @@
* found in the LICENSE file.
*/
-#include "SkTLazy.h"
-#include "Test.h"
+#include "src/core/SkTLazy.h"
+#include "tests/Test.h"
DEF_TEST(TLazy_copy, r) {
SkTLazy<int> lazy;
diff --git a/tests/TemplatesTest.cpp b/tests/TemplatesTest.cpp
index 88268a0..e3e52a3 100644
--- a/tests/TemplatesTest.cpp
+++ b/tests/TemplatesTest.cpp
@@ -5,8 +5,8 @@
* found in the LICENSE file.
*/
-#include "SkTemplates.h"
-#include "Test.h"
+#include "include/private/SkTemplates.h"
+#include "tests/Test.h"
// Tests for some of the helpers in SkTemplates.h
static void test_automalloc_realloc(skiatest::Reporter* reporter) {
diff --git a/tests/TessellatingPathRendererTests.cpp b/tests/TessellatingPathRendererTests.cpp
index 6457c9f..099e749 100644
--- a/tests/TessellatingPathRendererTests.cpp
+++ b/tests/TessellatingPathRendererTests.cpp
@@ -5,18 +5,18 @@
* found in the LICENSE file.
*/
-#include "Test.h"
+#include "tests/Test.h"
-#include "GrClip.h"
-#include "GrContext.h"
-#include "GrContextPriv.h"
-#include "GrShape.h"
-#include "GrStyle.h"
-#include "SkGradientShader.h"
-#include "SkPath.h"
-#include "SkShaderBase.h"
-#include "effects/GrPorterDuffXferProcessor.h"
-#include "ops/GrTessellatingPathRenderer.h"
+#include "include/core/SkPath.h"
+#include "include/effects/SkGradientShader.h"
+#include "include/gpu/GrContext.h"
+#include "src/gpu/GrClip.h"
+#include "src/gpu/GrContextPriv.h"
+#include "src/gpu/GrShape.h"
+#include "src/gpu/GrStyle.h"
+#include "src/gpu/effects/GrPorterDuffXferProcessor.h"
+#include "src/gpu/ops/GrTessellatingPathRenderer.h"
+#include "src/shaders/SkShaderBase.h"
/*
* These tests pass by not crashing, hanging or asserting in Debug.
diff --git a/tests/Test.cpp b/tests/Test.cpp
index 06b0016..7ae8231 100644
--- a/tests/Test.cpp
+++ b/tests/Test.cpp
@@ -5,13 +5,13 @@
* found in the LICENSE file.
*/
-#include "Test.h"
+#include "tests/Test.h"
#include <stdlib.h>
-#include "CommandLineFlags.h"
-#include "SkString.h"
-#include "SkTime.h"
+#include "include/core/SkString.h"
+#include "include/core/SkTime.h"
+#include "tools/flags/CommandLineFlags.h"
static DEFINE_string2(tmpDir, t, nullptr, "Temp directory to use.");
diff --git a/tests/Test.h b/tests/Test.h
index 35e6dd8..fec25ff 100644
--- a/tests/Test.h
+++ b/tests/Test.h
@@ -7,12 +7,12 @@
#ifndef skiatest_Test_DEFINED
#define skiatest_Test_DEFINED
-#include "../tools/Registry.h"
-#include "GrContextFactory.h"
-#include "SkClipOpPriv.h"
-#include "SkString.h"
-#include "SkTraceEvent.h"
-#include "SkTypes.h"
+#include "include/core/SkString.h"
+#include "include/core/SkTypes.h"
+#include "src/core/SkClipOpPriv.h"
+#include "src/core/SkTraceEvent.h"
+#include "tools/Registry.h"
+#include "tools/gpu/GrContextFactory.h"
namespace skiatest {
@@ -94,7 +94,7 @@
/*
Use the following macros to make use of the skiatest classes, e.g.
- #include "Test.h"
+ #include "tests/Test.h"
DEF_TEST(TestName, reporter) {
...
diff --git a/tests/TestTest.cpp b/tests/TestTest.cpp
index 68bec94..8039b87 100644
--- a/tests/TestTest.cpp
+++ b/tests/TestTest.cpp
@@ -5,10 +5,10 @@
* found in the LICENSE file.
*/
-#include "Test.h"
+#include "tests/Test.h"
-#include "GrContext.h"
-#include "gl/GLTestContext.h"
+#include "include/gpu/GrContext.h"
+#include "tools/gpu/gl/GLTestContext.h"
// This is an example of a normal test.
DEF_TEST(TestNormal, reporter) {
diff --git a/tests/TestUtils.cpp b/tests/TestUtils.cpp
index 16ef403..740de21 100644
--- a/tests/TestUtils.cpp
+++ b/tests/TestUtils.cpp
@@ -5,17 +5,17 @@
* found in the LICENSE file.
*/
-#include "TestUtils.h"
+#include "tests/TestUtils.h"
-#include "GrContextPriv.h"
-#include "GrSurfaceContext.h"
-#include "GrSurfaceContextPriv.h"
-#include "GrSurfaceProxy.h"
-#include "GrTextureProxy.h"
-#include "ProxyUtils.h"
-#include "SkGr.h"
-#include "SkBase64.h"
-#include "SkPngEncoder.h"
+#include "include/encode/SkPngEncoder.h"
+#include "include/private/GrSurfaceProxy.h"
+#include "include/private/GrTextureProxy.h"
+#include "include/utils/SkBase64.h"
+#include "src/gpu/GrContextPriv.h"
+#include "src/gpu/GrSurfaceContext.h"
+#include "src/gpu/GrSurfaceContextPriv.h"
+#include "src/gpu/SkGr.h"
+#include "tools/gpu/ProxyUtils.h"
void test_read_pixels(skiatest::Reporter* reporter,
GrSurfaceContext* srcContext, uint32_t expectedPixelValues[],
@@ -183,7 +183,7 @@
return true;
}
-#include "SkCharToGlyphCache.h"
+#include "src/utils/SkCharToGlyphCache.h"
static SkGlyphID hash_to_glyph(uint32_t value) {
return SkToU16(((value >> 16) ^ value) & 0xFFFF);
diff --git a/tests/TestUtils.h b/tests/TestUtils.h
index 1e0c1e7..3d98b9a 100644
--- a/tests/TestUtils.h
+++ b/tests/TestUtils.h
@@ -5,8 +5,8 @@
* found in the LICENSE file.
*/
-#include "Test.h"
-#include "SkBitmap.h"
+#include "include/core/SkBitmap.h"
+#include "tests/Test.h"
class GrSurfaceContext;
class GrSurfaceProxy;
diff --git a/tests/TextBlobCacheTest.cpp b/tests/TextBlobCacheTest.cpp
index 1c86de4..5ec147a 100644
--- a/tests/TextBlobCacheTest.cpp
+++ b/tests/TextBlobCacheTest.cpp
@@ -5,27 +5,27 @@
* found in the LICENSE file.
*/
-#include "ToolUtils.h"
+#include "tools/ToolUtils.h"
-#include "RandomScalerContext.h"
-#include "SkCanvas.h"
-#include "SkFontMgr.h"
-#include "SkGlyphRun.h"
-#include "SkGraphics.h"
-#include "SkPaint.h"
-#include "SkPoint.h"
-#include "SkSurface.h"
-#include "SkTextBlob.h"
-#include "SkTypeface.h"
+#include "include/core/SkCanvas.h"
+#include "include/core/SkFontMgr.h"
+#include "include/core/SkGraphics.h"
+#include "include/core/SkPaint.h"
+#include "include/core/SkPoint.h"
+#include "include/core/SkSurface.h"
+#include "include/core/SkTextBlob.h"
+#include "include/core/SkTypeface.h"
+#include "src/core/SkGlyphRun.h"
+#include "tools/fonts/RandomScalerContext.h"
#ifdef SK_BUILD_FOR_WIN
- #include "SkTypeface_win.h"
+ #include "include/ports/SkTypeface_win.h"
#endif
-#include "Test.h"
+#include "tests/Test.h"
-#include "GrContext.h"
-#include "GrContextPriv.h"
+#include "include/gpu/GrContext.h"
+#include "src/gpu/GrContextPriv.h"
static void draw(SkCanvas* canvas, int redraw, const SkTArray<sk_sp<SkTextBlob>>& blobs) {
int yOffset = 0;
diff --git a/tests/TextBlobTest.cpp b/tests/TextBlobTest.cpp
index d18d05b..9b5b78b 100644
--- a/tests/TextBlobTest.cpp
+++ b/tests/TextBlobTest.cpp
@@ -5,15 +5,15 @@
* found in the LICENSE file.
*/
-#include "SkPaint.h"
-#include "SkPoint.h"
-#include "SkSerialProcs.h"
-#include "SkTextBlobPriv.h"
-#include "SkTo.h"
-#include "SkTypeface.h"
+#include "include/core/SkPaint.h"
+#include "include/core/SkPoint.h"
+#include "include/core/SkSerialProcs.h"
+#include "include/core/SkTypeface.h"
+#include "include/private/SkTo.h"
+#include "src/core/SkTextBlobPriv.h"
-#include "Test.h"
-#include "ToolUtils.h"
+#include "tests/Test.h"
+#include "tools/ToolUtils.h"
class TextBlobTester {
public:
@@ -350,9 +350,9 @@
}
///////////////////////////////////////////////////////////////////////////////////////////////////
-#include "SkCanvas.h"
-#include "SkSurface.h"
-#include "SkTDArray.h"
+#include "include/core/SkCanvas.h"
+#include "include/core/SkSurface.h"
+#include "include/private/SkTDArray.h"
static void add_run(SkTextBlobBuilder* builder, const char text[], SkScalar x, SkScalar y,
sk_sp<SkTypeface> tf) {
diff --git a/tests/TextureBindingsResetTest.cpp b/tests/TextureBindingsResetTest.cpp
index b338754..876722b 100644
--- a/tests/TextureBindingsResetTest.cpp
+++ b/tests/TextureBindingsResetTest.cpp
@@ -5,12 +5,12 @@
* found in the LICENSE file.
*/
-#include "GrContextPriv.h"
-#include "SkSurface.h"
-#include "Test.h"
-#include "gl/GrGLDefines.h"
-#include "gl/GrGLGpu.h"
-#include "gl/GrGLUtil.h"
+#include "include/core/SkSurface.h"
+#include "src/gpu/GrContextPriv.h"
+#include "src/gpu/gl/GrGLDefines.h"
+#include "src/gpu/gl/GrGLGpu.h"
+#include "src/gpu/gl/GrGLUtil.h"
+#include "tests/Test.h"
DEF_GPUTEST_FOR_GL_RENDERING_CONTEXTS(TextureBindingsResetTest, reporter, ctxInfo) {
#define GL(F) GR_GL_CALL(ctxInfo.glContext()->gl(), F)
diff --git a/tests/TextureProxyTest.cpp b/tests/TextureProxyTest.cpp
index f26dbb7..0257083 100644
--- a/tests/TextureProxyTest.cpp
+++ b/tests/TextureProxyTest.cpp
@@ -7,18 +7,18 @@
// This is a GPU-backend specific test.
-#include "Test.h"
+#include "tests/Test.h"
-#include "GrBackendSurface.h"
-#include "GrContextPriv.h"
-#include "GrResourceCache.h"
-#include "GrProxyProvider.h"
-#include "GrResourceProvider.h"
-#include "GrTexture.h"
-#include "GrTextureProxy.h"
+#include "include/gpu/GrBackendSurface.h"
+#include "include/gpu/GrTexture.h"
+#include "include/private/GrTextureProxy.h"
+#include "src/gpu/GrContextPriv.h"
+#include "src/gpu/GrProxyProvider.h"
+#include "src/gpu/GrResourceCache.h"
+#include "src/gpu/GrResourceProvider.h"
-#include "SkGr.h"
-#include "SkImage.h"
+#include "include/core/SkImage.h"
+#include "src/gpu/SkGr.h"
int GrProxyProvider::numUniqueKeyProxies_TestOnly() const {
return fUniquelyKeyedProxies.count();
diff --git a/tests/TextureStripAtlasManagerTest.cpp b/tests/TextureStripAtlasManagerTest.cpp
index c1aeb44..65cd523 100644
--- a/tests/TextureStripAtlasManagerTest.cpp
+++ b/tests/TextureStripAtlasManagerTest.cpp
@@ -6,14 +6,14 @@
*/
-#include "SkCanvas.h"
-#include "SkGradientShader.h"
-#include "SkPaint.h"
-#include "SkSurface.h"
-#include "SkTableColorFilter.h"
+#include "include/core/SkCanvas.h"
+#include "include/core/SkPaint.h"
+#include "include/core/SkSurface.h"
+#include "include/effects/SkGradientShader.h"
+#include "include/effects/SkTableColorFilter.h"
-#include "Resources.h"
-#include "Test.h"
+#include "tests/Test.h"
+#include "tools/Resources.h"
// The gradient shader will use the texture strip atlas if it has too many colors. Make sure
// abandoning the context works.
diff --git a/tests/Time.cpp b/tests/Time.cpp
index 5a07f08..189443b 100644
--- a/tests/Time.cpp
+++ b/tests/Time.cpp
@@ -5,9 +5,9 @@
* found in the LICENSE file.
*/
-#include "SkTime.h"
-#include "SkTo.h"
-#include "Test.h"
+#include "include/core/SkTime.h"
+#include "include/private/SkTo.h"
+#include "tests/Test.h"
// Sanity checks for the GetDateTime function.
DEF_TEST(Time_GetDateTime, r) {
diff --git a/tests/TopoSortTest.cpp b/tests/TopoSortTest.cpp
index e45b6b8..9fc0f01 100644
--- a/tests/TopoSortTest.cpp
+++ b/tests/TopoSortTest.cpp
@@ -5,11 +5,11 @@
* found in the LICENSE file.
*/
-#include "SkRandom.h"
-#include "SkTTopoSort.h"
-#include "Test.h"
+#include "include/utils/SkRandom.h"
+#include "src/core/SkTTopoSort.h"
+#include "tests/Test.h"
-#include "ToolUtils.h"
+#include "tools/ToolUtils.h"
typedef void (*CreateGraphPF)(SkTArray<sk_sp<ToolUtils::TopoTestNode>>* graph);
diff --git a/tests/TraceMemoryDumpTest.cpp b/tests/TraceMemoryDumpTest.cpp
index d5a9bcb..1e61052 100644
--- a/tests/TraceMemoryDumpTest.cpp
+++ b/tests/TraceMemoryDumpTest.cpp
@@ -5,16 +5,16 @@
* found in the LICENSE file.
*/
-#include "SkTraceMemoryDump.h"
+#include "include/core/SkTraceMemoryDump.h"
-#include "Test.h"
+#include "tests/Test.h"
-#include "GrContextPriv.h"
-#include "GrRenderTarget.h"
-#include "GrTexture.h"
-#include "gl/GrGLBuffer.h"
-#include "gl/GrGLDefines.h"
-#include "gl/GrGLGpu.h"
+#include "include/gpu/GrRenderTarget.h"
+#include "include/gpu/GrTexture.h"
+#include "src/gpu/GrContextPriv.h"
+#include "src/gpu/gl/GrGLBuffer.h"
+#include "src/gpu/gl/GrGLDefines.h"
+#include "src/gpu/gl/GrGLGpu.h"
/*
* Build test for SkTraceMemoryDump.
diff --git a/tests/TracingTest.cpp b/tests/TracingTest.cpp
index 266ed9c..49540b2 100644
--- a/tests/TracingTest.cpp
+++ b/tests/TracingTest.cpp
@@ -5,13 +5,13 @@
* found in the LICENSE file.
*/
-#include "CommandLineFlags.h"
-#include "SkImageInfo.h"
-#include "SkLeanWindows.h"
-#include "SkPoint.h"
-#include "SkRect.h"
-#include "SkTraceEvent.h"
-#include "Test.h"
+#include "include/core/SkImageInfo.h"
+#include "include/core/SkPoint.h"
+#include "include/core/SkRect.h"
+#include "include/private/SkLeanWindows.h"
+#include "src/core/SkTraceEvent.h"
+#include "tests/Test.h"
+#include "tools/flags/CommandLineFlags.h"
static DEFINE_bool(slowTracingTest, false,
"Artificially slow down tracing test to produce nicer JSON");
diff --git a/tests/TransferPixelsTest.cpp b/tests/TransferPixelsTest.cpp
index db054ee..631a870 100644
--- a/tests/TransferPixelsTest.cpp
+++ b/tests/TransferPixelsTest.cpp
@@ -7,17 +7,17 @@
// This is a GPU-backend specific test. It relies on static intializers to work
-#include "SkTypes.h"
+#include "include/core/SkTypes.h"
-#include "GrContextFactory.h"
-#include "GrContextPriv.h"
-#include "GrGpu.h"
-#include "GrResourceProvider.h"
-#include "GrSurfaceProxy.h"
-#include "GrTexture.h"
-#include "SkGr.h"
-#include "SkSurface.h"
-#include "Test.h"
+#include "include/core/SkSurface.h"
+#include "include/gpu/GrTexture.h"
+#include "include/private/GrSurfaceProxy.h"
+#include "src/gpu/GrContextPriv.h"
+#include "src/gpu/GrGpu.h"
+#include "src/gpu/GrResourceProvider.h"
+#include "src/gpu/SkGr.h"
+#include "tests/Test.h"
+#include "tools/gpu/GrContextFactory.h"
using sk_gpu_test::GrContextFactory;
diff --git a/tests/TypefaceTest.cpp b/tests/TypefaceTest.cpp
index 3858cb2..b1c330b 100644
--- a/tests/TypefaceTest.cpp
+++ b/tests/TypefaceTest.cpp
@@ -5,21 +5,21 @@
* found in the LICENSE file.
*/
-#include "Resources.h"
-#include "SkAdvancedTypefaceMetrics.h"
-#include "SkData.h"
-#include "SkFixed.h"
-#include "SkFontDescriptor.h"
-#include "SkFontMgr.h"
-#include "SkMakeUnique.h"
-#include "SkOTTable_OS_2.h"
-#include "SkRefCnt.h"
-#include "SkSFNTHeader.h"
-#include "SkStream.h"
-#include "SkTypeface.h"
-#include "SkTypefaceCache.h"
-#include "Test.h"
-#include "TestEmptyTypeface.h"
+#include "include/core/SkData.h"
+#include "include/core/SkFontMgr.h"
+#include "include/core/SkRefCnt.h"
+#include "include/core/SkStream.h"
+#include "include/core/SkTypeface.h"
+#include "include/private/SkFixed.h"
+#include "src/core/SkAdvancedTypefaceMetrics.h"
+#include "src/core/SkFontDescriptor.h"
+#include "src/core/SkMakeUnique.h"
+#include "src/core/SkTypefaceCache.h"
+#include "src/sfnt/SkOTTable_OS_2.h"
+#include "src/sfnt/SkSFNTHeader.h"
+#include "tests/Test.h"
+#include "tools/Resources.h"
+#include "tools/fonts/TestEmptyTypeface.h"
#include <memory>
diff --git a/tests/UnicodeTest.cpp b/tests/UnicodeTest.cpp
index ee39e57..c67c278 100644
--- a/tests/UnicodeTest.cpp
+++ b/tests/UnicodeTest.cpp
@@ -5,10 +5,10 @@
* found in the LICENSE file.
*/
-#include "SkFont.h"
-#include "SkPaint.h"
-#include "SkUTF.h"
-#include "Test.h"
+#include "include/core/SkFont.h"
+#include "include/core/SkPaint.h"
+#include "src/utils/SkUTF.h"
+#include "tests/Test.h"
// Simple test to ensure that when we call textToGlyphs, we get the same
// result (for the same text) when using UTF8, UTF16, UTF32.
@@ -44,8 +44,8 @@
REPORTER_ASSERT(reporter, !memcmp(glyphs8, glyphs32, count8 * sizeof(uint16_t)));
}
-#include "SkFont.h"
-#include "SkFontPriv.h"
+#include "include/core/SkFont.h"
+#include "src/core/SkFontPriv.h"
DEF_TEST(glyphs_to_unichars, reporter) {
SkFont font;
diff --git a/tests/UtilsTest.cpp b/tests/UtilsTest.cpp
index aa8f9c9..a520aca 100644
--- a/tests/UtilsTest.cpp
+++ b/tests/UtilsTest.cpp
@@ -5,11 +5,11 @@
* found in the LICENSE file.
*/
-#include "SkRandom.h"
-#include "SkRefCnt.h"
-#include "SkTSearch.h"
-#include "SkTSort.h"
-#include "Test.h"
+#include "include/core/SkRefCnt.h"
+#include "include/private/SkTSearch.h"
+#include "include/utils/SkRandom.h"
+#include "src/core/SkTSort.h"
+#include "tests/Test.h"
class RefClass : public SkRefCnt {
public:
diff --git a/tests/VerticesTest.cpp b/tests/VerticesTest.cpp
index 27cc0a1..1f90e2b 100644
--- a/tests/VerticesTest.cpp
+++ b/tests/VerticesTest.cpp
@@ -5,11 +5,11 @@
* found in the LICENSE file.
*/
-#include "SkCanvas.h"
-#include "SkSurface.h"
-#include "SkVertices.h"
-#include "Test.h"
-#include "ToolUtils.h"
+#include "include/core/SkCanvas.h"
+#include "include/core/SkSurface.h"
+#include "include/core/SkVertices.h"
+#include "tests/Test.h"
+#include "tools/ToolUtils.h"
static bool equal(const SkVertices* v0, const SkVertices* v1) {
if (v0->mode() != v1->mode()) {
diff --git a/tests/VkBackendSurfaceTest.cpp b/tests/VkBackendSurfaceTest.cpp
index b30c0b8..94cb693 100644
--- a/tests/VkBackendSurfaceTest.cpp
+++ b/tests/VkBackendSurfaceTest.cpp
@@ -7,24 +7,24 @@
// This is a GPU-backend specific test. It relies on static intializers to work
-#include "SkTypes.h"
+#include "include/core/SkTypes.h"
#if defined(SK_VULKAN)
-#include "vk/GrVkVulkan.h"
+#include "include/gpu/vk/GrVkVulkan.h"
-#include "Test.h"
+#include "tests/Test.h"
-#include "GrBackendSurface.h"
-#include "GrContextPriv.h"
-#include "GrTextureProxy.h"
-#include "GrTexture.h"
-#include "SkImage.h"
-#include "SkImage_Base.h"
-#include "vk/GrVkGpu.h"
-#include "vk/GrVkImageLayout.h"
-#include "vk/GrVkTexture.h"
-#include "vk/GrVkTypes.h"
+#include "include/core/SkImage.h"
+#include "include/gpu/GrBackendSurface.h"
+#include "include/gpu/GrTexture.h"
+#include "include/gpu/vk/GrVkTypes.h"
+#include "include/private/GrTextureProxy.h"
+#include "src/gpu/GrContextPriv.h"
+#include "src/gpu/vk/GrVkGpu.h"
+#include "src/gpu/vk/GrVkImageLayout.h"
+#include "src/gpu/vk/GrVkTexture.h"
+#include "src/image/SkImage_Base.h"
DEF_GPUTEST_FOR_VULKAN_CONTEXT(VkImageLayoutTest, reporter, ctxInfo) {
GrContext* context = ctxInfo.grContext();
diff --git a/tests/VkDrawableTest.cpp b/tests/VkDrawableTest.cpp
index 5693640..01fbbe7 100644
--- a/tests/VkDrawableTest.cpp
+++ b/tests/VkDrawableTest.cpp
@@ -7,23 +7,23 @@
// This is a GPU-backend specific test. It relies on static intializers to work
-#include "SkTypes.h"
+#include "include/core/SkTypes.h"
#if SK_SUPPORT_GPU && defined(SK_VULKAN)
-#include "vk/GrVkVulkan.h"
+#include "include/gpu/vk/GrVkVulkan.h"
-#include "GrBackendDrawableInfo.h"
-#include "GrContextFactory.h"
-#include "GrContextPriv.h"
-#include "SkDrawable.h"
-#include "SkSurface.h"
-#include "Test.h"
-#include "vk/GrVkGpu.h"
-#include "vk/GrVkInterface.h"
-#include "vk/GrVkMemory.h"
-#include "vk/GrVkSecondaryCBDrawContext.h"
-#include "vk/GrVkUtil.h"
+#include "include/core/SkDrawable.h"
+#include "include/core/SkSurface.h"
+#include "include/gpu/GrBackendDrawableInfo.h"
+#include "src/gpu/GrContextPriv.h"
+#include "src/gpu/vk/GrVkGpu.h"
+#include "src/gpu/vk/GrVkInterface.h"
+#include "src/gpu/vk/GrVkMemory.h"
+#include "src/gpu/vk/GrVkSecondaryCBDrawContext.h"
+#include "src/gpu/vk/GrVkUtil.h"
+#include "tests/Test.h"
+#include "tools/gpu/GrContextFactory.h"
using sk_gpu_test::GrContextFactory;
diff --git a/tests/VkHardwareBufferTest.cpp b/tests/VkHardwareBufferTest.cpp
index a8279cc..c198fe3 100644
--- a/tests/VkHardwareBufferTest.cpp
+++ b/tests/VkHardwareBufferTest.cpp
@@ -7,27 +7,27 @@
// This is a GPU-backend specific test. It relies on static intializers to work
-#include "SkTypes.h"
+#include "include/core/SkTypes.h"
#if SK_SUPPORT_GPU && defined(SK_BUILD_FOR_ANDROID) && __ANDROID_API__ >= 26 && defined(SK_VULKAN)
-#include "GrBackendSemaphore.h"
-#include "GrContext.h"
-#include "GrContextFactory.h"
-#include "GrContextPriv.h"
-#include "GrGpu.h"
-#include "GrProxyProvider.h"
-#include "SkAutoMalloc.h"
-#include "SkCanvas.h"
-#include "SkGr.h"
-#include "SkImage.h"
-#include "SkSurface.h"
-#include "Test.h"
-#include "../tools/gpu/vk/VkTestUtils.h"
-#include "gl/GrGLDefines.h"
-#include "gl/GrGLUtil.h"
-#include "vk/GrVkBackendContext.h"
-#include "vk/GrVkExtensions.h"
+#include "include/core/SkCanvas.h"
+#include "include/core/SkImage.h"
+#include "include/core/SkSurface.h"
+#include "include/gpu/GrBackendSemaphore.h"
+#include "include/gpu/GrContext.h"
+#include "include/gpu/vk/GrVkBackendContext.h"
+#include "include/gpu/vk/GrVkExtensions.h"
+#include "src/core/SkAutoMalloc.h"
+#include "src/gpu/GrContextPriv.h"
+#include "src/gpu/GrGpu.h"
+#include "src/gpu/GrProxyProvider.h"
+#include "src/gpu/SkGr.h"
+#include "src/gpu/gl/GrGLDefines.h"
+#include "src/gpu/gl/GrGLUtil.h"
+#include "tests/Test.h"
+#include "tools/gpu/GrContextFactory.h"
+#include "tools/gpu/vk/VkTestUtils.h"
#include <android/hardware_buffer.h>
#include <cinttypes>
diff --git a/tests/VkMakeCopyPipelineTest.cpp b/tests/VkMakeCopyPipelineTest.cpp
index a86fd04..1977286 100644
--- a/tests/VkMakeCopyPipelineTest.cpp
+++ b/tests/VkMakeCopyPipelineTest.cpp
@@ -7,21 +7,21 @@
// This is a GPU-backend specific test. It relies on static intializers to work
-#include "SkTypes.h"
+#include "include/core/SkTypes.h"
#if defined(SK_VULKAN)
-#include "vk/GrVkVulkan.h"
+#include "include/gpu/vk/GrVkVulkan.h"
-#include "GrBackendSurface.h"
-#include "GrContextFactory.h"
-#include "GrContextPriv.h"
-#include "GrTexture.h"
-#include "Test.h"
-#include "vk/GrVkCopyPipeline.h"
-#include "vk/GrVkGpu.h"
-#include "vk/GrVkRenderTarget.h"
-#include "vk/GrVkUtil.h"
+#include "include/gpu/GrBackendSurface.h"
+#include "include/gpu/GrTexture.h"
+#include "src/gpu/GrContextPriv.h"
+#include "src/gpu/vk/GrVkCopyPipeline.h"
+#include "src/gpu/vk/GrVkGpu.h"
+#include "src/gpu/vk/GrVkRenderTarget.h"
+#include "src/gpu/vk/GrVkUtil.h"
+#include "tests/Test.h"
+#include "tools/gpu/GrContextFactory.h"
using sk_gpu_test::GrContextFactory;
diff --git a/tests/VkPriorityExtensionTest.cpp b/tests/VkPriorityExtensionTest.cpp
index 622620a..71e2cd4 100644
--- a/tests/VkPriorityExtensionTest.cpp
+++ b/tests/VkPriorityExtensionTest.cpp
@@ -5,14 +5,14 @@
* found in the LICENSE file.
*/
-#include "SkTypes.h"
+#include "include/core/SkTypes.h"
#if SK_SUPPORT_GPU && defined(SK_VULKAN)
-#include "SkAutoMalloc.h"
-#include "Test.h"
-#include "vk/GrVkTypes.h"
-#include "../tools/gpu/vk/VkTestUtils.h"
+#include "include/gpu/vk/GrVkTypes.h"
+#include "src/core/SkAutoMalloc.h"
+#include "tests/Test.h"
+#include "tools/gpu/vk/VkTestUtils.h"
#define ACQUIRE_VK_PROC_NOCHECK(name, instance, device) \
PFN_vk##name grVk##name = reinterpret_cast<PFN_vk##name>(getProc("vk" #name, instance, device))
diff --git a/tests/VkWrapTests.cpp b/tests/VkWrapTests.cpp
index 1bd64d9..00271d6 100644
--- a/tests/VkWrapTests.cpp
+++ b/tests/VkWrapTests.cpp
@@ -7,23 +7,23 @@
// This is a GPU-backend specific test. It relies on static intializers to work
-#include "SkTypes.h"
+#include "include/core/SkTypes.h"
#if defined(SK_VULKAN)
-#include "vk/GrVkVulkan.h"
+#include "include/gpu/vk/GrVkVulkan.h"
-#include "GrBackendSurface.h"
-#include "GrContextPriv.h"
-#include "GrContextFactory.h"
-#include "GrRenderTarget.h"
-#include "GrTexture.h"
+#include "include/gpu/GrBackendSurface.h"
+#include "include/gpu/GrRenderTarget.h"
+#include "include/gpu/GrTexture.h"
+#include "src/gpu/GrContextPriv.h"
+#include "tools/gpu/GrContextFactory.h"
-#include "Test.h"
-#include "vk/GrVkCaps.h"
-#include "vk/GrVkGpu.h"
-#include "vk/GrVkMemory.h"
-#include "vk/GrVkTypes.h"
+#include "include/gpu/vk/GrVkTypes.h"
+#include "src/gpu/vk/GrVkCaps.h"
+#include "src/gpu/vk/GrVkGpu.h"
+#include "src/gpu/vk/GrVkMemory.h"
+#include "tests/Test.h"
using sk_gpu_test::GrContextFactory;
diff --git a/tests/VptrTest.cpp b/tests/VptrTest.cpp
index b8a9e1a..d6d52a8 100644
--- a/tests/VptrTest.cpp
+++ b/tests/VptrTest.cpp
@@ -5,9 +5,9 @@
* found in the LICENSE file.
*/
-#include "SkMakeUnique.h"
-#include "SkVptr.h"
-#include "Test.h"
+#include "src/core/SkMakeUnique.h"
+#include "src/core/SkVptr.h"
+#include "tests/Test.h"
namespace {
diff --git a/tests/WindowRectanglesTest.cpp b/tests/WindowRectanglesTest.cpp
index 2c2531b..8a91130 100644
--- a/tests/WindowRectanglesTest.cpp
+++ b/tests/WindowRectanglesTest.cpp
@@ -5,12 +5,12 @@
* found in the LICENSE file.
*/
-#include "SkTypes.h"
-#include "Test.h"
+#include "include/core/SkTypes.h"
+#include "tests/Test.h"
-#include "GrWindowRectangles.h"
-#include "SkRandom.h"
-#include "SkRectPriv.h"
+#include "include/utils/SkRandom.h"
+#include "src/core/SkRectPriv.h"
+#include "src/gpu/GrWindowRectangles.h"
static SkIRect next_irect(SkRandom& r) {
return {r.nextS(), r.nextS(), r.nextS(), r.nextS()};
diff --git a/tests/WritePixelsTest.cpp b/tests/WritePixelsTest.cpp
index e7ff433..d8c4e57 100644
--- a/tests/WritePixelsTest.cpp
+++ b/tests/WritePixelsTest.cpp
@@ -5,19 +5,19 @@
* found in the LICENSE file.
*/
-#include "SkCanvas.h"
-#include "SkColorData.h"
-#include "SkImageInfoPriv.h"
-#include "SkMathPriv.h"
-#include "SkSurface.h"
-#include "Test.h"
-#include "ToolUtils.h"
+#include "include/core/SkCanvas.h"
+#include "include/core/SkSurface.h"
+#include "include/private/SkColorData.h"
+#include "include/private/SkImageInfoPriv.h"
+#include "src/core/SkMathPriv.h"
+#include "tests/Test.h"
+#include "tools/ToolUtils.h"
-#include "GrBackendSurface.h"
-#include "GrContext.h"
-#include "GrContextPriv.h"
-#include "GrGpu.h"
-#include "GrProxyProvider.h"
+#include "include/gpu/GrBackendSurface.h"
+#include "include/gpu/GrContext.h"
+#include "src/gpu/GrContextPriv.h"
+#include "src/gpu/GrGpu.h"
+#include "src/gpu/GrProxyProvider.h"
#include <initializer_list>
@@ -273,7 +273,7 @@
return true;
}
-#include "SkMallocPixelRef.h"
+#include "include/core/SkMallocPixelRef.h"
// This is a tricky pattern, because we have to setConfig+rowBytes AND specify
// a custom pixelRef (which also has to specify its rowBytes), so we have to be
diff --git a/tests/Writer32Test.cpp b/tests/Writer32Test.cpp
index 6cb79f8..826b56e 100644
--- a/tests/Writer32Test.cpp
+++ b/tests/Writer32Test.cpp
@@ -5,11 +5,11 @@
* found in the LICENSE file.
*/
-#include "SkAutoMalloc.h"
-#include "SkRandom.h"
-#include "SkReader32.h"
-#include "SkWriter32.h"
-#include "Test.h"
+#include "include/utils/SkRandom.h"
+#include "src/core/SkAutoMalloc.h"
+#include "src/core/SkReader32.h"
+#include "src/core/SkWriter32.h"
+#include "tests/Test.h"
static void check_contents(skiatest::Reporter* reporter, const SkWriter32& writer,
const void* expected, size_t size) {
diff --git a/tests/YUVCacheTest.cpp b/tests/YUVCacheTest.cpp
index 0908bdd..a0a4160 100644
--- a/tests/YUVCacheTest.cpp
+++ b/tests/YUVCacheTest.cpp
@@ -5,10 +5,10 @@
* found in the LICENSE file.
*/
-#include "SkCachedData.h"
-#include "SkYUVPlanesCache.h"
-#include "SkResourceCache.h"
-#include "Test.h"
+#include "src/core/SkCachedData.h"
+#include "src/core/SkResourceCache.h"
+#include "src/core/SkYUVPlanesCache.h"
+#include "tests/Test.h"
enum LockedState {
kUnlocked,
diff --git a/tests/YUVTest.cpp b/tests/YUVTest.cpp
index faa9c28..644450d 100644
--- a/tests/YUVTest.cpp
+++ b/tests/YUVTest.cpp
@@ -5,13 +5,13 @@
* found in the LICENSE file.
*/
-#include "Resources.h"
-#include "SkAutoMalloc.h"
-#include "SkCodec.h"
-#include "SkStream.h"
-#include "SkTemplates.h"
-#include "SkYUVASizeInfo.h"
-#include "Test.h"
+#include "include/codec/SkCodec.h"
+#include "include/core/SkStream.h"
+#include "include/core/SkYUVASizeInfo.h"
+#include "include/private/SkTemplates.h"
+#include "src/core/SkAutoMalloc.h"
+#include "tests/Test.h"
+#include "tools/Resources.h"
static void codec_yuv(skiatest::Reporter* reporter,
const char path[],
diff --git a/tests/image-bitmap.cpp b/tests/image-bitmap.cpp
index 59ab3f7..38053e3 100644
--- a/tests/image-bitmap.cpp
+++ b/tests/image-bitmap.cpp
@@ -5,10 +5,10 @@
* found in the LICENSE file.
*/
-#include "Test.h"
+#include "tests/Test.h"
-#include "SkBitmap.h"
-#include "SkImage.h"
+#include "include/core/SkBitmap.h"
+#include "include/core/SkImage.h"
// https://bug.skia.org/5096
// Test that when we make an image from a subset of a bitmap, that it
diff --git a/tests/skbug5221.cpp b/tests/skbug5221.cpp
index f334dd9..df83f9c 100644
--- a/tests/skbug5221.cpp
+++ b/tests/skbug5221.cpp
@@ -5,11 +5,11 @@
* found in the LICENSE file.
*/
-#include "Test.h"
+#include "tests/Test.h"
-#include "SkCanvas.h"
-#include "SkFont.h"
-#include "SkSurface.h"
+#include "include/core/SkCanvas.h"
+#include "include/core/SkFont.h"
+#include "include/core/SkSurface.h"
// This passes by not crashing.
static void test(SkCanvas* canvas) {
diff --git a/tests/skbug6389.cpp b/tests/skbug6389.cpp
index d82a146..e9d8c73 100644
--- a/tests/skbug6389.cpp
+++ b/tests/skbug6389.cpp
@@ -5,12 +5,12 @@
* found in the LICENSE file.
*/
-#include "Resources.h"
-#include "SkCanvas.h"
-#include "SkImageSource.h"
-#include "SkMaskFilter.h"
-#include "SkSurface.h"
-#include "Test.h"
+#include "include/core/SkCanvas.h"
+#include "include/core/SkMaskFilter.h"
+#include "include/core/SkSurface.h"
+#include "include/effects/SkImageSource.h"
+#include "tests/Test.h"
+#include "tools/Resources.h"
DEF_TEST(skbug_6389, r) {
auto s = SkSurface::MakeRasterN32Premul(100, 100);
diff --git a/tests/skbug6653.cpp b/tests/skbug6653.cpp
index d775195..e8e29f9 100644
--- a/tests/skbug6653.cpp
+++ b/tests/skbug6653.cpp
@@ -5,14 +5,14 @@
* found in the LICENSE file.
*/
-#include "SkTypes.h"
+#include "include/core/SkTypes.h"
-#include "SkCanvas.h"
-#include "SkSurface.h"
+#include "include/core/SkCanvas.h"
+#include "include/core/SkSurface.h"
-#include "GrContext.h"
-#include "GrContextPriv.h"
-#include "Test.h"
+#include "include/gpu/GrContext.h"
+#include "src/gpu/GrContextPriv.h"
+#include "tests/Test.h"
static SkBitmap read_pixels(sk_sp<SkSurface> surface, SkColor initColor) {
SkBitmap bmp;
diff --git a/tests/skia_test.cpp b/tests/skia_test.cpp
index 776bd8e..b661763 100644
--- a/tests/skia_test.cpp
+++ b/tests/skia_test.cpp
@@ -6,21 +6,21 @@
*/
#include <atomic>
-#include "CommandLineFlags.h"
-#include "CrashHandler.h"
-#include "GrContext.h"
-#include "GrContextFactory.h"
-#include "OverwriteLine.h"
-#include "PathOpsDebug.h"
-#include "Resources.h"
-#include "SkGraphics.h"
-#include "SkOSFile.h"
-#include "SkPathOpsDebug.h"
-#include "SkTArray.h"
-#include "SkTaskGroup.h"
-#include "SkTemplates.h"
-#include "SkTime.h"
-#include "Test.h"
+#include "include/core/SkGraphics.h"
+#include "include/core/SkTime.h"
+#include "include/gpu/GrContext.h"
+#include "include/private/SkTArray.h"
+#include "include/private/SkTemplates.h"
+#include "src/core/SkOSFile.h"
+#include "src/core/SkTaskGroup.h"
+#include "src/pathops/SkPathOpsDebug.h"
+#include "tests/PathOpsDebug.h"
+#include "tests/Test.h"
+#include "tools/CrashHandler.h"
+#include "tools/OverwriteLine.h"
+#include "tools/Resources.h"
+#include "tools/flags/CommandLineFlags.h"
+#include "tools/gpu/GrContextFactory.h"
using namespace skiatest;
using namespace sk_gpu_test;