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/effects | |
| 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/effects')
| -rw-r--r-- | src/effects/SkDashPathEffect.cpp | 4 | ||||
| -rw-r--r-- | src/effects/SkEmbossMask.cpp | 3 | ||||
| -rw-r--r-- | src/effects/SkPackBits.cpp | 3 | ||||
| -rw-r--r-- | src/effects/SkPaintFlagsDrawFilter.cpp | 2 | ||||
| -rw-r--r-- | src/effects/SkTableColorFilter.cpp | 4 |
5 files changed, 13 insertions, 3 deletions
diff --git a/src/effects/SkDashPathEffect.cpp b/src/effects/SkDashPathEffect.cpp index c1f5f0a2cc..830159253a 100644 --- a/src/effects/SkDashPathEffect.cpp +++ b/src/effects/SkDashPathEffect.cpp @@ -6,12 +6,14 @@ */ #include "SkDashPathEffect.h" + #include "SkDashImpl.h" #include "SkDashPathPriv.h" #include "SkFlattenablePriv.h" #include "SkReadBuffer.h" -#include "SkWriteBuffer.h" #include "SkStrokeRec.h" +#include "SkTo.h" +#include "SkWriteBuffer.h" SkDashImpl::SkDashImpl(const SkScalar intervals[], int count, SkScalar phase) : fPhase(0) diff --git a/src/effects/SkEmbossMask.cpp b/src/effects/SkEmbossMask.cpp index e081186564..d4e3741392 100644 --- a/src/effects/SkEmbossMask.cpp +++ b/src/effects/SkEmbossMask.cpp @@ -5,10 +5,11 @@ * found in the LICENSE file. */ - #include "SkEmbossMask.h" + #include "SkFixed.h" #include "SkMath.h" +#include "SkTo.h" static inline int nonzero_to_one(int x) { #if 0 diff --git a/src/effects/SkPackBits.cpp b/src/effects/SkPackBits.cpp index d2dfed9de1..e46590956c 100644 --- a/src/effects/SkPackBits.cpp +++ b/src/effects/SkPackBits.cpp @@ -4,8 +4,11 @@ * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ + #include "SkPackBits.h" +#include "SkTo.h" + size_t SkPackBits::ComputeMaxSize8(size_t srcSize) { // worst case is the number of 8bit values + 1 byte per (up to) 128 entries. return ((srcSize + 127) >> 7) + srcSize; diff --git a/src/effects/SkPaintFlagsDrawFilter.cpp b/src/effects/SkPaintFlagsDrawFilter.cpp index dc1c0074bc..12b8fbbf94 100644 --- a/src/effects/SkPaintFlagsDrawFilter.cpp +++ b/src/effects/SkPaintFlagsDrawFilter.cpp @@ -6,7 +6,9 @@ */ #include "SkPaintFlagsDrawFilter.h" + #include "SkPaint.h" +#include "SkTo.h" SkPaintFlagsDrawFilter::SkPaintFlagsDrawFilter(uint32_t clearFlags, uint32_t setFlags) { diff --git a/src/effects/SkTableColorFilter.cpp b/src/effects/SkTableColorFilter.cpp index 5dbc784b0a..fa68d11e51 100644 --- a/src/effects/SkTableColorFilter.cpp +++ b/src/effects/SkTableColorFilter.cpp @@ -6,13 +6,15 @@ */ #include "SkTableColorFilter.h" -#include "SkPM4f.h" + #include "SkArenaAlloc.h" #include "SkBitmap.h" #include "SkColorData.h" +#include "SkPM4f.h" #include "SkRasterPipeline.h" #include "SkReadBuffer.h" #include "SkString.h" +#include "SkTo.h" #include "SkUnPreMultiply.h" #include "SkWriteBuffer.h" |