From c640d0dc96924699fdbb1a3cbdc907aa07b1cb3c Mon Sep 17 00:00:00 2001 From: Hal Canary Date: Wed, 13 Jun 2018 09:59:02 -0400 Subject: 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 Change-Id: Ida74fbc5c21248a724a5edbf9fae18a33bcb23aa Reviewed-on: https://skia-review.googlesource.com/134506 Reviewed-by: Mike Klein Commit-Queue: Hal Canary --- tools/viewer/Viewer.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'tools/viewer') 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 -#include #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 +#include + #if defined(SK_HAS_SKSG) #include "SlideDir.h" #endif -- cgit v1.2.3