From fdcfb8b7c23fbf18f872d2c31d27978235033876 Mon Sep 17 00:00:00 2001 From: Hal Canary Date: Wed, 13 Jun 2018 09:42:32 -0400 Subject: 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 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 Commit-Queue: Hal Canary --- src/opts/SkBitmapProcState_matrixProcs_neon.cpp | 3 +-- src/opts/SkBitmapProcState_opts_SSE2.cpp | 4 +--- 2 files changed, 2 insertions(+), 5 deletions(-) (limited to 'src/opts') diff --git a/src/opts/SkBitmapProcState_matrixProcs_neon.cpp b/src/opts/SkBitmapProcState_matrixProcs_neon.cpp index 4f166fb977..1efd1eddfe 100644 --- a/src/opts/SkBitmapProcState_matrixProcs_neon.cpp +++ b/src/opts/SkBitmapProcState_matrixProcs_neon.cpp @@ -5,10 +5,9 @@ */ #include "SkBitmapProcState.h" -#include "SkBitmapProcState_utils.h" #include "SkShader.h" -#include "SkTo.h" #include "SkUtilsArm.h" +#include "SkBitmapProcState_utils.h" #include diff --git a/src/opts/SkBitmapProcState_opts_SSE2.cpp b/src/opts/SkBitmapProcState_opts_SSE2.cpp index 2484123767..efe8f4dd2e 100644 --- a/src/opts/SkBitmapProcState_opts_SSE2.cpp +++ b/src/opts/SkBitmapProcState_opts_SSE2.cpp @@ -5,15 +5,13 @@ * found in the LICENSE file. */ +#include #include "SkBitmapProcState_opts_SSE2.h" #include "SkBitmapProcState_utils.h" #include "SkColorData.h" #include "SkPaint.h" -#include "SkTo.h" #include "SkUtils.h" -#include - void S32_opaque_D32_filter_DX_SSE2(const SkBitmapProcState& s, const uint32_t* xy, int count, uint32_t* colors) { -- cgit v1.2.3