IWYU: 'core' target, files starting A-C.
TBR=reed@google.com
Verbal lgtm, does not change API.
Committed: https://skia.googlesource.com/skia/+/7403d87db8e43d4c2b5b25ac22a0ebc22bd09d69
Review URL: https://codereview.chromium.org/1265033002
diff --git a/gm/aarectmodes.cpp b/gm/aarectmodes.cpp
index 7cf5a83..e0df7d8 100644
--- a/gm/aarectmodes.cpp
+++ b/gm/aarectmodes.cpp
@@ -8,6 +8,7 @@
#include "gm.h"
#include "SkCanvas.h"
#include "SkColorPriv.h"
+#include "SkPath.h"
#include "SkShader.h"
static void test4(SkCanvas* canvas) {
diff --git a/gm/aaxfermodes.cpp b/gm/aaxfermodes.cpp
index 8e66b43..d33423a 100644
--- a/gm/aaxfermodes.cpp
+++ b/gm/aaxfermodes.cpp
@@ -7,6 +7,7 @@
*/
#include "gm.h"
#include "SkArithmeticMode.h"
+#include "SkPath.h"
#include "SkShader.h"
#include "SkXfermode.h"
diff --git a/gm/beziers.cpp b/gm/beziers.cpp
index 3dd8fa7..68960ed 100755
--- a/gm/beziers.cpp
+++ b/gm/beziers.cpp
@@ -6,6 +6,7 @@
*/
#include "gm.h"
+#include "SkPath.h"
#include "SkRandom.h"
#define W 400
diff --git a/gm/bigblurs.cpp b/gm/bigblurs.cpp
index a92c7fe..5500005 100644
--- a/gm/bigblurs.cpp
+++ b/gm/bigblurs.cpp
@@ -1,4 +1,3 @@
-
/*
* Copyright 2013 Google Inc.
*
@@ -9,6 +8,7 @@
#include "gm.h"
#include "SkBlurMask.h"
#include "SkBlurMaskFilter.h"
+#include "SkPath.h"
namespace skiagm {
diff --git a/gm/bigmatrix.cpp b/gm/bigmatrix.cpp
index abe0f4e..c7c3b0d 100644
--- a/gm/bigmatrix.cpp
+++ b/gm/bigmatrix.cpp
@@ -1,13 +1,14 @@
-
/*
* Copyright 2012 Google Inc.
*
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
+
#include "gm.h"
#include "SkColorPriv.h"
+#include "SkPath.h"
#include "SkShader.h"
namespace skiagm {
diff --git a/gm/bitmaprecttest.cpp b/gm/bitmaprecttest.cpp
index 6f2ccf2..630c90c 100644
--- a/gm/bitmaprecttest.cpp
+++ b/gm/bitmaprecttest.cpp
@@ -7,6 +7,7 @@
#include "gm.h"
#include "SkCanvas.h"
+#include "SkPath.h"
static void make_bm(SkBitmap* bm) {
bm->allocN32Pixels(60, 60);
diff --git a/gm/blurs.cpp b/gm/blurs.cpp
index b1af685..8f95f00 100644
--- a/gm/blurs.cpp
+++ b/gm/blurs.cpp
@@ -8,6 +8,7 @@
#include "gm.h"
#include "SkBlurMask.h"
#include "SkBlurMaskFilter.h"
+#include "SkPath.h"
class BlursGM : public skiagm::GM {
public:
diff --git a/gm/complexclip2.cpp b/gm/complexclip2.cpp
index 9357884..4314619 100644
--- a/gm/complexclip2.cpp
+++ b/gm/complexclip2.cpp
@@ -10,6 +10,8 @@
#include "SkCanvas.h"
#include "SkPath.h"
#include "SkRandom.h"
+#include "SkRect.h"
+#include "SkRRect.h"
namespace skiagm {
diff --git a/gm/concavepaths.cpp b/gm/concavepaths.cpp
index 46b2ef4..37635f8 100644
--- a/gm/concavepaths.cpp
+++ b/gm/concavepaths.cpp
@@ -7,6 +7,7 @@
#include "gm.h"
#include "SkCanvas.h"
+#include "SkPath.h"
#define WIDTH 400
#define HEIGHT 600
diff --git a/gm/conicpaths.cpp b/gm/conicpaths.cpp
index 717dd8e..2bdd1f8 100644
--- a/gm/conicpaths.cpp
+++ b/gm/conicpaths.cpp
@@ -7,6 +7,7 @@
#include "gm.h"
#include "SkCanvas.h"
+#include "SkPath.h"
#include "SkTArray.h"
class ConicPathsGM : public skiagm::GM {
diff --git a/gm/convexpaths.cpp b/gm/convexpaths.cpp
index 889d65b..4180884 100644
--- a/gm/convexpaths.cpp
+++ b/gm/convexpaths.cpp
@@ -6,6 +6,7 @@
* found in the LICENSE file.
*/
#include "gm.h"
+#include "SkPath.h"
#include "SkRandom.h"
#include "SkTArray.h"
diff --git a/gm/convexpolyclip.cpp b/gm/convexpolyclip.cpp
index 0478b51..2ed17f2 100644
--- a/gm/convexpolyclip.cpp
+++ b/gm/convexpolyclip.cpp
@@ -10,6 +10,7 @@
#include "SkBitmap.h"
#include "SkGradientShader.h"
+#include "SkPath.h"
#include "SkTLList.h"
static SkBitmap make_bmp(int w, int h) {
diff --git a/gm/cubicpaths.cpp b/gm/cubicpaths.cpp
index b3fca5a..74fbe8d 100644
--- a/gm/cubicpaths.cpp
+++ b/gm/cubicpaths.cpp
@@ -4,9 +4,11 @@
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
+
#include "gm.h"
#include "SkCanvas.h"
#include "SkPaint.h"
+#include "SkPath.h"
#include "SkRandom.h"
// skbug.com/1316 shows that this cubic, when slightly clipped, creates big
diff --git a/gm/degeneratesegments.cpp b/gm/degeneratesegments.cpp
index df111ac..d516490 100644
--- a/gm/degeneratesegments.cpp
+++ b/gm/degeneratesegments.cpp
@@ -7,6 +7,7 @@
#include "gm.h"
#include "SkCanvas.h"
#include "SkPaint.h"
+#include "SkPath.h"
#include "SkRandom.h"
namespace skiagm {
diff --git a/gm/drawable.cpp b/gm/drawable.cpp
index 3847ba5..c7bc761 100644
--- a/gm/drawable.cpp
+++ b/gm/drawable.cpp
@@ -8,6 +8,7 @@
#include "gm.h"
#include "SkCanvas.h"
#include "SkDrawable.h"
+#include "SkPath.h"
struct MyDrawable : public SkDrawable {
SkRect onGetBounds() override { return SkRect::MakeWH(50, 100); }
diff --git a/gm/dstreadshuffle.cpp b/gm/dstreadshuffle.cpp
index 8cdccbc..8ff40a8 100644
--- a/gm/dstreadshuffle.cpp
+++ b/gm/dstreadshuffle.cpp
@@ -7,6 +7,7 @@
*/
#include "gm.h"
#include "SkBitmap.h"
+#include "SkPath.h"
#include "SkRandom.h"
#include "SkShader.h"
#include "SkXfermode.h"
diff --git a/gm/emptypath.cpp b/gm/emptypath.cpp
index ec60bfc..36edf4e 100644
--- a/gm/emptypath.cpp
+++ b/gm/emptypath.cpp
@@ -8,6 +8,7 @@
#include "gm.h"
#include "SkCanvas.h"
#include "SkPaint.h"
+#include "SkPath.h"
#include "SkRandom.h"
namespace skiagm {
diff --git a/gm/filltypes.cpp b/gm/filltypes.cpp
index f01f9bd..b470c05 100644
--- a/gm/filltypes.cpp
+++ b/gm/filltypes.cpp
@@ -1,11 +1,12 @@
-
/*
* Copyright 2011 Google Inc.
*
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
+
#include "gm.h"
+#include "SkPath.h"
namespace skiagm {
diff --git a/gm/filltypespersp.cpp b/gm/filltypespersp.cpp
index 92fce3a..cc09b95 100644
--- a/gm/filltypespersp.cpp
+++ b/gm/filltypespersp.cpp
@@ -1,12 +1,13 @@
-
/*
* Copyright 2011 Google Inc.
*
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
+
#include "gm.h"
#include "SkGradientShader.h"
+#include "SkPath.h"
namespace skiagm {
diff --git a/gm/getpostextpath.cpp b/gm/getpostextpath.cpp
index 2286602..faace24 100644
--- a/gm/getpostextpath.cpp
+++ b/gm/getpostextpath.cpp
@@ -8,6 +8,7 @@
#include "gm.h"
#include "SkCanvas.h"
#include "SkPaint.h"
+#include "SkPath.h"
#include "SkRandom.h"
#include "SkTemplates.h"
diff --git a/gm/hairlines.cpp b/gm/hairlines.cpp
index 6056415..9d7e366 100644
--- a/gm/hairlines.cpp
+++ b/gm/hairlines.cpp
@@ -7,6 +7,7 @@
#include "gm.h"
#include "SkCanvas.h"
+#include "SkPath.h"
#include "SkTArray.h"
namespace skiagm {
diff --git a/gm/hittestpath.cpp b/gm/hittestpath.cpp
index f415ba3..b5f01cd 100644
--- a/gm/hittestpath.cpp
+++ b/gm/hittestpath.cpp
@@ -8,6 +8,7 @@
#include "gm.h"
#include "SkCanvas.h"
#include "SkCullPoints.h"
+#include "SkPath.h"
#include "SkRandom.h"
static void test_hittest(SkCanvas* canvas, const SkPath& path) {
diff --git a/gm/linepaths.cpp b/gm/linepaths.cpp
index e8a4b0b..0c99fa7 100644
--- a/gm/linepaths.cpp
+++ b/gm/linepaths.cpp
@@ -4,8 +4,10 @@
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
+
#include "gm.h"
#include "SkCanvas.h"
+#include "SkPath.h"
#include "SkPaint.h"
#include "SkRandom.h"
diff --git a/gm/nested.cpp b/gm/nested.cpp
index 9040ba6..d3b75b3 100644
--- a/gm/nested.cpp
+++ b/gm/nested.cpp
@@ -6,6 +6,7 @@
*/
#include "gm.h"
+#include "SkPath.h"
#include "SkRandom.h"
#include "SkRRect.h"
diff --git a/gm/pathfill.cpp b/gm/pathfill.cpp
index 1260654..a2b1ee0 100644
--- a/gm/pathfill.cpp
+++ b/gm/pathfill.cpp
@@ -1,11 +1,12 @@
-
/*
* Copyright 2011 Google Inc.
*
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
+
#include "gm.h"
+#include "SkPath.h"
typedef SkScalar (*MakePathProc)(SkPath*);
diff --git a/gm/pathinterior.cpp b/gm/pathinterior.cpp
index 88efb3a..f1cbfc4 100644
--- a/gm/pathinterior.cpp
+++ b/gm/pathinterior.cpp
@@ -6,11 +6,12 @@
*/
#include "gm.h"
+#include "SkBlurMaskFilter.h"
#include "SkCanvas.h"
#include "SkGraphics.h"
-#include "SkRandom.h"
#include "SkLayerDrawLooper.h"
-#include "SkBlurMaskFilter.h"
+#include "SkPath.h"
+#include "SkRandom.h"
static SkRect inset(const SkRect& r) {
SkRect rect = r;
diff --git a/gm/plus.cpp b/gm/plus.cpp
index ba2a1a0..6a5af61 100644
--- a/gm/plus.cpp
+++ b/gm/plus.cpp
@@ -6,6 +6,7 @@
*/
#include "gm.h"
+#include "SkPath.h"
DEF_SIMPLE_GM(PlusMergesAA, canvas, 256, 256) {
SkPaint p;
diff --git a/gm/poly2poly.cpp b/gm/poly2poly.cpp
index c1d9b7e..ea77033 100644
--- a/gm/poly2poly.cpp
+++ b/gm/poly2poly.cpp
@@ -7,6 +7,7 @@
#include "gm.h"
#include "Resources.h"
+#include "SkPath.h"
#include "SkTypeface.h"
class SkJSCanvas {
diff --git a/gm/quadpaths.cpp b/gm/quadpaths.cpp
index 2fab37b..359f62d 100644
--- a/gm/quadpaths.cpp
+++ b/gm/quadpaths.cpp
@@ -4,9 +4,11 @@
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
+
#include "gm.h"
#include "SkCanvas.h"
#include "SkPaint.h"
+#include "SkPath.h"
#include "SkRandom.h"
namespace skiagm {
diff --git a/gm/samplerstress.cpp b/gm/samplerstress.cpp
index 7f85e17..eff6281 100644
--- a/gm/samplerstress.cpp
+++ b/gm/samplerstress.cpp
@@ -6,9 +6,10 @@
*/
#include "gm.h"
-#include "SkCanvas.h"
-#include "SkShader.h"
#include "SkBlurMaskFilter.h"
+#include "SkCanvas.h"
+#include "SkPath.h"
+#include "SkShader.h"
namespace skiagm {
diff --git a/gm/shadertext.cpp b/gm/shadertext.cpp
index 2bb4e96..fd74e7c 100644
--- a/gm/shadertext.cpp
+++ b/gm/shadertext.cpp
@@ -8,6 +8,7 @@
#include "gm.h"
#include "SkCanvas.h"
#include "SkGradientShader.h"
+#include "SkPath.h"
namespace skiagm {
diff --git a/gm/shadertext2.cpp b/gm/shadertext2.cpp
index 4d697d9..f4af684 100644
--- a/gm/shadertext2.cpp
+++ b/gm/shadertext2.cpp
@@ -7,6 +7,7 @@
#include "gm.h"
#include "SkCanvas.h"
#include "SkGradientShader.h"
+#include "SkPath.h"
namespace skiagm {
diff --git a/gm/shadows.cpp b/gm/shadows.cpp
index 729104c..82b5fd9 100644
--- a/gm/shadows.cpp
+++ b/gm/shadows.cpp
@@ -1,13 +1,14 @@
-
/*
* Copyright 2011 Google Inc.
*
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
+
#include "gm.h"
-#include "SkBlurMask.h"
#include "SkBlurDrawLooper.h"
+#include "SkBlurMask.h"
+#include "SkPath.h"
namespace skiagm {
diff --git a/gm/simpleaaclip.cpp b/gm/simpleaaclip.cpp
index 8054a53..372cb1b 100644
--- a/gm/simpleaaclip.cpp
+++ b/gm/simpleaaclip.cpp
@@ -5,10 +5,10 @@
* found in the LICENSE file.
*/
-
#include "gm.h"
-#include "SkCanvas.h"
#include "SkAAClip.h"
+#include "SkCanvas.h"
+#include "SkPath.h"
namespace skiagm {
diff --git a/gm/skbug1719.cpp b/gm/skbug1719.cpp
index 6652629..0a75d35 100644
--- a/gm/skbug1719.cpp
+++ b/gm/skbug1719.cpp
@@ -6,8 +6,9 @@
*/
#include "gm.h"
-#include "SkColorFilter.h"
#include "SkBlurMaskFilter.h"
+#include "SkColorFilter.h"
+#include "SkPath.h"
namespace skiagm {
diff --git a/gm/smallarc.cpp b/gm/smallarc.cpp
index 76611b7..2109b90 100755
--- a/gm/smallarc.cpp
+++ b/gm/smallarc.cpp
@@ -6,6 +6,7 @@
*/
#include "gm.h"
+#include "SkPath.h"
namespace skiagm {
diff --git a/gm/srcmode.cpp b/gm/srcmode.cpp
index ec2673f..7a7e89e 100644
--- a/gm/srcmode.cpp
+++ b/gm/srcmode.cpp
@@ -8,6 +8,7 @@
#include "gm.h"
#include "SkCanvas.h"
#include "SkGradientShader.h"
+#include "SkPath.h"
#include "SkSurface.h"
#if SK_SUPPORT_GPU
diff --git a/gm/stlouisarch.cpp b/gm/stlouisarch.cpp
index 176fb4b..7b31e54 100644
--- a/gm/stlouisarch.cpp
+++ b/gm/stlouisarch.cpp
@@ -7,6 +7,7 @@
#include "gm.h"
#include "SkCanvas.h"
+#include "SkPath.h"
#include "SkTArray.h"
namespace skiagm {
diff --git a/gm/strokes.cpp b/gm/strokes.cpp
index 77638e4..7382390 100644
--- a/gm/strokes.cpp
+++ b/gm/strokes.cpp
@@ -1,4 +1,3 @@
-
/*
* Copyright 2011 Google Inc.
*
@@ -6,9 +5,8 @@
* found in the LICENSE file.
*/
-
-
#include "gm.h"
+#include "SkPath.h"
#include "SkRandom.h"
#define W 400