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 --- samplecode/SampleHairline.cpp | 12 ++++++------ samplecode/SamplePathClip.cpp | 10 ++++++---- 2 files changed, 12 insertions(+), 10 deletions(-) (limited to 'samplecode') diff --git a/samplecode/SampleHairline.cpp b/samplecode/SampleHairline.cpp index 51fff8df79..b90e99e719 100644 --- a/samplecode/SampleHairline.cpp +++ b/samplecode/SampleHairline.cpp @@ -7,9 +7,10 @@ #include "SampleCode.h" #include "SkAnimTimer.h" -#include "SkView.h" #include "SkBitmap.h" #include "SkCanvas.h" +#include "SkColorFilter.h" +#include "SkColorPriv.h" #include "SkCornerPathEffect.h" #include "SkGradientShader.h" #include "SkGraphics.h" @@ -17,13 +18,12 @@ #include "SkRandom.h" #include "SkRegion.h" #include "SkShader.h" -#include "SkUtils.h" -#include "SkColorPriv.h" -#include "SkColorFilter.h" +#include "SkStream.h" #include "SkTime.h" +#include "SkTo.h" #include "SkTypeface.h" -#include "SkStream.h" -#include "SkColorPriv.h" +#include "SkUtils.h" +#include "SkView.h" static SkRandom gRand; diff --git a/samplecode/SamplePathClip.cpp b/samplecode/SamplePathClip.cpp index 029b1c9dc9..2db72c9f75 100644 --- a/samplecode/SamplePathClip.cpp +++ b/samplecode/SamplePathClip.cpp @@ -4,19 +4,21 @@ * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ + #include "SampleCode.h" -#include "SkView.h" #include "SkCanvas.h" +#include "SkColorFilter.h" +#include "SkColorPriv.h" #include "SkGradientShader.h" #include "SkGraphics.h" #include "SkPath.h" #include "SkRegion.h" #include "SkShader.h" -#include "SkUtils.h" -#include "SkColorPriv.h" -#include "SkColorFilter.h" #include "SkTime.h" +#include "SkTo.h" #include "SkTypeface.h" +#include "SkUtils.h" +#include "SkView.h" class PathClipView : public SampleView { public: -- cgit v1.2.3