diff options
author | Hal Canary <halcanary@google.com> | 2018-06-13 09:59:02 -0400 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-06-14 14:55:17 +0000 |
commit | c640d0dc96924699fdbb1a3cbdc907aa07b1cb3c (patch) | |
tree | d8973c4700da0bbe95c73bb3bc0c7d8f4589186d /src/core/SkDraw.cpp | |
parent | 4d4665436e540bd2ca393c139cbaff1eabd62ee2 (diff) |
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 <mtklein@google.com>
Change-Id: Ida74fbc5c21248a724a5edbf9fae18a33bcb23aa
Reviewed-on: https://skia-review.googlesource.com/134506
Reviewed-by: Mike Klein <mtklein@google.com>
Commit-Queue: Hal Canary <halcanary@google.com>
Diffstat (limited to 'src/core/SkDraw.cpp')
-rw-r--r-- | src/core/SkDraw.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/core/SkDraw.cpp b/src/core/SkDraw.cpp index 69eadbe1d5..58489b9ec8 100644 --- a/src/core/SkDraw.cpp +++ b/src/core/SkDraw.cpp @@ -5,7 +5,7 @@ * found in the LICENSE file. */ -#define __STDC_LIMIT_MACROS +#include "SkDraw.h" #include "SkArenaAlloc.h" #include "SkAutoBlitterChoose.h" @@ -14,7 +14,6 @@ #include "SkCanvas.h" #include "SkColorData.h" #include "SkDevice.h" -#include "SkDraw.h" #include "SkDrawProcs.h" #include "SkFindAndPlaceGlyph.h" #include "SkMaskFilterBase.h" @@ -24,19 +23,20 @@ #include "SkPaint.h" #include "SkPathEffect.h" #include "SkPathPriv.h" +#include "SkRRect.h" #include "SkRasterClip.h" #include "SkRectPriv.h" -#include "SkRRect.h" #include "SkScalerContext.h" #include "SkScan.h" #include "SkShader.h" #include "SkString.h" #include "SkStroke.h" #include "SkStrokeRec.h" +#include "SkTLazy.h" #include "SkTemplates.h" #include "SkTextMapStateProc.h" #include "SkThreadedBMPDevice.h" -#include "SkTLazy.h" +#include "SkTo.h" #include "SkUtils.h" static SkPaint make_paint_with_image( |