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/SkPaint.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/SkPaint.cpp')
-rw-r--r-- | src/core/SkPaint.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/core/SkPaint.cpp b/src/core/SkPaint.cpp index c76b98121e..7643bab737 100644 --- a/src/core/SkPaint.cpp +++ b/src/core/SkPaint.cpp @@ -6,22 +6,22 @@ */ #include "SkPaint.h" -#include "SkPaintPriv.h" + #include "SkColorFilter.h" #include "SkData.h" #include "SkDraw.h" #include "SkFontDescriptor.h" -#include "SkGraphics.h" #include "SkGlyphCache.h" +#include "SkGraphics.h" #include "SkImageFilter.h" #include "SkMaskFilter.h" #include "SkMaskGamma.h" #include "SkMutex.h" -#include "SkReadBuffer.h" -#include "SkWriteBuffer.h" #include "SkOpts.h" #include "SkPaintDefaults.h" +#include "SkPaintPriv.h" #include "SkPathEffect.h" +#include "SkReadBuffer.h" #include "SkSafeRange.h" #include "SkScalar.h" #include "SkScalerContext.h" @@ -31,12 +31,14 @@ #include "SkStroke.h" #include "SkStrokeRec.h" #include "SkSurfacePriv.h" +#include "SkTLazy.h" #include "SkTextBlob.h" #include "SkTextBlobRunIterator.h" #include "SkTextFormatParams.h" #include "SkTextToPathIter.h" -#include "SkTLazy.h" +#include "SkTo.h" #include "SkTypeface.h" +#include "SkWriteBuffer.h" static inline uint32_t set_clear_mask(uint32_t bits, bool cond, uint32_t mask) { return cond ? bits | mask : bits & ~mask; |