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 --- fuzz/Fuzz.h | 3 ++- fuzz/FuzzCanvas.cpp | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'fuzz') diff --git a/fuzz/Fuzz.h b/fuzz/Fuzz.h index 3ffe47db2d..32ec990326 100644 --- a/fuzz/Fuzz.h +++ b/fuzz/Fuzz.h @@ -8,11 +8,12 @@ #ifndef Fuzz_DEFINED #define Fuzz_DEFINED -#include "SkData.h" #include "../tools/Registry.h" +#include "SkData.h" #include "SkMalloc.h" #include "SkTypes.h" +#include #include #include #include diff --git a/fuzz/FuzzCanvas.cpp b/fuzz/FuzzCanvas.cpp index 903eb29858..f63ddb12f8 100644 --- a/fuzz/FuzzCanvas.cpp +++ b/fuzz/FuzzCanvas.cpp @@ -17,6 +17,7 @@ #include "SkImageFilter.h" #include "SkMaskFilter.h" #include "SkNullCanvas.h" +#include "SkOSFile.h" #include "SkPathEffect.h" #include "SkPicturePriv.h" #include "SkPictureRecorder.h" @@ -24,8 +25,8 @@ #include "SkRSXform.h" #include "SkRegion.h" #include "SkSurface.h" +#include "SkTo.h" #include "SkTypeface.h" -#include "SkOSFile.h" // EFFECTS #include "Sk1DPathEffect.h" -- cgit v1.2.3