diff options
| author |  Mike Klein <mtklein@chromium.org> | 2017-03-22 13:47:51 -0400 |
|---|---|---|
| committer | Mike Klein <mtklein@chromium.org> | 2017-03-22 18:11:49 +0000 |
| commit | 33d2055e594177b27360f84e0631b26d74a55a9b (patch) | |
| tree | bfa9cca0636a6022134fa48af12360c752123afd /gm | |
| parent | 4ef01482025e2e629e35458aa214436d3b4138e8 (diff) | |
GM: some header cleanup
gm.h includes sk_tool_utils.h but does not use it.
The bulk of this CL makes each gm that uses sk_tool_utils include it.
sk_tool_utils.h also provided SkRandom and SkTDArray,
so a couple GMs add those headers too.
Change-Id: Ieb2a7c542f0ca89c3223f744fc11b0ff37af36c1
Reviewed-on: https://skia-review.googlesource.com/10014
Commit-Queue: Mike Klein <mtklein@chromium.org>
Reviewed-by: Herb Derby <herb@google.com>
Diffstat (limited to 'gm')
169 files changed, 167 insertions, 12 deletions
diff --git a/gm/aaclip.cpp b/gm/aaclip.cpp index d2c5ff54c6..1431eb6a7c 100644 --- a/gm/aaclip.cpp +++ b/gm/aaclip.cpp @@ -6,6 +6,7 @@ */ #include "gm.h" +#include "sk_tool_utils.h" #include "SkCanvas.h" #include "SkPath.h" #include "SkMakeUnique.h" diff --git a/gm/aaxfermodes.cpp b/gm/aaxfermodes.cpp index 81927c55c1..96b9b4880b 100644 --- a/gm/aaxfermodes.cpp +++ b/gm/aaxfermodes.cpp @@ -6,6 +6,7 @@ */ #include "gm.h" +#include "sk_tool_utils.h" #include "SkBlendModePriv.h" #include "SkPath.h" #include "SkShader.h" diff --git a/gm/addarc.cpp b/gm/addarc.cpp index 9aba9c6530..96ac666d28 100644 --- a/gm/addarc.cpp +++ b/gm/addarc.cpp @@ -6,6 +6,7 @@ */ #include "gm.h" +#include "sk_tool_utils.h" #include "SkAnimTimer.h" #include "SkCanvas.h" #include "SkPathMeasure.h" diff --git a/gm/all_bitmap_configs.cpp b/gm/all_bitmap_configs.cpp index 227c387f52..ea7b73483b 100644 --- a/gm/all_bitmap_configs.cpp +++ b/gm/all_bitmap_configs.cpp @@ -5,10 +5,10 @@ * found in the LICENSE file. */ -#include "sk_tool_utils.h" #include "SkSurface.h" #include "Resources.h" #include "gm.h" +#include "sk_tool_utils.h" #include "SkMath.h" #include "SkColorPriv.h" diff --git a/gm/animatedimageblurs.cpp b/gm/animatedimageblurs.cpp index db8f55b544..02c2bc48cb 100644 --- a/gm/animatedimageblurs.cpp +++ b/gm/animatedimageblurs.cpp @@ -6,6 +6,7 @@ */ #include "gm.h" +#include "sk_tool_utils.h" #include "SkAnimTimer.h" #include "SkBlurImageFilter.h" #include "SkRandom.h" diff --git a/gm/anisotropic.cpp b/gm/anisotropic.cpp index d8f9181286..b2916bf2c4 100644 --- a/gm/anisotropic.cpp +++ b/gm/anisotropic.cpp @@ -6,6 +6,7 @@ */ #include "gm.h" +#include "sk_tool_utils.h" namespace skiagm { diff --git a/gm/arcofzorro.cpp b/gm/arcofzorro.cpp index 792f7da4c0..4c9b53f702 100644 --- a/gm/arcofzorro.cpp +++ b/gm/arcofzorro.cpp @@ -6,6 +6,7 @@ */ #include "gm.h" +#include "sk_tool_utils.h" #include "SkRandom.h" namespace skiagm { diff --git a/gm/arithmode.cpp b/gm/arithmode.cpp index aec079cfe2..c01ece7990 100644 --- a/gm/arithmode.cpp +++ b/gm/arithmode.cpp @@ -6,6 +6,7 @@ */ #include "gm.h" +#include "sk_tool_utils.h" #include "SkArithmeticImageFilter.h" #include "SkCanvas.h" #include "SkColorPriv.h" diff --git a/gm/bigblurs.cpp b/gm/bigblurs.cpp index 0acd190972..be5a6b8f9f 100644 --- a/gm/bigblurs.cpp +++ b/gm/bigblurs.cpp @@ -6,6 +6,7 @@ */ #include "gm.h" +#include "sk_tool_utils.h" #include "SkBlurMask.h" #include "SkBlurMaskFilter.h" #include "SkPath.h" diff --git a/gm/bigmatrix.cpp b/gm/bigmatrix.cpp index b39f2eab73..273b049a3d 100644 --- a/gm/bigmatrix.cpp +++ b/gm/bigmatrix.cpp @@ -6,6 +6,7 @@ */ #include "gm.h" +#include "sk_tool_utils.h" #include "SkColorPriv.h" #include "SkPath.h" diff --git a/gm/bigrrectaaeffect.cpp b/gm/bigrrectaaeffect.cpp index 94e7339dcc..0520776474 100644 --- a/gm/bigrrectaaeffect.cpp +++ b/gm/bigrrectaaeffect.cpp @@ -6,6 +6,7 @@ */ #include "gm.h" +#include "sk_tool_utils.h" #if SK_SUPPORT_GPU #include "GrContext.h" #include "GrRenderTargetContextPriv.h" diff --git a/gm/bigtext.cpp b/gm/bigtext.cpp index 17f69c5745..4d5005e2da 100644 --- a/gm/bigtext.cpp +++ b/gm/bigtext.cpp @@ -6,6 +6,7 @@ */ #include "gm.h" +#include "sk_tool_utils.h" #include "SkCanvas.h" #include "SkPath.h" diff --git a/gm/bitmapcopy.cpp b/gm/bitmapcopy.cpp index edd706d45f..60eecf2ecd 100644 --- a/gm/bitmapcopy.cpp +++ b/gm/bitmapcopy.cpp @@ -5,6 +5,7 @@ * found in the LICENSE file. */ #include "gm.h" +#include "sk_tool_utils.h" namespace skiagm { diff --git a/gm/bitmaprect.cpp b/gm/bitmaprect.cpp index 06bf36a91d..ef324125c7 100644 --- a/gm/bitmaprect.cpp +++ b/gm/bitmaprect.cpp @@ -6,6 +6,7 @@ */ #include "gm.h" +#include "sk_tool_utils.h" #include "SkCanvas.h" #include "SkGradientShader.h" #include "SkGraphics.h" diff --git a/gm/bitmapshader.cpp b/gm/bitmapshader.cpp index 84d0b55445..5ee7fca694 100644 --- a/gm/bitmapshader.cpp +++ b/gm/bitmapshader.cpp @@ -5,6 +5,7 @@ * found in the LICENSE file. */ #include "gm.h" +#include "sk_tool_utils.h" #include "SkBitmap.h" #include "SkPaint.h" diff --git a/gm/bleed.cpp b/gm/bleed.cpp index 8ffefc9788..1bb8b2b029 100644 --- a/gm/bleed.cpp +++ b/gm/bleed.cpp @@ -11,6 +11,7 @@ #include "SkCanvas.h" #include "SkGradientShader.h" #include "SkImage.h" +#include "SkTDArray.h" #include "SkUtils.h" #if SK_SUPPORT_GPU diff --git a/gm/blend.cpp b/gm/blend.cpp index 8aed292f92..28ec6ffbd7 100644 --- a/gm/blend.cpp +++ b/gm/blend.cpp @@ -6,6 +6,7 @@ */ #include "gm.h" +#include "sk_tool_utils.h" DEF_SIMPLE_GM(blend, canvas, 300, 100) { SkPaint p; diff --git a/gm/blurcircles2.cpp b/gm/blurcircles2.cpp index 93fcddb0f5..a65763e540 100644 --- a/gm/blurcircles2.cpp +++ b/gm/blurcircles2.cpp @@ -13,6 +13,7 @@ #include "SkPaint.h" #include "SkPath.h" #include "SkString.h" +#include "SkRandom.h" /** * In GM mode this draws an array of circles with different radii and different blur radii. Below diff --git a/gm/blurredclippedcircle.cpp b/gm/blurredclippedcircle.cpp index 9bc0acee4c..f62cb1270e 100644 --- a/gm/blurredclippedcircle.cpp +++ b/gm/blurredclippedcircle.cpp @@ -6,6 +6,7 @@ */ #include "gm.h" +#include "sk_tool_utils.h" #include "SkBlurMaskFilter.h" #include "SkClipOpPriv.h" #include "SkColorFilter.h" diff --git a/gm/blurroundrect.cpp b/gm/blurroundrect.cpp index 608649ecfc..32a5bc4e49 100644 --- a/gm/blurroundrect.cpp +++ b/gm/blurroundrect.cpp @@ -6,6 +6,7 @@ */ #include "gm.h" +#include "sk_tool_utils.h" #include "SkBlurMask.h" #include "SkBlurMaskFilter.h" #include "SkCanvas.h" diff --git a/gm/blurs.cpp b/gm/blurs.cpp index 16e6249d34..f1f44e7232 100644 --- a/gm/blurs.cpp +++ b/gm/blurs.cpp @@ -6,6 +6,7 @@ */ #include "gm.h" +#include "sk_tool_utils.h" #include "SkBlurMask.h" #include "SkBlurMaskFilter.h" #include "SkPath.h" diff --git a/gm/bmpfilterqualityrepeat.cpp b/gm/bmpfilterqualityrepeat.cpp index 1ddc72635c..e7ea97db96 100644 --- a/gm/bmpfilterqualityrepeat.cpp +++ b/gm/bmpfilterqualityrepeat.cpp @@ -6,6 +6,7 @@ */ #include "gm.h" +#include "sk_tool_utils.h" #include "SkShader.h" diff --git a/gm/clip_error.cpp b/gm/clip_error.cpp index 28f7432b89..0a3eceb66a 100644 --- a/gm/clip_error.cpp +++ b/gm/clip_error.cpp @@ -6,6 +6,7 @@ */ #include "gm.h" +#include "sk_tool_utils.h" #include "SkBlurMask.h" #include "SkBlurMaskFilter.h" #include "SkCanvas.h" diff --git a/gm/clipdrawdraw.cpp b/gm/clipdrawdraw.cpp index 59cf9daf38..ed795d2fbf 100644 --- a/gm/clipdrawdraw.cpp +++ b/gm/clipdrawdraw.cpp @@ -6,6 +6,7 @@ */ #include "gm.h" +#include "sk_tool_utils.h" #include "SkRegion.h" // This GM exercises the use case found in crbug.com/423834. diff --git a/gm/coloremoji.cpp b/gm/coloremoji.cpp index c139bc9f6e..f871e53d55 100644 --- a/gm/coloremoji.cpp +++ b/gm/coloremoji.cpp @@ -6,6 +6,7 @@ */ #include "gm.h" +#include "sk_tool_utils.h" #include "Resources.h" #include "SkBlurImageFilter.h" diff --git a/gm/colorfilterimagefilter.cpp b/gm/colorfilterimagefilter.cpp index 912eda12c4..a2e20d3393 100644 --- a/gm/colorfilterimagefilter.cpp +++ b/gm/colorfilterimagefilter.cpp @@ -13,6 +13,7 @@ #include "SkBlurImageFilter.h" #include "SkColorFilterImageFilter.h" +#include "SkTDArray.h" #define FILTER_WIDTH SkIntToScalar(30) #define FILTER_HEIGHT SkIntToScalar(30) diff --git a/gm/colormatrix.cpp b/gm/colormatrix.cpp index f6d51fcbb5..8f256bf250 100644 --- a/gm/colormatrix.cpp +++ b/gm/colormatrix.cpp @@ -6,6 +6,7 @@ */ #include "gm.h" +#include "sk_tool_utils.h" #include "SkColorMatrixFilter.h" #include "SkGradientShader.h" #include "SkImage.h" diff --git a/gm/colortype.cpp b/gm/colortype.cpp index 516bb75b4a..aa8aca7d4e 100644 --- a/gm/colortype.cpp +++ b/gm/colortype.cpp @@ -6,6 +6,7 @@ */ #include "gm.h" +#include "sk_tool_utils.h" #include "SkCanvas.h" #include "SkGradientShader.h" #include "../src/fonts/SkGScalerContext.h" diff --git a/gm/colortypexfermode.cpp b/gm/colortypexfermode.cpp index 78a951df77..9a22c8d6eb 100644 --- a/gm/colortypexfermode.cpp +++ b/gm/colortypexfermode.cpp @@ -5,6 +5,7 @@ * found in the LICENSE file. */ #include "gm.h" +#include "sk_tool_utils.h" #include "SkBitmap.h" #include "SkGradientShader.h" #include "SkShader.h" diff --git a/gm/complexclip.cpp b/gm/complexclip.cpp index 1fecd9487a..296871581d 100644 --- a/gm/complexclip.cpp +++ b/gm/complexclip.cpp @@ -6,6 +6,7 @@ */ #include "gm.h" +#include "sk_tool_utils.h" #include "SkCanvas.h" #include "SkPath.h" diff --git a/gm/complexclip3.cpp b/gm/complexclip3.cpp index c174d9d5a8..47b80ab7ad 100644 --- a/gm/complexclip3.cpp +++ b/gm/complexclip3.cpp @@ -5,6 +5,7 @@ * found in the LICENSE file. */ #include "gm.h" +#include "sk_tool_utils.h" #include "SkCanvas.h" #include "SkPath.h" diff --git a/gm/composeshader.cpp b/gm/composeshader.cpp index 8bc9f2cbe7..ff525f4777 100644 --- a/gm/composeshader.cpp +++ b/gm/composeshader.cpp @@ -12,6 +12,7 @@ #include "SkGraphics.h" #include "SkShader.h" #include "SkString.h" +#include "SkTDArray.h" static sk_sp<SkShader> make_shader(SkBlendMode mode) { SkPoint pts[2]; diff --git a/gm/constcolorprocessor.cpp b/gm/constcolorprocessor.cpp index cf20879caa..9f30bed4eb 100644 --- a/gm/constcolorprocessor.cpp +++ b/gm/constcolorprocessor.cpp @@ -8,6 +8,7 @@ // This test only works with the GPU backend. #include "gm.h" +#include "sk_tool_utils.h" #if SK_SUPPORT_GPU diff --git a/gm/convexpolyclip.cpp b/gm/convexpolyclip.cpp index bd945dd3de..fb7c9d4fab 100644 --- a/gm/convexpolyclip.cpp +++ b/gm/convexpolyclip.cpp @@ -6,6 +6,7 @@ */ #include "gm.h" +#include "sk_tool_utils.h" #include "SkBitmap.h" #include "SkGradientShader.h" diff --git a/gm/cubicpaths.cpp b/gm/cubicpaths.cpp index 023316b658..fd2156c1d7 100644 --- a/gm/cubicpaths.cpp +++ b/gm/cubicpaths.cpp @@ -6,6 +6,7 @@ */ #include "gm.h" +#include "sk_tool_utils.h" #include "SkCanvas.h" #include "SkPaint.h" #include "SkPath.h" diff --git a/gm/dashing.cpp b/gm/dashing.cpp index e23c24ed3b..13d45cb913 100644 --- a/gm/dashing.cpp +++ b/gm/dashing.cpp @@ -6,6 +6,7 @@ */ #include "gm.h" +#include "sk_tool_utils.h" #include "SkCanvas.h" #include "SkPaint.h" #include "SkDashPathEffect.h" diff --git a/gm/degeneratesegments.cpp b/gm/degeneratesegments.cpp index c7254f2e93..25da045bc4 100644 --- a/gm/degeneratesegments.cpp +++ b/gm/degeneratesegments.cpp @@ -5,6 +5,7 @@ * found in the LICENSE file. */ #include "gm.h" +#include "sk_tool_utils.h" #include "SkCanvas.h" #include "SkPaint.h" #include "SkPath.h" diff --git a/gm/dftext.cpp b/gm/dftext.cpp index 6f3be21c92..fb69f9b4e1 100644 --- a/gm/dftext.cpp +++ b/gm/dftext.cpp @@ -5,6 +5,7 @@ * found in the LICENSE file. */ #include "gm.h" +#include "sk_tool_utils.h" #include "Resources.h" #include "SkCanvas.h" #include "SkStream.h" diff --git a/gm/discard.cpp b/gm/discard.cpp index 136458170e..8db3a68ab0 100644 --- a/gm/discard.cpp +++ b/gm/discard.cpp @@ -6,6 +6,7 @@ */ #include "gm.h" +#include "sk_tool_utils.h" #include "SkCanvas.h" #include "SkPaint.h" #include "SkRandom.h" diff --git a/gm/downsamplebitmap.cpp b/gm/downsamplebitmap.cpp index ce3eb69654..ba1edc9835 100644 --- a/gm/downsamplebitmap.cpp +++ b/gm/downsamplebitmap.cpp @@ -6,6 +6,7 @@ */ #include "gm.h" +#include "sk_tool_utils.h" #include "Resources.h" #include "SkGradientShader.h" diff --git a/gm/drawatlascolor.cpp b/gm/drawatlascolor.cpp index e67ffc3031..de64caba80 100644 --- a/gm/drawatlascolor.cpp +++ b/gm/drawatlascolor.cpp @@ -6,6 +6,7 @@ */ #include "gm.h" +#include "sk_tool_utils.h" #include "SkCanvas.h" #include "SkRSXform.h" #include "SkSurface.h" diff --git a/gm/drawbitmaprect.cpp b/gm/drawbitmaprect.cpp index 3c873e290d..bad5e2a143 100644 --- a/gm/drawbitmaprect.cpp +++ b/gm/drawbitmaprect.cpp @@ -6,6 +6,7 @@ */ #include "gm.h" +#include "sk_tool_utils.h" #include "SkBlurMask.h" #include "SkBlurMaskFilter.h" #include "SkColorPriv.h" diff --git a/gm/drawlooper.cpp b/gm/drawlooper.cpp index 210da52f3a..c4052e3815 100644 --- a/gm/drawlooper.cpp +++ b/gm/drawlooper.cpp @@ -6,6 +6,7 @@ */ #include "gm.h" +#include "sk_tool_utils.h" #include "SkBlurMask.h" #include "SkBlurMaskFilter.h" #include "SkCanvas.h" diff --git a/gm/dropshadowimagefilter.cpp b/gm/dropshadowimagefilter.cpp index d32f0480e0..87cd798483 100644 --- a/gm/dropshadowimagefilter.cpp +++ b/gm/dropshadowimagefilter.cpp @@ -6,6 +6,7 @@ */ #include "gm.h" +#include "sk_tool_utils.h" #include "SkColorFilter.h" #include "SkColorFilterImageFilter.h" diff --git a/gm/dstreadshuffle.cpp b/gm/dstreadshuffle.cpp index 371515334c..f6086b195a 100644 --- a/gm/dstreadshuffle.cpp +++ b/gm/dstreadshuffle.cpp @@ -5,6 +5,7 @@ * found in the LICENSE file. */ #include "gm.h" +#include "sk_tool_utils.h" #include "SkBitmap.h" #include "SkPath.h" #include "SkRandom.h" diff --git a/gm/emptypath.cpp b/gm/emptypath.cpp index 260f0a01ac..56377e7338 100644 --- a/gm/emptypath.cpp +++ b/gm/emptypath.cpp @@ -5,6 +5,7 @@ * found in the LICENSE file. */ #include "gm.h" +#include "sk_tool_utils.h" #include "SkCanvas.h" #include "SkPaint.h" #include "SkPath.h" diff --git a/gm/encode.cpp b/gm/encode.cpp index d4598d0134..1dae1bf042 100644 --- a/gm/encode.cpp +++ b/gm/encode.cpp @@ -5,6 +5,7 @@ * found in the LICENSE file. */ #include "gm.h" +#include "sk_tool_utils.h" #include "SkCanvas.h" #include "SkData.h" #include "SkImageEncoder.h" diff --git a/gm/etc1.cpp b/gm/etc1.cpp index 2bb93d0aa4..26e6051852 100644 --- a/gm/etc1.cpp +++ b/gm/etc1.cpp @@ -6,6 +6,7 @@ */ #include "gm.h" +#include "sk_tool_utils.h" #include "SkRandom.h" #if SK_SUPPORT_GPU diff --git a/gm/fatpathfill.cpp b/gm/fatpathfill.cpp index 46e810eeb0..21d9085fd0 100644 --- a/gm/fatpathfill.cpp +++ b/gm/fatpathfill.cpp @@ -6,6 +6,7 @@ */ #include "gm.h" +#include "sk_tool_utils.h" #include "SkCanvas.h" #include "SkPath.h" #include "SkSurface.h" diff --git a/gm/filltypes.cpp b/gm/filltypes.cpp index b470c05609..30dcd27dd3 100644 --- a/gm/filltypes.cpp +++ b/gm/filltypes.cpp @@ -6,6 +6,7 @@ */ #include "gm.h" +#include "sk_tool_utils.h" #include "SkPath.h" namespace skiagm { diff --git a/gm/filterbitmap.cpp b/gm/filterbitmap.cpp index c9ff295b48..0f3371cb90 100644 --- a/gm/filterbitmap.cpp +++ b/gm/filterbitmap.cpp @@ -6,12 +6,12 @@ */ #include "gm.h" +#include "sk_tool_utils.h" #include "Resources.h" #include "SkGradientShader.h" #include "SkStream.h" #include "SkTypeface.h" -#include "sk_tool_utils.h" static void setTypeface(SkPaint* paint, const char name[], SkFontStyle style) { sk_tool_utils::set_portable_typeface(paint, name, style); diff --git a/gm/filterfastbounds.cpp b/gm/filterfastbounds.cpp index 812c6668ea..5102b863c2 100644 --- a/gm/filterfastbounds.cpp +++ b/gm/filterfastbounds.cpp @@ -6,6 +6,7 @@ */ #include "gm.h" +#include "sk_tool_utils.h" #include "SkBlurImageFilter.h" #include "SkDropShadowImageFilter.h" #include "SkImageSource.h" diff --git a/gm/filterindiabox.cpp b/gm/filterindiabox.cpp index 569a694968..eef0b4a0d5 100644 --- a/gm/filterindiabox.cpp +++ b/gm/filterindiabox.cpp @@ -6,6 +6,7 @@ */ #include "gm.h" +#include "sk_tool_utils.h" #include "Resources.h" #include "SkBitmapProcState.h" diff --git a/gm/fontcache.cpp b/gm/fontcache.cpp index 22b29f47ab..8775b58220 100644 --- a/gm/fontcache.cpp +++ b/gm/fontcache.cpp @@ -6,6 +6,7 @@ */ #include "gm.h" +#include "sk_tool_utils.h" #include "SkCanvas.h" #include "SkGraphics.h" #include "SkTypeface.h" diff --git a/gm/fontmgr.cpp b/gm/fontmgr.cpp index cd596ebac7..aecb46e180 100644 --- a/gm/fontmgr.cpp +++ b/gm/fontmgr.cpp @@ -6,6 +6,7 @@ */ #include "gm.h" +#include "sk_tool_utils.h" #include "SkCanvas.h" #include "SkFontMgr.h" #include "SkGraphics.h" diff --git a/gm/fontscaler.cpp b/gm/fontscaler.cpp index cc9815c9d9..ec607e7791 100644 --- a/gm/fontscaler.cpp +++ b/gm/fontscaler.cpp @@ -5,6 +5,7 @@ * found in the LICENSE file. */ #include "gm.h" +#include "sk_tool_utils.h" #include "SkTypeface.h" namespace skiagm { diff --git a/gm/gamma.cpp b/gm/gamma.cpp index ef93d1b9e5..864272600e 100644 --- a/gm/gamma.cpp +++ b/gm/gamma.cpp @@ -6,6 +6,7 @@ */ #include "gm.h" +#include "sk_tool_utils.h" #include "Resources.h" #include "SkBlendModePriv.h" diff --git a/gm/gammatext.cpp b/gm/gammatext.cpp index 8fa5171844..43b07200ee 100644 --- a/gm/gammatext.cpp +++ b/gm/gammatext.cpp @@ -6,6 +6,7 @@ */ #include "gm.h" +#include "sk_tool_utils.h" #include "SkCanvas.h" #include "SkPath.h" #include "SkGradientShader.h" diff --git a/gm/gamut.cpp b/gm/gamut.cpp index 3e57377fe9..af104c480a 100644 --- a/gm/gamut.cpp +++ b/gm/gamut.cpp @@ -6,6 +6,7 @@ */ #include "gm.h" +#include "sk_tool_utils.h" #include "SkColorSpace_Base.h" #include "SkGradientShader.h" diff --git a/gm/getpostextpath.cpp b/gm/getpostextpath.cpp index dcd983b3f3..eac570ac58 100644 --- a/gm/getpostextpath.cpp +++ b/gm/getpostextpath.cpp @@ -6,6 +6,7 @@ */ #include "gm.h" +#include "sk_tool_utils.h" #include "SkCanvas.h" #include "SkPaint.h" #include "SkPath.h" diff --git a/gm/glyph_pos.cpp b/gm/glyph_pos.cpp index b89077aad3..cfc318d4b4 100644 --- a/gm/glyph_pos.cpp +++ b/gm/glyph_pos.cpp @@ -6,6 +6,7 @@ */ #include "gm.h" +#include "sk_tool_utils.h" #include "SkCanvas.h" #include "SkTypeface.h" @@ -6,6 +6,7 @@ */ #include "gm.h" +#include "sk_tool_utils.h" #include "SkShader.h" using namespace skiagm; @@ -14,7 +14,6 @@ #include "SkSize.h" #include "SkString.h" #include "../tools/Registry.h" -#include "sk_tool_utils.h" #include "SkClipOpPriv.h" class SkAnimTimer; diff --git a/gm/gradientDirtyLaundry.cpp b/gm/gradientDirtyLaundry.cpp index dc52d9e655..9062fce914 100644 --- a/gm/gradientDirtyLaundry.cpp +++ b/gm/gradientDirtyLaundry.cpp @@ -5,6 +5,7 @@ * found in the LICENSE file. */ #include "gm.h" +#include "sk_tool_utils.h" #include "SkGradientShader.h" using namespace skiagm; diff --git a/gm/gradient_matrix.cpp b/gm/gradient_matrix.cpp index 3992a49d44..0a4f03621a 100644 --- a/gm/gradient_matrix.cpp +++ b/gm/gradient_matrix.cpp @@ -18,6 +18,7 @@ #include "SkString.h" #include "gm.h" +#include "sk_tool_utils.h" constexpr SkColor gColors[] = { SK_ColorRED, SK_ColorYELLOW diff --git a/gm/gradients.cpp b/gm/gradients.cpp index 099e7cd712..e7a8a89139 100644 --- a/gm/gradients.cpp +++ b/gm/gradients.cpp @@ -6,6 +6,7 @@ */ #include "gm.h" +#include "sk_tool_utils.h" #include "SkGradientShader.h" #include "SkLinearGradient.h" diff --git a/gm/gradients_2pt_conical.cpp b/gm/gradients_2pt_conical.cpp index ee1aee9e2d..8b94ea5457 100644 --- a/gm/gradients_2pt_conical.cpp +++ b/gm/gradients_2pt_conical.cpp @@ -6,6 +6,7 @@ */ #include "gm.h" +#include "sk_tool_utils.h" #include "SkGradientShader.h" namespace skiagm { diff --git a/gm/gradients_no_texture.cpp b/gm/gradients_no_texture.cpp index e012178450..9acd633f29 100644 --- a/gm/gradients_no_texture.cpp +++ b/gm/gradients_no_texture.cpp @@ -5,6 +5,7 @@ * found in the LICENSE file. */ #include "gm.h" +#include "sk_tool_utils.h" #include "SkGradientShader.h" using namespace skiagm; diff --git a/gm/gradtext.cpp b/gm/gradtext.cpp index d66454760b..7f7f22277c 100644 --- a/gm/gradtext.cpp +++ b/gm/gradtext.cpp @@ -6,6 +6,7 @@ */ #include "gm.h" +#include "sk_tool_utils.h" #include "SkCanvas.h" #include "SkGradientShader.h" #include "SkTypeface.h" diff --git a/gm/highcontrastfilter.cpp b/gm/highcontrastfilter.cpp index 68a5449293..e5330d24cf 100644 --- a/gm/highcontrastfilter.cpp +++ b/gm/highcontrastfilter.cpp @@ -6,6 +6,7 @@ */ #include "gm.h" +#include "sk_tool_utils.h" #include "SkCanvas.h" #include "SkGradientShader.h" #include "SkHighContrastFilter.h" diff --git a/gm/image.cpp b/gm/image.cpp index f672e07ed1..8e38ae716d 100644 --- a/gm/image.cpp +++ b/gm/image.cpp @@ -7,6 +7,7 @@ #include <functional> #include "gm.h" +#include "sk_tool_utils.h" #include "SkAutoPixmapStorage.h" #include "SkData.h" #include "SkCanvas.h" diff --git a/gm/imageblur.cpp b/gm/imageblur.cpp index 6a27c65beb..d15f11c745 100644 --- a/gm/imageblur.cpp +++ b/gm/imageblur.cpp @@ -6,6 +6,7 @@ */ #include "gm.h" +#include "sk_tool_utils.h" #include "SkBlurImageFilter.h" #include "SkRandom.h" diff --git a/gm/imageblur2.cpp b/gm/imageblur2.cpp index 7431ded03f..19c92f3193 100644 --- a/gm/imageblur2.cpp +++ b/gm/imageblur2.cpp @@ -6,6 +6,7 @@ */ #include "gm.h" +#include "sk_tool_utils.h" #include "SkBlurImageFilter.h" #include "SkRandom.h" diff --git a/gm/imageblurtiled.cpp b/gm/imageblurtiled.cpp index bf5d3d1104..7d846be370 100644 --- a/gm/imageblurtiled.cpp +++ b/gm/imageblurtiled.cpp @@ -6,6 +6,7 @@ */ #include "gm.h" +#include "sk_tool_utils.h" #include "SkBlurImageFilter.h" #include "SkRandom.h" diff --git a/gm/imagefiltersbase.cpp b/gm/imagefiltersbase.cpp index 440f6b2e37..8c702b20b3 100644 --- a/gm/imagefiltersbase.cpp +++ b/gm/imagefiltersbase.cpp @@ -6,6 +6,7 @@ */ #include "gm.h" +#include "sk_tool_utils.h" #include "SkCanvas.h" #include "SkColorFilter.h" #include "SkColorPriv.h" diff --git a/gm/imagefiltersclipped.cpp b/gm/imagefiltersclipped.cpp index 7989f8b4b0..6236c388b6 100644 --- a/gm/imagefiltersclipped.cpp +++ b/gm/imagefiltersclipped.cpp @@ -5,7 +5,6 @@ * found in the LICENSE file. */ -#include "sk_tool_utils.h" #include "SkBlurImageFilter.h" #include "SkColor.h" #include "SkDisplacementMapEffect.h" @@ -22,6 +21,7 @@ #include "SkScalar.h" #include "SkSurface.h" #include "gm.h" +#include "sk_tool_utils.h" #define RESIZE_FACTOR_X SkIntToScalar(2) #define RESIZE_FACTOR_Y SkIntToScalar(5) diff --git a/gm/imagefilterscropexpand.cpp b/gm/imagefilterscropexpand.cpp index 57ff14b4a0..a2dbda61e7 100644 --- a/gm/imagefilterscropexpand.cpp +++ b/gm/imagefilterscropexpand.cpp @@ -6,6 +6,7 @@ */ #include "gm.h" +#include "sk_tool_utils.h" #include "SkCanvas.h" #include "SkColorFilter.h" #include "SkColorPriv.h" diff --git a/gm/imagefilterscropped.cpp b/gm/imagefilterscropped.cpp index e5702aac34..b8db8abefa 100644 --- a/gm/imagefilterscropped.cpp +++ b/gm/imagefilterscropped.cpp @@ -6,6 +6,7 @@ */ #include "gm.h" +#include "sk_tool_utils.h" #include "SkCanvas.h" #include "SkColorFilter.h" #include "SkColorPriv.h" diff --git a/gm/imagefiltersgraph.cpp b/gm/imagefiltersgraph.cpp index 30c987aa86..3436d6953f 100644 --- a/gm/imagefiltersgraph.cpp +++ b/gm/imagefiltersgraph.cpp @@ -6,6 +6,7 @@ */ #include "gm.h" +#include "sk_tool_utils.h" #include "SkArithmeticImageFilter.h" #include "SkBlurImageFilter.h" diff --git a/gm/imagefiltersscaled.cpp b/gm/imagefiltersscaled.cpp index 39d58f3724..dc87da3ec5 100644 --- a/gm/imagefiltersscaled.cpp +++ b/gm/imagefiltersscaled.cpp @@ -5,7 +5,6 @@ * found in the LICENSE file. */ -#include "sk_tool_utils.h" #include "SkBlurImageFilter.h" #include "SkColor.h" #include "SkDisplacementMapEffect.h" @@ -22,6 +21,7 @@ #include "SkScalar.h" #include "SkSurface.h" #include "gm.h" +#include "sk_tool_utils.h" #define RESIZE_FACTOR SkIntToScalar(4) diff --git a/gm/imagefiltersstroked.cpp b/gm/imagefiltersstroked.cpp index 13dc705433..c0016bb369 100644 --- a/gm/imagefiltersstroked.cpp +++ b/gm/imagefiltersstroked.cpp @@ -5,7 +5,6 @@ * found in the LICENSE file. */ -#include "sk_tool_utils.h" #include "SkBlurImageFilter.h" #include "SkColor.h" #include "SkDropShadowImageFilter.h" diff --git a/gm/imagefilterstransformed.cpp b/gm/imagefilterstransformed.cpp index dc8257ce1d..941a04c0aa 100644 --- a/gm/imagefilterstransformed.cpp +++ b/gm/imagefilterstransformed.cpp @@ -5,7 +5,6 @@ * found in the LICENSE file. */ -#include "sk_tool_utils.h" #include "SkBlurImageFilter.h" #include "SkColor.h" #include "SkDisplacementMapEffect.h" @@ -17,6 +16,7 @@ #include "SkScalar.h" #include "SkSurface.h" #include "gm.h" +#include "sk_tool_utils.h" namespace skiagm { diff --git a/gm/imagemagnifier.cpp b/gm/imagemagnifier.cpp index 888bb5d9ab..a494f4c285 100644 --- a/gm/imagemagnifier.cpp +++ b/gm/imagemagnifier.cpp @@ -6,6 +6,7 @@ */ #include "gm.h" +#include "sk_tool_utils.h" #include "SkImageSource.h" #include "SkMagnifierImageFilter.h" #include "SkPixelRef.h" diff --git a/gm/imagemakewithfilter.cpp b/gm/imagemakewithfilter.cpp index 48b1740882..9c6e870a85 100644 --- a/gm/imagemakewithfilter.cpp +++ b/gm/imagemakewithfilter.cpp @@ -6,6 +6,7 @@ */ #include "gm.h" +#include "sk_tool_utils.h" #include "SkBlurImageFilter.h" #include "SkCanvas.h" #include "SkColorFilter.h" diff --git a/gm/imagemasksubset.cpp b/gm/imagemasksubset.cpp index 2d0d12038c..49ff3c5405 100644 --- a/gm/imagemasksubset.cpp +++ b/gm/imagemasksubset.cpp @@ -6,12 +6,12 @@ */ #include "gm.h" +#include "sk_tool_utils.h" #include "SkCanvas.h" #include "SkImage.h" #include "SkImageGenerator.h" #include "SkMakeUnique.h" #include "SkSurface.h" -#include "sk_tool_utils.h" namespace { diff --git a/gm/imageresizetiled.cpp b/gm/imageresizetiled.cpp index fcbb7e43d1..9fa6be0cdd 100644 --- a/gm/imageresizetiled.cpp +++ b/gm/imageresizetiled.cpp @@ -6,6 +6,7 @@ */ #include "gm.h" +#include "sk_tool_utils.h" #include "SkImageFilter.h" #include "SkRandom.h" diff --git a/gm/imagesource.cpp b/gm/imagesource.cpp index ed7aba1c98..50d818b2fa 100644 --- a/gm/imagesource.cpp +++ b/gm/imagesource.cpp @@ -6,6 +6,7 @@ */ #include "gm.h" +#include "sk_tool_utils.h" #include "SkImage.h" #include "SkImageSource.h" diff --git a/gm/internal_links.cpp b/gm/internal_links.cpp index 6d70c1ef98..c873754715 100644 --- a/gm/internal_links.cpp +++ b/gm/internal_links.cpp @@ -5,6 +5,7 @@ * found in the LICENSE file. */ #include "gm.h" +#include "sk_tool_utils.h" #include "SkAnnotation.h" #include "SkData.h" diff --git a/gm/largeglyphblur.cpp b/gm/largeglyphblur.cpp index 19d390be54..fe82b5ed8c 100644 --- a/gm/largeglyphblur.cpp +++ b/gm/largeglyphblur.cpp @@ -6,6 +6,7 @@ */ #include "gm.h" +#include "sk_tool_utils.h" #include "SkBlurMask.h" #include "SkBlurMaskFilter.h" diff --git a/gm/lcdblendmodes.cpp b/gm/lcdblendmodes.cpp index 4d5794cd60..07b55c56fe 100644 --- a/gm/lcdblendmodes.cpp +++ b/gm/lcdblendmodes.cpp @@ -11,6 +11,7 @@ */ #include "gm.h" +#include "sk_tool_utils.h" #include "SkCanvas.h" #include "SkGradientShader.h" #include "SkSurface.h" diff --git a/gm/lcdoverlap.cpp b/gm/lcdoverlap.cpp index 380878539f..ffb6cd7444 100644 --- a/gm/lcdoverlap.cpp +++ b/gm/lcdoverlap.cpp @@ -11,6 +11,7 @@ */ #include "gm.h" +#include "sk_tool_utils.h" #include "SkCanvas.h" #include "SkSurface.h" #include "SkTextBlob.h" diff --git a/gm/lcdtext.cpp b/gm/lcdtext.cpp index 978bfd641e..5a549eb74c 100644 --- a/gm/lcdtext.cpp +++ b/gm/lcdtext.cpp @@ -10,6 +10,7 @@ */ #include "gm.h" +#include "sk_tool_utils.h" #include "SkCanvas.h" #include "SkPicture.h" #include "SkPictureImageFilter.h" diff --git a/gm/lighting.cpp b/gm/lighting.cpp index 97c6f52fef..0c45065d4c 100644 --- a/gm/lighting.cpp +++ b/gm/lighting.cpp @@ -6,6 +6,7 @@ */ #include "gm.h" +#include "sk_tool_utils.h" #include "SkAnimTimer.h" #include "SkLightingImageFilter.h" #include "SkOffsetImageFilter.h" diff --git a/gm/lightingshader.cpp b/gm/lightingshader.cpp index 8576dd72d5..95e30acda4 100644 --- a/gm/lightingshader.cpp +++ b/gm/lightingshader.cpp @@ -6,6 +6,7 @@ */ #include "gm.h" +#include "sk_tool_utils.h" #include "SkLightingShader.h" #include "SkNormalSource.h" #include "SkPoint3.h" diff --git a/gm/lightingshader2.cpp b/gm/lightingshader2.cpp index 2efcebb02d..c6c246d353 100644 --- a/gm/lightingshader2.cpp +++ b/gm/lightingshader2.cpp @@ -6,6 +6,7 @@ */ #include "gm.h" +#include "sk_tool_utils.h" #include "SkLightingShader.h" #include "SkNormalSource.h" #include "SkPoint3.h" diff --git a/gm/lightingshaderbevel.cpp b/gm/lightingshaderbevel.cpp index 4e95c8ecc2..5adf3b8131 100644 --- a/gm/lightingshaderbevel.cpp +++ b/gm/lightingshaderbevel.cpp @@ -6,6 +6,7 @@ */ #include "gm.h" +#include "sk_tool_utils.h" #include "SkLightingShader.h" #include "SkNormalSource.h" #include "SkPath.h" diff --git a/gm/linepaths.cpp b/gm/linepaths.cpp index e7a0c9396c..2583ff17c1 100644 --- a/gm/linepaths.cpp +++ b/gm/linepaths.cpp @@ -6,6 +6,7 @@ */ #include "gm.h" +#include "sk_tool_utils.h" #include "SkCanvas.h" #include "SkPath.h" #include "SkPaint.h" diff --git a/gm/lumafilter.cpp b/gm/lumafilter.cpp index abce994c20..07e9b99714 100644 --- a/gm/lumafilter.cpp +++ b/gm/lumafilter.cpp @@ -6,6 +6,7 @@ */ #include "gm.h" +#include "sk_tool_utils.h" #include "SkBlendModePriv.h" #include "SkCanvas.h" #include "SkGradientShader.h" diff --git a/gm/manypaths.cpp b/gm/manypaths.cpp index c33552f969..0d8c84236e 100644 --- a/gm/manypaths.cpp +++ b/gm/manypaths.cpp @@ -6,6 +6,7 @@ */ #include "gm.h" +#include "sk_tool_utils.h" #include "SkRandom.h" #include "SkRect.h" #include "SkRRect.h" diff --git a/gm/matrixconvolution.cpp b/gm/matrixconvolution.cpp index ce5ce52bc9..7c1a2150db 100644 --- a/gm/matrixconvolution.cpp +++ b/gm/matrixconvolution.cpp @@ -6,6 +6,7 @@ */ #include "gm.h" +#include "sk_tool_utils.h" #include "SkColor.h" #include "SkGradientShader.h" #include "SkMatrixConvolutionImageFilter.h" diff --git a/gm/matriximagefilter.cpp b/gm/matriximagefilter.cpp index ef16ea4bdc..977112ffdd 100644 --- a/gm/matriximagefilter.cpp +++ b/gm/matriximagefilter.cpp @@ -6,6 +6,7 @@ */ #include "gm.h" +#include "sk_tool_utils.h" #include "SkColor.h" #include "SkImageFilter.h" diff --git a/gm/mipmap.cpp b/gm/mipmap.cpp index 19aff9d83b..56a78f4890 100644 --- a/gm/mipmap.cpp +++ b/gm/mipmap.cpp @@ -6,6 +6,7 @@ */ #include "gm.h" +#include "sk_tool_utils.h" #include "SkCanvas.h" #include "SkImage.h" #include "SkRandom.h" diff --git a/gm/mixedtextblobs.cpp b/gm/mixedtextblobs.cpp index 00081d0778..dbb8229366 100644 --- a/gm/mixedtextblobs.cpp +++ b/gm/mixedtextblobs.cpp @@ -6,6 +6,7 @@ */ #include "gm.h" +#include "sk_tool_utils.h" #include "Resources.h" #include "SkCanvas.h" diff --git a/gm/modecolorfilters.cpp b/gm/modecolorfilters.cpp index cc54e7623f..e0fd8eca56 100644 --- a/gm/modecolorfilters.cpp +++ b/gm/modecolorfilters.cpp @@ -6,6 +6,7 @@ */ #include "gm.h" +#include "sk_tool_utils.h" #include "SkColorFilter.h" #include "SkGradientShader.h" diff --git a/gm/morphology.cpp b/gm/morphology.cpp index f60079b873..d1513c43d0 100644 --- a/gm/morphology.cpp +++ b/gm/morphology.cpp @@ -6,6 +6,7 @@ */ #include "gm.h" +#include "sk_tool_utils.h" #include "SkMorphologyImageFilter.h" #define WIDTH 700 diff --git a/gm/multipicturedraw.cpp b/gm/multipicturedraw.cpp index e7d4baabef..fe2281ae20 100644 --- a/gm/multipicturedraw.cpp +++ b/gm/multipicturedraw.cpp @@ -6,6 +6,7 @@ */ #include "gm.h" +#include "sk_tool_utils.h" #include "SkColorFilter.h" #include "SkMultiPictureDraw.h" diff --git a/gm/nested.cpp b/gm/nested.cpp index 0b3cf19fb0..eb92d834fe 100644 --- a/gm/nested.cpp +++ b/gm/nested.cpp @@ -6,6 +6,7 @@ */ #include "gm.h" +#include "sk_tool_utils.h" #include "SkPath.h" #include "SkRandom.h" #include "SkRRect.h" diff --git a/gm/occludedrrectblur.cpp b/gm/occludedrrectblur.cpp index 059b47353f..f488f22028 100644 --- a/gm/occludedrrectblur.cpp +++ b/gm/occludedrrectblur.cpp @@ -6,9 +6,9 @@ */ #include "gm.h" +#include "sk_tool_utils.h" #include "SkBlurMaskFilter.h" #include "SkRRect.h" -#include "sk_tool_utils.h" static SkRect offset_center_to(const SkIRect& src, SkScalar x, SkScalar y) { SkScalar halfW = 0.5f * src.width(); diff --git a/gm/offsetimagefilter.cpp b/gm/offsetimagefilter.cpp index 8f23483212..0ecca71edd 100644 --- a/gm/offsetimagefilter.cpp +++ b/gm/offsetimagefilter.cpp @@ -5,12 +5,12 @@ * found in the LICENSE file. */ -#include "sk_tool_utils.h" #include "SkImage.h" #include "SkImageSource.h" #include "SkOffsetImageFilter.h" #include "SkSurface.h" #include "gm.h" +#include "sk_tool_utils.h" #define WIDTH 600 #define HEIGHT 100 diff --git a/gm/ovals.cpp b/gm/ovals.cpp index 272ac433f0..ec9bd75d47 100644 --- a/gm/ovals.cpp +++ b/gm/ovals.cpp @@ -6,6 +6,7 @@ */ #include "gm.h" +#include "sk_tool_utils.h" #include "SkTArray.h" #include "SkRandom.h" #include "SkMatrix.h" diff --git a/gm/pathinterior.cpp b/gm/pathinterior.cpp index f93e68250d..41c1a69a8e 100644 --- a/gm/pathinterior.cpp +++ b/gm/pathinterior.cpp @@ -6,6 +6,7 @@ */ #include "gm.h" +#include "sk_tool_utils.h" #include "SkBlurMaskFilter.h" #include "SkCanvas.h" #include "SkGraphics.h" diff --git a/gm/pathopsinverse.cpp b/gm/pathopsinverse.cpp index 918666ca38..3a3d970534 100644 --- a/gm/pathopsinverse.cpp +++ b/gm/pathopsinverse.cpp @@ -6,6 +6,7 @@ */ #include "gm.h" +#include "sk_tool_utils.h" #include "SkBitmap.h" #include "SkPath.h" #include "SkPathOps.h" diff --git a/gm/perspshaders.cpp b/gm/perspshaders.cpp index b231291c65..e39a846b1a 100644 --- a/gm/perspshaders.cpp +++ b/gm/perspshaders.cpp @@ -6,6 +6,7 @@ */ #include "gm.h" +#include "sk_tool_utils.h" #include "SkGradientShader.h" #include "SkImage.h" #include "SkPath.h" diff --git a/gm/pictureimagefilter.cpp b/gm/pictureimagefilter.cpp index 244ed87afd..aaec8505d3 100644 --- a/gm/pictureimagefilter.cpp +++ b/gm/pictureimagefilter.cpp @@ -6,6 +6,7 @@ */ #include "gm.h" +#include "sk_tool_utils.h" #include "SkPictureImageFilter.h" #include "SkPictureRecorder.h" diff --git a/gm/pictureimagegenerator.cpp b/gm/pictureimagegenerator.cpp index 1cf34268ac..2154e523fe 100644 --- a/gm/pictureimagegenerator.cpp +++ b/gm/pictureimagegenerator.cpp @@ -6,6 +6,7 @@ */ #include "gm.h" +#include "sk_tool_utils.h" #include "SkBitmap.h" #include "SkCanvas.h" #include "SkGradientShader.h" diff --git a/gm/pictureshader.cpp b/gm/pictureshader.cpp index d54144f938..bc98d80d1c 100644 --- a/gm/pictureshader.cpp +++ b/gm/pictureshader.cpp @@ -6,6 +6,7 @@ */ #include "gm.h" +#include "sk_tool_utils.h" #include "SkBitmap.h" #include "SkPaint.h" diff --git a/gm/pixelsnap.cpp b/gm/pixelsnap.cpp index 401127d462..d664d973c9 100644 --- a/gm/pixelsnap.cpp +++ b/gm/pixelsnap.cpp @@ -6,6 +6,7 @@ */ #include "gm.h" +#include "sk_tool_utils.h" #include "SkShader.h" diff --git a/gm/poly2poly.cpp b/gm/poly2poly.cpp index f6d3f84b67..9434bf2658 100644 --- a/gm/poly2poly.cpp +++ b/gm/poly2poly.cpp @@ -6,6 +6,7 @@ */ #include "gm.h" +#include "sk_tool_utils.h" #include "Resources.h" #include "SkPath.h" #include "SkTypeface.h" diff --git a/gm/quadpaths.cpp b/gm/quadpaths.cpp index 0578d2ea96..bac37b9234 100644 --- a/gm/quadpaths.cpp +++ b/gm/quadpaths.cpp @@ -6,6 +6,7 @@ */ #include "gm.h" +#include "sk_tool_utils.h" #include "SkCanvas.h" #include "SkPaint.h" #include "SkPath.h" diff --git a/gm/reveal.cpp b/gm/reveal.cpp index 3c7de7d56a..3e465556ad 100644 --- a/gm/reveal.cpp +++ b/gm/reveal.cpp @@ -6,6 +6,7 @@ */ #include "gm.h" +#include "sk_tool_utils.h" #include "SkAnimTimer.h" #include "SkBlurMaskFilter.h" #include "SkGaussianEdgeShader.h" diff --git a/gm/roundrects.cpp b/gm/roundrects.cpp index fbb005ffc0..794393e853 100644 --- a/gm/roundrects.cpp +++ b/gm/roundrects.cpp @@ -6,6 +6,7 @@ */ #include "gm.h" +#include "sk_tool_utils.h" #include "SkTArray.h" #include "SkRandom.h" #include "SkMatrix.h" diff --git a/gm/rrect.cpp b/gm/rrect.cpp index 660e72a647..f8fff7a0be 100644 --- a/gm/rrect.cpp +++ b/gm/rrect.cpp @@ -6,6 +6,7 @@ */ #include "gm.h" +#include "sk_tool_utils.h" #include "SkCanvas.h" #include "SkRRect.h" #include "SkPath.h" diff --git a/gm/rrects.cpp b/gm/rrects.cpp index 032b0c3a15..ac66d521cb 100644 --- a/gm/rrects.cpp +++ b/gm/rrects.cpp @@ -6,6 +6,7 @@ */ #include "gm.h" +#include "sk_tool_utils.h" #if SK_SUPPORT_GPU #include "GrContext.h" #include "GrRenderTargetContextPriv.h" diff --git a/gm/samplerstress.cpp b/gm/samplerstress.cpp index e36e621fdc..63873499bc 100644 --- a/gm/samplerstress.cpp +++ b/gm/samplerstress.cpp @@ -6,6 +6,7 @@ */ #include "gm.h" +#include "sk_tool_utils.h" #include "SkBlurMaskFilter.h" #include "SkCanvas.h" #include "SkPath.h" diff --git a/gm/savelayer.cpp b/gm/savelayer.cpp index 6a01edd4f0..98a00ca952 100644 --- a/gm/savelayer.cpp +++ b/gm/savelayer.cpp @@ -6,6 +6,7 @@ */ #include "gm.h" +#include "sk_tool_utils.h" static const uint32_t SkCanvas_kDontClipToLayer_PrivateSaveLayerFlag = 1U << 31; diff --git a/gm/shadertext.cpp b/gm/shadertext.cpp index 7d54e77a9a..237a1496ff 100644 --- a/gm/shadertext.cpp +++ b/gm/shadertext.cpp @@ -6,6 +6,7 @@ */ #include "gm.h" +#include "sk_tool_utils.h" #include "SkCanvas.h" #include "SkGradientShader.h" #include "SkPath.h" diff --git a/gm/shadertext2.cpp b/gm/shadertext2.cpp index 6fd784ac7d..9b585bf4d6 100644 --- a/gm/shadertext2.cpp +++ b/gm/shadertext2.cpp @@ -5,6 +5,7 @@ * found in the LICENSE file. */ #include "gm.h" +#include "sk_tool_utils.h" #include "SkCanvas.h" #include "SkGradientShader.h" #include "SkPath.h" diff --git a/gm/shadertext3.cpp b/gm/shadertext3.cpp index b811ac97e4..010fe22c34 100644 --- a/gm/shadertext3.cpp +++ b/gm/shadertext3.cpp @@ -6,6 +6,7 @@ */ #include "gm.h" +#include "sk_tool_utils.h" #include "SkCanvas.h" #include "SkGradientShader.h" diff --git a/gm/shadowmaps.cpp b/gm/shadowmaps.cpp index b675aca2b3..e8222f4813 100644 --- a/gm/shadowmaps.cpp +++ b/gm/shadowmaps.cpp @@ -7,6 +7,7 @@ #include "gm.h" +#include "sk_tool_utils.h" #include "SkPathEffect.h" #include "SkPictureRecorder.h" #include "SkShadowPaintFilterCanvas.h" diff --git a/gm/shadows.cpp b/gm/shadows.cpp index e642070db8..e550a8a6fd 100644 --- a/gm/shadows.cpp +++ b/gm/shadows.cpp @@ -6,6 +6,7 @@ */ #include "gm.h" +#include "sk_tool_utils.h" #include "SkBlurDrawLooper.h" #include "SkBlurMask.h" #include "SkColorFilter.h" diff --git a/gm/shallowgradient.cpp b/gm/shallowgradient.cpp index ad1de63b53..efaa31acf2 100644 --- a/gm/shallowgradient.cpp +++ b/gm/shallowgradient.cpp @@ -6,6 +6,7 @@ */ #include "gm.h" +#include "sk_tool_utils.h" #include "SkGradientShader.h" typedef sk_sp<SkShader> (*MakeShaderProc)(const SkColor[], int count, const SkSize&); diff --git a/gm/showmiplevels.cpp b/gm/showmiplevels.cpp index ba9f228791..0dd19d58cb 100644 --- a/gm/showmiplevels.cpp +++ b/gm/showmiplevels.cpp @@ -6,6 +6,7 @@ */ #include "gm.h" +#include "sk_tool_utils.h" #include "Resources.h" #include "SkBitmapScaler.h" @@ -15,7 +16,6 @@ #include "SkPaint.h" #include "SkMipMap.h" #include "Resources.h" -#include "sk_tool_utils.h" #define SHOW_MIP_COLOR 0xFF000000 diff --git a/gm/simple_magnification.cpp b/gm/simple_magnification.cpp index 342fd92068..14dade1307 100644 --- a/gm/simple_magnification.cpp +++ b/gm/simple_magnification.cpp @@ -6,6 +6,7 @@ */ #include "gm.h" +#include "sk_tool_utils.h" #include "SkImageSource.h" #include "SkMagnifierImageFilter.h" #include "SkSurface.h" diff --git a/gm/simpleaaclip.cpp b/gm/simpleaaclip.cpp index 72a590f8a3..8f6c5c95c5 100644 --- a/gm/simpleaaclip.cpp +++ b/gm/simpleaaclip.cpp @@ -6,6 +6,7 @@ */ #include "gm.h" +#include "sk_tool_utils.h" #include "SkAAClip.h" #include "SkCanvas.h" #include "SkPath.h" diff --git a/gm/simplerect.cpp b/gm/simplerect.cpp index 640fafcab2..b27c348ce1 100644 --- a/gm/simplerect.cpp +++ b/gm/simplerect.cpp @@ -6,6 +6,7 @@ */ #include "gm.h" +#include "sk_tool_utils.h" #include "SkBlurMask.h" #include "SkBlurMaskFilter.h" #include "SkPath.h" diff --git a/gm/skbug1719.cpp b/gm/skbug1719.cpp index 9d6d98b698..f632852860 100644 --- a/gm/skbug1719.cpp +++ b/gm/skbug1719.cpp @@ -6,6 +6,7 @@ */ #include "gm.h" +#include "sk_tool_utils.h" #include "SkBlurMaskFilter.h" #include "SkColorFilter.h" #include "SkPath.h" diff --git a/gm/skbug_257.cpp b/gm/skbug_257.cpp index b11487d6c5..fb77532fa1 100644 --- a/gm/skbug_257.cpp +++ b/gm/skbug_257.cpp @@ -6,6 +6,7 @@ */ #include "gm.h" +#include "sk_tool_utils.h" #include "SkImage.h" #include "SkRRect.h" diff --git a/gm/srcmode.cpp b/gm/srcmode.cpp index d57b77cbd9..75721f1de4 100644 --- a/gm/srcmode.cpp +++ b/gm/srcmode.cpp @@ -6,6 +6,7 @@ */ #include "gm.h" +#include "sk_tool_utils.h" #include "SkCanvas.h" #include "SkGradientShader.h" #include "SkPath.h" diff --git a/gm/stringart.cpp b/gm/stringart.cpp index e21e8f2b51..73a214d758 100644 --- a/gm/stringart.cpp +++ b/gm/stringart.cpp @@ -6,6 +6,7 @@ */ #include "gm.h" +#include "sk_tool_utils.h" #include "SkAnimTimer.h" #include "SkCanvas.h" #include "SkPath.h" diff --git a/gm/strokedlines.cpp b/gm/strokedlines.cpp index 7bcb3fb578..402fa9b497 100644 --- a/gm/strokedlines.cpp +++ b/gm/strokedlines.cpp @@ -6,6 +6,7 @@ */ #include "gm.h" +#include "sk_tool_utils.h" #include "SkBlurMaskFilter.h" #include "SkDashPathEffect.h" #include "SkGradientShader.h" diff --git a/gm/strokefill.cpp b/gm/strokefill.cpp index 3e81107e2a..51936403e8 100644 --- a/gm/strokefill.cpp +++ b/gm/strokefill.cpp @@ -6,6 +6,7 @@ */ #include "gm.h" +#include "sk_tool_utils.h" #include "SkCanvas.h" #include "SkPathPriv.h" #include "SkTextFormatParams.h" diff --git a/gm/strokerect.cpp b/gm/strokerect.cpp index 1d5d803ca6..92b812c197 100644 --- a/gm/strokerect.cpp +++ b/gm/strokerect.cpp @@ -6,6 +6,7 @@ */ #include "gm.h" +#include "sk_tool_utils.h" #include "SkCanvas.h" #include "SkPath.h" diff --git a/gm/strokes.cpp b/gm/strokes.cpp index 218f845c6e..7bd31c23f4 100644 --- a/gm/strokes.cpp +++ b/gm/strokes.cpp @@ -6,6 +6,7 @@ */ #include "gm.h" +#include "sk_tool_utils.h" #include "SkPath.h" #include "SkRandom.h" #include "SkDashPathEffect.h" diff --git a/gm/stroketext.cpp b/gm/stroketext.cpp index b247d8a711..f1bb32732a 100644 --- a/gm/stroketext.cpp +++ b/gm/stroketext.cpp @@ -6,6 +6,7 @@ */ #include "gm.h" +#include "sk_tool_utils.h" #include "SkCanvas.h" #include "SkDashPathEffect.h" diff --git a/gm/surface.cpp b/gm/surface.cpp index baa84ebdc0..ee4deccacf 100644 --- a/gm/surface.cpp +++ b/gm/surface.cpp @@ -6,6 +6,7 @@ */ #include "gm.h" +#include "sk_tool_utils.h" #include "SkGradientShader.h" #include "SkSurface.h" #include "SkSurfaceProps.h" diff --git a/gm/tablecolorfilter.cpp b/gm/tablecolorfilter.cpp index 0f870c67c1..df6f7d6564 100644 --- a/gm/tablecolorfilter.cpp +++ b/gm/tablecolorfilter.cpp @@ -6,6 +6,7 @@ */ #include "gm.h" +#include "sk_tool_utils.h" #include "SkCanvas.h" #include "SkColorFilterImageFilter.h" #include "SkGradientShader.h" diff --git a/gm/textblob.cpp b/gm/textblob.cpp index aa2bfb04a8..d30f92f3bf 100644 --- a/gm/textblob.cpp +++ b/gm/textblob.cpp @@ -6,6 +6,7 @@ */ #include "gm.h" +#include "sk_tool_utils.h" #include "SkCanvas.h" #include "SkPoint.h" diff --git a/gm/textblobblockreordering.cpp b/gm/textblobblockreordering.cpp index b1658f84d1..8a1f36d6d6 100644 --- a/gm/textblobblockreordering.cpp +++ b/gm/textblobblockreordering.cpp @@ -6,6 +6,7 @@ */ #include "gm.h" +#include "sk_tool_utils.h" #include "SkCanvas.h" #include "SkTextBlob.h" diff --git a/gm/textblobcolortrans.cpp b/gm/textblobcolortrans.cpp index 286dc77ef5..13620238e8 100644 --- a/gm/textblobcolortrans.cpp +++ b/gm/textblobcolortrans.cpp @@ -6,6 +6,7 @@ */ #include "gm.h" +#include "sk_tool_utils.h" #include "Resources.h" #include "SkCanvas.h" diff --git a/gm/textblobgeometrychange.cpp b/gm/textblobgeometrychange.cpp index f84a55fbf4..b86ee3a17e 100644 --- a/gm/textblobgeometrychange.cpp +++ b/gm/textblobgeometrychange.cpp @@ -6,6 +6,7 @@ */ #include "gm.h" +#include "sk_tool_utils.h" #include "SkCanvas.h" #include "SkSurface.h" diff --git a/gm/textbloblooper.cpp b/gm/textbloblooper.cpp index d0e55086c9..60ad4860d4 100644 --- a/gm/textbloblooper.cpp +++ b/gm/textbloblooper.cpp @@ -6,6 +6,7 @@ */ #include "gm.h" +#include "sk_tool_utils.h" #include "Sk2DPathEffect.h" #include "SkBlurMask.h" diff --git a/gm/textblobmixedsizes.cpp b/gm/textblobmixedsizes.cpp index 64cf723c8d..e003ee6ba8 100644 --- a/gm/textblobmixedsizes.cpp +++ b/gm/textblobmixedsizes.cpp @@ -6,6 +6,7 @@ */ #include "gm.h" +#include "sk_tool_utils.h" #include "Resources.h" #include "SkBlurMask.h" diff --git a/gm/textblobrandomfont.cpp b/gm/textblobrandomfont.cpp index 918549477b..c489bd10c8 100644 --- a/gm/textblobrandomfont.cpp +++ b/gm/textblobrandomfont.cpp @@ -6,6 +6,7 @@ */ #include "gm.h" +#include "sk_tool_utils.h" #include "Resources.h" #include "SkCanvas.h" diff --git a/gm/textblobshader.cpp b/gm/textblobshader.cpp index acb6436d1a..085f7b004a 100644 --- a/gm/textblobshader.cpp +++ b/gm/textblobshader.cpp @@ -6,6 +6,7 @@ */ #include "gm.h" +#include "sk_tool_utils.h" #include "SkCanvas.h" #include "SkGradientShader.h" diff --git a/gm/textblobtransforms.cpp b/gm/textblobtransforms.cpp index 54c6b4417c..597227b853 100644 --- a/gm/textblobtransforms.cpp +++ b/gm/textblobtransforms.cpp @@ -6,6 +6,7 @@ */ #include "gm.h" +#include "sk_tool_utils.h" #include "Resources.h" #include "SkCanvas.h" diff --git a/gm/textblobuseaftergpufree.cpp b/gm/textblobuseaftergpufree.cpp index 44fd85488c..b892c7fde1 100644 --- a/gm/textblobuseaftergpufree.cpp +++ b/gm/textblobuseaftergpufree.cpp @@ -6,6 +6,7 @@ */ #include "gm.h" +#include "sk_tool_utils.h" #if SK_SUPPORT_GPU diff --git a/gm/texteffects.cpp b/gm/texteffects.cpp index e74d7a97f5..5e0f189d61 100644 --- a/gm/texteffects.cpp +++ b/gm/texteffects.cpp @@ -6,6 +6,7 @@ */ #include "gm.h" +#include "sk_tool_utils.h" #include "SkBlurMask.h" #include "SkBlurMaskFilter.h" #include "SkReadBuffer.h" diff --git a/gm/tileimagefilter.cpp b/gm/tileimagefilter.cpp index c7d3e37821..c05723522c 100644 --- a/gm/tileimagefilter.cpp +++ b/gm/tileimagefilter.cpp @@ -5,13 +5,13 @@ * found in the LICENSE file. */ -#include "sk_tool_utils.h" #include "SkColorFilterImageFilter.h" #include "SkColorMatrixFilter.h" #include "SkImage.h" #include "SkImageSource.h" #include "SkTileImageFilter.h" #include "gm.h" +#include "sk_tool_utils.h" #define WIDTH 400 #define HEIGHT 200 diff --git a/gm/tilemodes.cpp b/gm/tilemodes.cpp index b1f6d14984..009ad6421d 100644 --- a/gm/tilemodes.cpp +++ b/gm/tilemodes.cpp @@ -5,6 +5,7 @@ * found in the LICENSE file. */ #include "gm.h" +#include "sk_tool_utils.h" #include "SkColorFilter.h" #include "SkMaskFilter.h" #include "SkPath.h" diff --git a/gm/tilemodes_scaled.cpp b/gm/tilemodes_scaled.cpp index 580931f278..807d63b369 100644 --- a/gm/tilemodes_scaled.cpp +++ b/gm/tilemodes_scaled.cpp @@ -5,6 +5,7 @@ * found in the LICENSE file. */ #include "gm.h" +#include "sk_tool_utils.h" #include "SkColorFilter.h" #include "SkMaskFilter.h" #include "SkPath.h" diff --git a/gm/tinybitmap.cpp b/gm/tinybitmap.cpp index fc226c11f4..0f0f1374ea 100644 --- a/gm/tinybitmap.cpp +++ b/gm/tinybitmap.cpp @@ -5,6 +5,7 @@ * found in the LICENSE file. */ #include "gm.h" +#include "sk_tool_utils.h" #include "SkColorPriv.h" #include "SkShader.h" #include "SkCanvas.h" diff --git a/gm/transparency.cpp b/gm/transparency.cpp index 5f324605d8..a998c0b641 100644 --- a/gm/transparency.cpp +++ b/gm/transparency.cpp @@ -8,6 +8,7 @@ #include "SkGradientShader.h" #include "SkSurface.h" #include "gm.h" +#include "sk_tool_utils.h" static void make_transparency(SkCanvas* canvas, SkScalar width, SkScalar height) { SkPoint pts[2]; diff --git a/gm/typeface.cpp b/gm/typeface.cpp index 4ed3956986..807b49c883 100644 --- a/gm/typeface.cpp +++ b/gm/typeface.cpp @@ -6,6 +6,7 @@ */ #include "gm.h" +#include "sk_tool_utils.h" #include "Resources.h" #include "SkCanvas.h" #include "SkString.h" diff --git a/gm/variedtext.cpp b/gm/variedtext.cpp index 9ee8ff6583..563d138fc7 100644 --- a/gm/variedtext.cpp +++ b/gm/variedtext.cpp @@ -6,6 +6,7 @@ */ #include "gm.h" +#include "sk_tool_utils.h" #include "SkCanvas.h" #include "SkPath.h" #include "SkTypeface.h" diff --git a/gm/verttext2.cpp b/gm/verttext2.cpp index 9afedc6078..d7da041896 100644 --- a/gm/verttext2.cpp +++ b/gm/verttext2.cpp @@ -10,6 +10,7 @@ */ #include "gm.h" +#include "sk_tool_utils.h" #include "SkCanvas.h" #include "SkTypeface.h" diff --git a/gm/windowrectangles.cpp b/gm/windowrectangles.cpp index d0bae11a21..8110574a65 100644 --- a/gm/windowrectangles.cpp +++ b/gm/windowrectangles.cpp @@ -6,6 +6,7 @@ */ #include "gm.h" +#include "sk_tool_utils.h" #include "SkClipStack.h" #include "SkRRect.h" diff --git a/gm/xfermodes.cpp b/gm/xfermodes.cpp index bb03c72e27..5d23104ad0 100644 --- a/gm/xfermodes.cpp +++ b/gm/xfermodes.cpp @@ -6,6 +6,7 @@ */ #include "gm.h" +#include "sk_tool_utils.h" #include "SkBitmap.h" #include "SkShader.h" #include "SkPM4f.h" diff --git a/gm/xfermodes2.cpp b/gm/xfermodes2.cpp index 4d6b5e7fe9..891a864cf9 100644 --- a/gm/xfermodes2.cpp +++ b/gm/xfermodes2.cpp @@ -5,6 +5,7 @@ * found in the LICENSE file. */ #include "gm.h" +#include "sk_tool_utils.h" #include "SkBitmap.h" #include "SkShader.h" #include "SkBlendModePriv.h" diff --git a/gm/xfermodes3.cpp b/gm/xfermodes3.cpp index c2d4d935e5..f977b66911 100644 --- a/gm/xfermodes3.cpp +++ b/gm/xfermodes3.cpp @@ -6,6 +6,7 @@ */ #include "gm.h" +#include "sk_tool_utils.h" #include "SkBitmap.h" #include "SkGradientShader.h" #include "SkSurface.h" |