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/effects | |
| 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/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, 3 insertions, 13 deletions
diff --git a/src/effects/SkDashPathEffect.cpp b/src/effects/SkDashPathEffect.cpp index 830159253a..c1f5f0a2cc 100644 --- a/src/effects/SkDashPathEffect.cpp +++ b/src/effects/SkDashPathEffect.cpp @@ -6,14 +6,12 @@ */ #include "SkDashPathEffect.h" - #include "SkDashImpl.h" #include "SkDashPathPriv.h" #include "SkFlattenablePriv.h" #include "SkReadBuffer.h" -#include "SkStrokeRec.h" -#include "SkTo.h" #include "SkWriteBuffer.h" +#include "SkStrokeRec.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 d4e3741392..e081186564 100644 --- a/src/effects/SkEmbossMask.cpp +++ b/src/effects/SkEmbossMask.cpp @@ -5,11 +5,10 @@ * found in the LICENSE file. */ -#include "SkEmbossMask.h" +#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 e46590956c..d2dfed9de1 100644 --- a/src/effects/SkPackBits.cpp +++ b/src/effects/SkPackBits.cpp @@ -4,11 +4,8 @@ * 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 12b8fbbf94..dc1c0074bc 100644 --- a/src/effects/SkPaintFlagsDrawFilter.cpp +++ b/src/effects/SkPaintFlagsDrawFilter.cpp @@ -6,9 +6,7 @@ */ #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 fa68d11e51..5dbc784b0a 100644 --- a/src/effects/SkTableColorFilter.cpp +++ b/src/effects/SkTableColorFilter.cpp @@ -6,15 +6,13 @@ */ #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" |