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 /src/core/SkCanvas.cpp | |
| 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 'src/core/SkCanvas.cpp')
| -rw-r--r-- | src/core/SkCanvas.cpp | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/src/core/SkCanvas.cpp b/src/core/SkCanvas.cpp index 494bd3b837..8494bdb753 100644 --- a/src/core/SkCanvas.cpp +++ b/src/core/SkCanvas.cpp @@ -5,55 +5,53 @@ * found in the LICENSE file. */ -#include "SkCanvas.h" - #include "SkArenaAlloc.h" #include "SkBitmapDevice.h" +#include "SkCanvas.h" #include "SkCanvasPriv.h" -#include "SkClipOpPriv.h" #include "SkClipStack.h" #include "SkColorFilter.h" #include "SkDraw.h" +#include "SkDrawable.h" #include "SkDrawFilter.h" #include "SkDrawLooper.h" -#include "SkDrawable.h" #include "SkGlyphCache.h" #include "SkGlyphRun.h" #include "SkImage.h" +#include "SkImage_Base.h" #include "SkImageFilter.h" #include "SkImageFilterCache.h" -#include "SkImage_Base.h" #include "SkLatticeIter.h" -#include "SkMSAN.h" #include "SkMakeUnique.h" #include "SkMatrixUtils.h" #include "SkMetaData.h" +#include "SkMSAN.h" #include "SkNoDrawCanvas.h" #include "SkNx.h" #include "SkPaintPriv.h" #include "SkPatchUtils.h" #include "SkPathEffect.h" #include "SkPicture.h" -#include "SkRRect.h" #include "SkRasterClip.h" #include "SkRasterHandleAllocator.h" +#include "SkRRect.h" #include "SkSpecialImage.h" #include "SkStrikeCache.h" #include "SkString.h" #include "SkSurface_Base.h" -#include "SkTLazy.h" #include "SkTextBlob.h" #include "SkTextFormatParams.h" -#include "SkTo.h" +#include "SkTLazy.h" #include "SkTraceEvent.h" -#include "SkVertices.h" - #include <new> #if SK_SUPPORT_GPU #include "GrContext.h" #include "SkGr.h" + #endif +#include "SkClipOpPriv.h" +#include "SkVertices.h" #define RETURN_ON_NULL(ptr) do { if (nullptr == (ptr)) return; } while (0) #define RETURN_ON_FALSE(pred) do { if (!(pred)) return; } while (0) |