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 /samplecode | |
| 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 'samplecode')
| -rw-r--r-- | samplecode/SampleHairline.cpp | 12 | ||||
| -rw-r--r-- | samplecode/SamplePathClip.cpp | 10 |
2 files changed, 10 insertions, 12 deletions
diff --git a/samplecode/SampleHairline.cpp b/samplecode/SampleHairline.cpp index b90e99e719..51fff8df79 100644 --- a/samplecode/SampleHairline.cpp +++ b/samplecode/SampleHairline.cpp @@ -7,10 +7,9 @@ #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" @@ -18,12 +17,13 @@ #include "SkRandom.h" #include "SkRegion.h" #include "SkShader.h" -#include "SkStream.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" +#include "SkStream.h" +#include "SkColorPriv.h" static SkRandom gRand; diff --git a/samplecode/SamplePathClip.cpp b/samplecode/SamplePathClip.cpp index 2db72c9f75..029b1c9dc9 100644 --- a/samplecode/SamplePathClip.cpp +++ b/samplecode/SamplePathClip.cpp @@ -4,21 +4,19 @@ * 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: |