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 /tools/viewer | |
| 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 'tools/viewer')
| -rw-r--r-- | tools/viewer/Viewer.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/tools/viewer/Viewer.cpp b/tools/viewer/Viewer.cpp index 65280bc4af..5a5489e67d 100644 --- a/tools/viewer/Viewer.cpp +++ b/tools/viewer/Viewer.cpp @@ -5,9 +5,6 @@ * found in the LICENSE file. */ -#include "Viewer.h" -#include <stdlib.h> -#include <map> #include "BisectSlide.h" #include "GMSlide.h" #include "GrContext.h" @@ -37,10 +34,15 @@ #include "SkTaskGroup.h" #include "SkTestFontMgr.h" #include "SkThreadedBMPDevice.h" +#include "SkTo.h" #include "SvgSlide.h" +#include "Viewer.h" #include "ccpr/GrCoverageCountingPathRenderer.h" #include "imgui.h" +#include <stdlib.h> +#include <map> + #if defined(SK_HAS_SKSG) #include "SlideDir.h" #endif |