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/utils | |
| 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/utils')
| -rw-r--r-- | src/utils/SkInterpolator.cpp | 3 | ||||
| -rw-r--r-- | src/utils/SkLua.cpp | 1 | ||||
| -rw-r--r-- | src/utils/SkLuaCanvas.cpp | 1 | ||||
| -rw-r--r-- | src/utils/SkMultiPictureDocument.cpp | 2 | ||||
| -rw-r--r-- | src/utils/SkPatchUtils.cpp | 1 | ||||
| -rw-r--r-- | src/utils/mac/SkCreateCGImageRef.cpp | 1 |
6 files changed, 1 insertions, 8 deletions
diff --git a/src/utils/SkInterpolator.cpp b/src/utils/SkInterpolator.cpp index 141adaf29f..d64316d845 100644 --- a/src/utils/SkInterpolator.cpp +++ b/src/utils/SkInterpolator.cpp @@ -8,10 +8,9 @@ #include "SkInterpolator.h" #include "SkFixed.h" -#include "SkMalloc.h" #include "SkMath.h" +#include "SkMalloc.h" #include "SkTSearch.h" -#include "SkTo.h" SkInterpolatorBase::SkInterpolatorBase() { fStorage = nullptr; diff --git a/src/utils/SkLua.cpp b/src/utils/SkLua.cpp index 887e251ff2..53e8bb33a5 100644 --- a/src/utils/SkLua.cpp +++ b/src/utils/SkLua.cpp @@ -30,7 +30,6 @@ #include "SkString.h" #include "SkSurface.h" #include "SkTextBlob.h" -#include "SkTo.h" #include "SkTypeface.h" #include <new> diff --git a/src/utils/SkLuaCanvas.cpp b/src/utils/SkLuaCanvas.cpp index c7e3064c9b..53e462af0d 100644 --- a/src/utils/SkLuaCanvas.cpp +++ b/src/utils/SkLuaCanvas.cpp @@ -9,7 +9,6 @@ #include "SkLua.h" #include "SkStringUtils.h" -#include "SkTo.h" extern "C" { #include "lua.h" diff --git a/src/utils/SkMultiPictureDocument.cpp b/src/utils/SkMultiPictureDocument.cpp index f7081e6d56..493e6d4cfc 100644 --- a/src/utils/SkMultiPictureDocument.cpp +++ b/src/utils/SkMultiPictureDocument.cpp @@ -6,7 +6,6 @@ */ #include "SkMultiPictureDocument.h" - #include "SkMultiPictureDocumentPriv.h" #include "SkNWayCanvas.h" #include "SkPicture.h" @@ -14,7 +13,6 @@ #include "SkSerialProcs.h" #include "SkStream.h" #include "SkTArray.h" -#include "SkTo.h" #include <limits.h> diff --git a/src/utils/SkPatchUtils.cpp b/src/utils/SkPatchUtils.cpp index a28abdf807..8fafd149d4 100644 --- a/src/utils/SkPatchUtils.cpp +++ b/src/utils/SkPatchUtils.cpp @@ -10,7 +10,6 @@ #include "SkColorData.h" #include "SkGeometry.h" #include "SkPM4f.h" -#include "SkTo.h" namespace { enum CubicCtrlPts { diff --git a/src/utils/mac/SkCreateCGImageRef.cpp b/src/utils/mac/SkCreateCGImageRef.cpp index 300e23b216..e7a78b0fa6 100644 --- a/src/utils/mac/SkCreateCGImageRef.cpp +++ b/src/utils/mac/SkCreateCGImageRef.cpp @@ -12,7 +12,6 @@ #include "SkCGUtils.h" #include "SkColorData.h" #include "SkMacros.h" -#include "SkTo.h" static CGBitmapInfo ComputeCGAlphaInfo_RGBA(SkAlphaType at) { CGBitmapInfo info = kCGBitmapByteOrder32Big; |