diff options
| author |  Hal Canary <halcanary@google.com> | 2018-06-13 09:42:32 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-06-13 13:45:47 +0000 |
| commit | fdcfb8b7c23fbf18f872d2c31d27978235033876 (patch) | |
| tree | 3e3ad1c6ffe8647f45b08a560ab99384437dc2ba /fuzz | |
| parent | bb9ee9b4aa7d80e8a85832a462a3123060d4bd64 (diff) | |
Revert "SkTypes: extract SkTo"
This reverts commit 2a2f67592602b18527bc3fd449132d420cd5b62e.
Reason for revert: this appears to be what is holding up the Chrome roll.
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>
TBR=mtklein@google.com,halcanary@google.com
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Change-Id: Iafd738aedfb679a23c061a51afe4b98a8d4cdfae
Reviewed-on: https://skia-review.googlesource.com/134504
Reviewed-by: Hal Canary <halcanary@google.com>
Commit-Queue: Hal Canary <halcanary@google.com>
Diffstat (limited to 'fuzz')
| -rw-r--r-- | fuzz/Fuzz.h | 3 | ||||
| -rw-r--r-- | fuzz/FuzzCanvas.cpp | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/fuzz/Fuzz.h b/fuzz/Fuzz.h index 32ec990326..3ffe47db2d 100644 --- a/fuzz/Fuzz.h +++ b/fuzz/Fuzz.h @@ -8,12 +8,11 @@ #ifndef Fuzz_DEFINED #define Fuzz_DEFINED -#include "../tools/Registry.h" #include "SkData.h" +#include "../tools/Registry.h" #include "SkMalloc.h" #include "SkTypes.h" -#include <limits> #include <cmath> #include <signal.h> #include <limits> diff --git a/fuzz/FuzzCanvas.cpp b/fuzz/FuzzCanvas.cpp index f63ddb12f8..903eb29858 100644 --- a/fuzz/FuzzCanvas.cpp +++ b/fuzz/FuzzCanvas.cpp @@ -17,7 +17,6 @@ #include "SkImageFilter.h" #include "SkMaskFilter.h" #include "SkNullCanvas.h" -#include "SkOSFile.h" #include "SkPathEffect.h" #include "SkPicturePriv.h" #include "SkPictureRecorder.h" @@ -25,8 +24,8 @@ #include "SkRSXform.h" #include "SkRegion.h" #include "SkSurface.h" -#include "SkTo.h" #include "SkTypeface.h" +#include "SkOSFile.h" // EFFECTS #include "Sk1DPathEffect.h" |