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/SkPaint.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/SkPaint.cpp')
| -rw-r--r-- | src/core/SkPaint.cpp | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/core/SkPaint.cpp b/src/core/SkPaint.cpp index 7643bab737..c76b98121e 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 "SkGlyphCache.h" #include "SkGraphics.h" +#include "SkGlyphCache.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,14 +31,12 @@ #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 "SkTo.h" +#include "SkTLazy.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; |