diff options
author | Hal Canary <halcanary@google.com> | 2018-06-13 09:59:02 -0400 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-06-14 14:55:17 +0000 |
commit | c640d0dc96924699fdbb1a3cbdc907aa07b1cb3c (patch) | |
tree | d8973c4700da0bbe95c73bb3bc0c7d8f4589186d /gm | |
parent | 4d4665436e540bd2ca393c139cbaff1eabd62ee2 (diff) |
Revert "Revert "SkTypes: extract SkTo""
This reverts commit fdcfb8b7c23fbf18f872d2c31d27978235033876.
> Original change's description:
> > SkTypes: extract SkTo
> >
> > Change-Id: I8de790d5013db2105ad885fa2683303d7c250b09
> > Reviewed-on: https://skia-review.googlesource.com/133620
> > Reviewed-by: Mike Klein <mtklein@google.com>
Change-Id: Ida74fbc5c21248a724a5edbf9fae18a33bcb23aa
Reviewed-on: https://skia-review.googlesource.com/134506
Reviewed-by: Mike Klein <mtklein@google.com>
Commit-Queue: Hal Canary <halcanary@google.com>
Diffstat (limited to 'gm')
-rw-r--r-- | gm/blurrect.cpp | 3 | ||||
-rw-r--r-- | gm/dftext.cpp | 6 | ||||
-rw-r--r-- | gm/getpostextpath.cpp | 2 | ||||
-rw-r--r-- | gm/imagefromyuvtextures.cpp | 1 | ||||
-rw-r--r-- | gm/pdf_never_embed.cpp | 1 | ||||
-rw-r--r-- | gm/scaledemoji.cpp | 1 | ||||
-rw-r--r-- | gm/tallstretchedbitmaps.cpp | 2 | ||||
-rw-r--r-- | gm/texteffects.cpp | 2 |
8 files changed, 15 insertions, 3 deletions
diff --git a/gm/blurrect.cpp b/gm/blurrect.cpp index a718cdeac6..c2724bdedb 100644 --- a/gm/blurrect.cpp +++ b/gm/blurrect.cpp @@ -5,11 +5,12 @@ * found in the LICENSE file. */ -#include "gm.h" #include "SkBlurMask.h" #include "SkCanvas.h" #include "SkMaskFilter.h" #include "SkPath.h" +#include "SkTo.h" +#include "gm.h" #define STROKE_WIDTH SkIntToScalar(10) diff --git a/gm/dftext.cpp b/gm/dftext.cpp index ab8d1e6840..ae57aa8eb2 100644 --- a/gm/dftext.cpp +++ b/gm/dftext.cpp @@ -4,13 +4,15 @@ * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ -#include "gm.h" -#include "sk_tool_utils.h" + #include "Resources.h" #include "SkCanvas.h" #include "SkStream.h" #include "SkSurface.h" +#include "SkTo.h" #include "SkTypeface.h" +#include "gm.h" +#include "sk_tool_utils.h" class DFTextGM : public skiagm::GM { public: diff --git a/gm/getpostextpath.cpp b/gm/getpostextpath.cpp index eac570ac58..1fcce5fca5 100644 --- a/gm/getpostextpath.cpp +++ b/gm/getpostextpath.cpp @@ -7,11 +7,13 @@ #include "gm.h" #include "sk_tool_utils.h" + #include "SkCanvas.h" #include "SkPaint.h" #include "SkPath.h" #include "SkRandom.h" #include "SkTemplates.h" +#include "SkTo.h" static void strokePath(SkCanvas* canvas, const SkPath& path) { SkPaint paint; diff --git a/gm/imagefromyuvtextures.cpp b/gm/imagefromyuvtextures.cpp index 8a26a0066e..4139ca802b 100644 --- a/gm/imagefromyuvtextures.cpp +++ b/gm/imagefromyuvtextures.cpp @@ -16,6 +16,7 @@ #include "SkBitmap.h" #include "SkGradientShader.h" #include "SkImage.h" +#include "SkTo.h" namespace skiagm { class ImageFromYUVTextures : public GM { diff --git a/gm/pdf_never_embed.cpp b/gm/pdf_never_embed.cpp index e090c5a5b8..adaf78b450 100644 --- a/gm/pdf_never_embed.cpp +++ b/gm/pdf_never_embed.cpp @@ -6,6 +6,7 @@ */ #include "Resources.h" +#include "SkTo.h" #include "SkTypeface.h" #include "gm.h" diff --git a/gm/scaledemoji.cpp b/gm/scaledemoji.cpp index ac8b3c6d51..b71c470902 100644 --- a/gm/scaledemoji.cpp +++ b/gm/scaledemoji.cpp @@ -11,6 +11,7 @@ #include "Resources.h" #include "SkCanvas.h" #include "SkStream.h" +#include "SkTo.h" #include "SkTypeface.h" namespace skiagm { diff --git a/gm/tallstretchedbitmaps.cpp b/gm/tallstretchedbitmaps.cpp index b70ae3dc35..a16f54ac96 100644 --- a/gm/tallstretchedbitmaps.cpp +++ b/gm/tallstretchedbitmaps.cpp @@ -6,10 +6,12 @@ */ #include "gm.h" + #include "SkCanvas.h" #include "SkGradientShader.h" #include "SkPath.h" #include "SkRandom.h" +#include "SkTo.h" int make_bm(SkBitmap* bm, int height) { constexpr int kRadius = 22; diff --git a/gm/texteffects.cpp b/gm/texteffects.cpp index de149ae9d4..74675d7289 100644 --- a/gm/texteffects.cpp +++ b/gm/texteffects.cpp @@ -7,10 +7,12 @@ #include "gm.h" #include "sk_tool_utils.h" + #include "SkBlurMask.h" #include "SkBlurMaskFilter.h" #include "SkReadBuffer.h" #include "SkTextBlob.h" +#include "SkTo.h" #include "SkWriteBuffer.h" #include "Sk2DPathEffect.h" |