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>
diff --git a/bench/BitmapRectBench.cpp b/bench/BitmapRectBench.cpp
index 0e5d362..789a725 100644
--- a/bench/BitmapRectBench.cpp
+++ b/bench/BitmapRectBench.cpp
@@ -4,7 +4,6 @@
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
-
#include "Benchmark.h"
#include "SkBitmap.h"
#include "SkCanvas.h"
@@ -12,7 +11,6 @@
#include "SkPaint.h"
#include "SkRandom.h"
#include "SkString.h"
-#include "SkTo.h"
static void draw_into_bitmap(const SkBitmap& bm) {
const int w = bm.width();
diff --git a/bench/PDFBench.cpp b/bench/PDFBench.cpp
index 44b96a7..4cda80b 100644
--- a/bench/PDFBench.cpp
+++ b/bench/PDFBench.cpp
@@ -16,7 +16,6 @@
#include "SkPixmap.h"
#include "SkRandom.h"
#include "SkStream.h"
-#include "SkTo.h"
namespace {
struct WStreamWriteTextBenchmark : public Benchmark {
diff --git a/experimental/svg/model/SkSVGDOM.cpp b/experimental/svg/model/SkSVGDOM.cpp
index 758a3ed..5b4dc66 100644
--- a/experimental/svg/model/SkSVGDOM.cpp
+++ b/experimental/svg/model/SkSVGDOM.cpp
@@ -8,11 +8,12 @@
#include "SkCanvas.h"
#include "SkDOM.h"
#include "SkParsePath.h"
+#include "SkString.h"
#include "SkSVGAttributeParser.h"
#include "SkSVGCircle.h"
#include "SkSVGClipPath.h"
-#include "SkSVGDOM.h"
#include "SkSVGDefs.h"
+#include "SkSVGDOM.h"
#include "SkSVGEllipse.h"
#include "SkSVGG.h"
#include "SkSVGLine.h"
@@ -24,14 +25,12 @@
#include "SkSVGRadialGradient.h"
#include "SkSVGRect.h"
#include "SkSVGRenderContext.h"
-#include "SkSVGSVG.h"
#include "SkSVGStop.h"
+#include "SkSVGSVG.h"
#include "SkSVGTypes.h"
#include "SkSVGUse.h"
#include "SkSVGValue.h"
-#include "SkString.h"
#include "SkTSearch.h"
-#include "SkTo.h"
namespace {
diff --git a/experimental/svg/model/SkSVGRenderContext.cpp b/experimental/svg/model/SkSVGRenderContext.cpp
index cab5a00..2b7ba2c 100644
--- a/experimental/svg/model/SkSVGRenderContext.cpp
+++ b/experimental/svg/model/SkSVGRenderContext.cpp
@@ -5,15 +5,13 @@
* found in the LICENSE file.
*/
-#include "SkSVGRenderContext.h"
-
#include "SkCanvas.h"
#include "SkDashPathEffect.h"
#include "SkPath.h"
#include "SkSVGAttribute.h"
#include "SkSVGNode.h"
+#include "SkSVGRenderContext.h"
#include "SkSVGTypes.h"
-#include "SkTo.h"
namespace {
diff --git a/fuzz/Fuzz.h b/fuzz/Fuzz.h
index 32ec990..3ffe47d 100644
--- a/fuzz/Fuzz.h
+++ b/fuzz/Fuzz.h
@@ -8,12 +8,11 @@
#ifndef Fuzz_DEFINED
#define Fuzz_DEFINED
-#include "../tools/Registry.h"
#include "SkData.h"
+#include "../tools/Registry.h"
#include "SkMalloc.h"
#include "SkTypes.h"
-#include <limits>
#include <cmath>
#include <signal.h>
#include <limits>
diff --git a/fuzz/FuzzCanvas.cpp b/fuzz/FuzzCanvas.cpp
index f63ddb1..903eb29 100644
--- a/fuzz/FuzzCanvas.cpp
+++ b/fuzz/FuzzCanvas.cpp
@@ -17,7 +17,6 @@
#include "SkImageFilter.h"
#include "SkMaskFilter.h"
#include "SkNullCanvas.h"
-#include "SkOSFile.h"
#include "SkPathEffect.h"
#include "SkPicturePriv.h"
#include "SkPictureRecorder.h"
@@ -25,8 +24,8 @@
#include "SkRSXform.h"
#include "SkRegion.h"
#include "SkSurface.h"
-#include "SkTo.h"
#include "SkTypeface.h"
+#include "SkOSFile.h"
// EFFECTS
#include "Sk1DPathEffect.h"
diff --git a/gm/blurrect.cpp b/gm/blurrect.cpp
index c2724bd..a718cde 100644
--- a/gm/blurrect.cpp
+++ b/gm/blurrect.cpp
@@ -5,12 +5,11 @@
* found in the LICENSE file.
*/
+#include "gm.h"
#include "SkBlurMask.h"
#include "SkCanvas.h"
#include "SkMaskFilter.h"
#include "SkPath.h"
-#include "SkTo.h"
-#include "gm.h"
#define STROKE_WIDTH SkIntToScalar(10)
diff --git a/gm/dftext.cpp b/gm/dftext.cpp
index ae57aa8..ab8d1e6 100644
--- a/gm/dftext.cpp
+++ b/gm/dftext.cpp
@@ -4,15 +4,13 @@
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
-
+#include "gm.h"
+#include "sk_tool_utils.h"
#include "Resources.h"
#include "SkCanvas.h"
#include "SkStream.h"
#include "SkSurface.h"
-#include "SkTo.h"
#include "SkTypeface.h"
-#include "gm.h"
-#include "sk_tool_utils.h"
class DFTextGM : public skiagm::GM {
public:
diff --git a/gm/getpostextpath.cpp b/gm/getpostextpath.cpp
index 1fcce5f..eac570a 100644
--- a/gm/getpostextpath.cpp
+++ b/gm/getpostextpath.cpp
@@ -7,13 +7,11 @@
#include "gm.h"
#include "sk_tool_utils.h"
-
#include "SkCanvas.h"
#include "SkPaint.h"
#include "SkPath.h"
#include "SkRandom.h"
#include "SkTemplates.h"
-#include "SkTo.h"
static void strokePath(SkCanvas* canvas, const SkPath& path) {
SkPaint paint;
diff --git a/gm/imagefromyuvtextures.cpp b/gm/imagefromyuvtextures.cpp
index 4139ca8..8a26a00 100644
--- a/gm/imagefromyuvtextures.cpp
+++ b/gm/imagefromyuvtextures.cpp
@@ -16,7 +16,6 @@
#include "SkBitmap.h"
#include "SkGradientShader.h"
#include "SkImage.h"
-#include "SkTo.h"
namespace skiagm {
class ImageFromYUVTextures : public GM {
diff --git a/gm/pdf_never_embed.cpp b/gm/pdf_never_embed.cpp
index adaf78b..e090c5a 100644
--- a/gm/pdf_never_embed.cpp
+++ b/gm/pdf_never_embed.cpp
@@ -6,7 +6,6 @@
*/
#include "Resources.h"
-#include "SkTo.h"
#include "SkTypeface.h"
#include "gm.h"
diff --git a/gm/scaledemoji.cpp b/gm/scaledemoji.cpp
index b71c470..ac8b3c6 100644
--- a/gm/scaledemoji.cpp
+++ b/gm/scaledemoji.cpp
@@ -11,7 +11,6 @@
#include "Resources.h"
#include "SkCanvas.h"
#include "SkStream.h"
-#include "SkTo.h"
#include "SkTypeface.h"
namespace skiagm {
diff --git a/gm/tallstretchedbitmaps.cpp b/gm/tallstretchedbitmaps.cpp
index a16f54a..b70ae3d 100644
--- a/gm/tallstretchedbitmaps.cpp
+++ b/gm/tallstretchedbitmaps.cpp
@@ -6,12 +6,10 @@
*/
#include "gm.h"
-
#include "SkCanvas.h"
#include "SkGradientShader.h"
#include "SkPath.h"
#include "SkRandom.h"
-#include "SkTo.h"
int make_bm(SkBitmap* bm, int height) {
constexpr int kRadius = 22;
diff --git a/gm/texteffects.cpp b/gm/texteffects.cpp
index 74675d7..de149ae 100644
--- a/gm/texteffects.cpp
+++ b/gm/texteffects.cpp
@@ -7,12 +7,10 @@
#include "gm.h"
#include "sk_tool_utils.h"
-
#include "SkBlurMask.h"
#include "SkBlurMaskFilter.h"
#include "SkReadBuffer.h"
#include "SkTextBlob.h"
-#include "SkTo.h"
#include "SkWriteBuffer.h"
#include "Sk2DPathEffect.h"
diff --git a/include/core/SkColorPriv.h b/include/core/SkColorPriv.h
index 188ce6a..0cd02e8 100644
--- a/include/core/SkColorPriv.h
+++ b/include/core/SkColorPriv.h
@@ -8,7 +8,6 @@
#ifndef SkColorPriv_DEFINED
#define SkColorPriv_DEFINED
-#include "../private/SkTo.h"
#include "SkColor.h"
#include "SkMath.h"
diff --git a/include/core/SkImageInfo.h b/include/core/SkImageInfo.h
index 80a51cf..f09b8d6 100644
--- a/include/core/SkImageInfo.h
+++ b/include/core/SkImageInfo.h
@@ -22,9 +22,7 @@
#include "SkMath.h"
#include "SkRect.h"
#include "SkSize.h"
-
#include "../private/SkTFitsIn.h"
-#include "../private/SkTo.h"
class SkReadBuffer;
class SkWriteBuffer;
diff --git a/include/core/SkMath.h b/include/core/SkMath.h
index 19ab2f8..fb551ab 100644
--- a/include/core/SkMath.h
+++ b/include/core/SkMath.h
@@ -1,3 +1,4 @@
+
/*
* Copyright 2006 The Android Open Source Project
*
@@ -9,7 +10,6 @@
#ifndef SkMath_DEFINED
#define SkMath_DEFINED
-#include "../private/SkTo.h"
#include "SkTypes.h"
// 64bit -> 32bit utilities
diff --git a/include/core/SkMatrix.h b/include/core/SkMatrix.h
index 84f805c..4fadf98 100644
--- a/include/core/SkMatrix.h
+++ b/include/core/SkMatrix.h
@@ -19,7 +19,6 @@
#define SkMatrix_DEFINED
#include "../private/SkMacros.h"
-#include "../private/SkTo.h"
#include "SkRect.h"
struct SkRSXform;
diff --git a/include/core/SkPaint.h b/include/core/SkPaint.h
index 3d471d1..4c82e50 100644
--- a/include/core/SkPaint.h
+++ b/include/core/SkPaint.h
@@ -18,7 +18,6 @@
#ifndef SkPaint_DEFINED
#define SkPaint_DEFINED
-#include "../private/SkTo.h"
#include "SkBlendMode.h"
#include "SkColor.h"
#include "SkFilterQuality.h"
diff --git a/include/core/SkPath.h b/include/core/SkPath.h
index 9906827..64ab531 100644
--- a/include/core/SkPath.h
+++ b/include/core/SkPath.h
@@ -20,7 +20,6 @@
#include "SkMatrix.h"
#include "../private/SkPathRef.h"
-#include "../private/SkTo.h"
class SkAutoPathBoundsUpdate;
class SkData;
diff --git a/include/core/SkStream.h b/include/core/SkStream.h
index d73c8a0..2d9f9db 100644
--- a/include/core/SkStream.h
+++ b/include/core/SkStream.h
@@ -8,7 +8,6 @@
#ifndef SkStream_DEFINED
#define SkStream_DEFINED
-#include "../private/SkTo.h"
#include "SkData.h"
#include "SkRefCnt.h"
#include "SkScalar.h"
diff --git a/include/core/SkString.h b/include/core/SkString.h
index aa3292a..c2fd9c0 100644
--- a/include/core/SkString.h
+++ b/include/core/SkString.h
@@ -1,3 +1,4 @@
+
/*
* Copyright 2006 The Android Open Source Project
*
@@ -10,9 +11,8 @@
#define SkString_DEFINED
#include "../private/SkTArray.h"
-#include "../private/SkTo.h"
-#include "SkRefCnt.h"
#include "SkScalar.h"
+#include "SkRefCnt.h"
#include <atomic>
#include <stdarg.h>
diff --git a/include/core/SkTypes.h b/include/core/SkTypes.h
index ba747ef..3e9dea6 100644
--- a/include/core/SkTypes.h
+++ b/include/core/SkTypes.h
@@ -102,6 +102,26 @@
*/
typedef unsigned U16CPU;
+/**
+ * Meant to be a small version of bool, for storage purposes. Will be 0 or 1
+ */
+typedef uint8_t SkBool8;
+
+#include "../private/SkTFitsIn.h"
+template <typename D, typename S> constexpr D SkTo(S s) {
+ return SkASSERT(SkTFitsIn<D>(s)),
+ static_cast<D>(s);
+}
+#define SkToS8(x) SkTo<int8_t>(x)
+#define SkToU8(x) SkTo<uint8_t>(x)
+#define SkToS16(x) SkTo<int16_t>(x)
+#define SkToU16(x) SkTo<uint16_t>(x)
+#define SkToS32(x) SkTo<int32_t>(x)
+#define SkToU32(x) SkTo<uint32_t>(x)
+#define SkToInt(x) SkTo<int>(x)
+#define SkToUInt(x) SkTo<unsigned>(x)
+#define SkToSizeT(x) SkTo<size_t>(x)
+
/** Returns 0 or 1 based on the condition
*/
#define SkToBool(cond) ((cond) != 0)
diff --git a/include/gpu/GrResourceKey.h b/include/gpu/GrResourceKey.h
index 90b84d7..0240387 100644
--- a/include/gpu/GrResourceKey.h
+++ b/include/gpu/GrResourceKey.h
@@ -1,3 +1,4 @@
+
/*
* Copyright 2014 Google Inc.
*
@@ -10,7 +11,6 @@
#include "../private/SkOnce.h"
#include "../private/SkTemplates.h"
-#include "../private/SkTo.h"
#include "GrTypes.h"
#include "SkData.h"
#include "SkString.h"
diff --git a/include/private/SkFixed.h b/include/private/SkFixed.h
index 0d15e02..15062f5 100644
--- a/include/private/SkFixed.h
+++ b/include/private/SkFixed.h
@@ -8,9 +8,9 @@
#ifndef SkFixed_DEFINED
#define SkFixed_DEFINED
-#include "SkSafe_math.h"
#include "SkScalar.h"
-#include "SkTo.h"
+#include "SkSafe_math.h"
+
#include "SkTypes.h"
/** \file SkFixed.h
diff --git a/include/private/SkPathRef.h b/include/private/SkPathRef.h
index 5a5a041..5f64f1a 100644
--- a/include/private/SkPathRef.h
+++ b/include/private/SkPathRef.h
@@ -1,3 +1,4 @@
+
/*
* Copyright 2012 Google Inc.
*
@@ -8,16 +9,14 @@
#ifndef SkPathRef_DEFINED
#define SkPathRef_DEFINED
-#include "SkAtomics.h"
+#include "../private/SkAtomics.h"
+#include "../private/SkTDArray.h"
#include "SkMatrix.h"
#include "SkPoint.h"
#include "SkRRect.h"
#include "SkRect.h"
#include "SkRefCnt.h"
-#include "SkTDArray.h"
#include "SkTemplates.h"
-#include "SkTo.h"
-
#include <limits>
class SkRBuffer;
diff --git a/include/private/SkTDArray.h b/include/private/SkTDArray.h
index dd3212d..b030dc5 100644
--- a/include/private/SkTDArray.h
+++ b/include/private/SkTDArray.h
@@ -1,3 +1,4 @@
+
/*
* Copyright 2006 The Android Open Source Project
*
@@ -9,9 +10,8 @@
#ifndef SkTDArray_DEFINED
#define SkTDArray_DEFINED
-#include "SkMalloc.h"
-#include "SkTo.h"
#include "SkTypes.h"
+#include "SkMalloc.h"
template <typename T> class SkTDArray {
public:
diff --git a/include/private/SkTo.h b/include/private/SkTo.h
deleted file mode 100644
index 9b5b7fd..0000000
--- a/include/private/SkTo.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright 2018 Google Inc.
- *
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file.
- */
-#ifndef SkTo_DEFINED
-#define SkTo_DEFINED
-
-#include "SkTypes.h"
-#include "SkTFitsIn.h"
-
-template <typename D, typename S> constexpr D SkTo(S s) {
- return SkASSERT(SkTFitsIn<D>(s)),
- static_cast<D>(s);
-}
-
-template <typename S> constexpr int8_t SkToS8(S x) { return SkTo<int8_t>(x); }
-template <typename S> constexpr uint8_t SkToU8(S x) { return SkTo<uint8_t>(x); }
-template <typename S> constexpr int16_t SkToS16(S x) { return SkTo<int16_t>(x); }
-template <typename S> constexpr uint16_t SkToU16(S x) { return SkTo<uint16_t>(x); }
-template <typename S> constexpr int32_t SkToS32(S x) { return SkTo<int32_t>(x); }
-template <typename S> constexpr uint32_t SkToU32(S x) { return SkTo<uint32_t>(x); }
-template <typename S> constexpr int SkToInt(S x) { return SkTo<int>(x); }
-template <typename S> constexpr unsigned SkToUInt(S x) { return SkTo<unsigned>(x); }
-template <typename S> constexpr size_t SkToSizeT(S x) { return SkTo<size_t>(x); }
-
-#endif // SkTo_DEFINED
diff --git a/include/utils/SkInterpolator.h b/include/utils/SkInterpolator.h
index f426263..31d50ee 100644
--- a/include/utils/SkInterpolator.h
+++ b/include/utils/SkInterpolator.h
@@ -1,3 +1,4 @@
+
/*
* Copyright 2006 The Android Open Source Project
*
@@ -9,7 +10,6 @@
#ifndef SkInterpolator_DEFINED
#define SkInterpolator_DEFINED
-#include "../private/SkTo.h"
#include "SkScalar.h"
class SK_API SkInterpolatorBase : SkNoncopyable {
diff --git a/modules/skjson/src/SkJSON.cpp b/modules/skjson/src/SkJSON.cpp
index 8af85ba..c9a4d7c 100644
--- a/modules/skjson/src/SkJSON.cpp
+++ b/modules/skjson/src/SkJSON.cpp
@@ -9,7 +9,6 @@
#include "SkStream.h"
#include "SkString.h"
-#include "SkTo.h"
#include <cmath>
#include <vector>
diff --git a/modules/skottie/src/Skottie.cpp b/modules/skottie/src/Skottie.cpp
index 229b5c6..93c71e9 100644
--- a/modules/skottie/src/Skottie.cpp
+++ b/modules/skottie/src/Skottie.cpp
@@ -8,6 +8,10 @@
#include "Skottie.h"
#include "SkCanvas.h"
+#include "SkottieAdapter.h"
+#include "SkottieAnimator.h"
+#include "SkottieJson.h"
+#include "SkottieValue.h"
#include "SkData.h"
#include "SkImage.h"
#include "SkMakeUnique.h"
@@ -34,13 +38,8 @@
#include "SkSGTrimEffect.h"
#include "SkStream.h"
#include "SkTArray.h"
-#include "SkTHash.h"
#include "SkTime.h"
-#include "SkTo.h"
-#include "SkottieAdapter.h"
-#include "SkottieAnimator.h"
-#include "SkottieJson.h"
-#include "SkottieValue.h"
+#include "SkTHash.h"
#include <cmath>
#include <vector>
diff --git a/modules/skottie/src/SkottieAdapter.cpp b/modules/skottie/src/SkottieAdapter.cpp
index 2caf570..a01599c 100644
--- a/modules/skottie/src/SkottieAdapter.cpp
+++ b/modules/skottie/src/SkottieAdapter.cpp
@@ -8,6 +8,7 @@
#include "SkottieAdapter.h"
#include "SkMatrix.h"
+#include "SkottieValue.h"
#include "SkPath.h"
#include "SkRRect.h"
#include "SkSGGradient.h"
@@ -15,8 +16,6 @@
#include "SkSGRect.h"
#include "SkSGTransform.h"
#include "SkSGTrimEffect.h"
-#include "SkTo.h"
-#include "SkottieValue.h"
#include <cmath>
diff --git a/modules/sksg/include/SkSGGroup.h b/modules/sksg/include/SkSGGroup.h
index b32f9af..482f10d 100644
--- a/modules/sksg/include/SkSGGroup.h
+++ b/modules/sksg/include/SkSGGroup.h
@@ -9,8 +9,8 @@
#define SkSGGroup_DEFINED
#include "SkSGRenderNode.h"
+
#include "SkTArray.h"
-#include "SkTo.h"
namespace sksg {
diff --git a/modules/sksg/tests/SGTest.cpp b/modules/sksg/tests/SGTest.cpp
index e098171..1228e66 100644
--- a/modules/sksg/tests/SGTest.cpp
+++ b/modules/sksg/tests/SGTest.cpp
@@ -5,19 +5,17 @@
* found in the LICENSE file.
*/
-#include "SkTypes.h"
+#include "SkRect.h"
+#include "SkRectPriv.h"
#if !defined(SK_BUILD_FOR_GOOGLE3)
-#include "SkRect.h"
-#include "SkRectPriv.h"
#include "SkSGColor.h"
#include "SkSGDraw.h"
#include "SkSGGroup.h"
#include "SkSGInvalidationController.h"
#include "SkSGRect.h"
#include "SkSGTransform.h"
-#include "SkTo.h"
#include "Test.h"
diff --git a/modules/skshaper/src/SkShaper_harfbuzz.cpp b/modules/skshaper/src/SkShaper_harfbuzz.cpp
index 94c899d..40414d9 100644
--- a/modules/skshaper/src/SkShaper_harfbuzz.cpp
+++ b/modules/skshaper/src/SkShaper_harfbuzz.cpp
@@ -23,7 +23,6 @@
#include "SkTLazy.h"
#include "SkTemplates.h"
#include "SkTextBlob.h"
-#include "SkTo.h"
#include "SkTypeface.h"
#include "SkUtils.h"
diff --git a/modules/skshaper/src/SkShaper_primitive.cpp b/modules/skshaper/src/SkShaper_primitive.cpp
index e6b4277..06a8bec 100644
--- a/modules/skshaper/src/SkShaper_primitive.cpp
+++ b/modules/skshaper/src/SkShaper_primitive.cpp
@@ -4,12 +4,9 @@
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
-
#include "SkShaper.h"
-
#include "SkStream.h"
#include "SkTextBlob.h"
-#include "SkTo.h"
#include "SkTypeface.h"
struct SkShaper::Impl {
diff --git a/samplecode/SampleHairline.cpp b/samplecode/SampleHairline.cpp
index b90e99e..51fff8d 100644
--- a/samplecode/SampleHairline.cpp
+++ b/samplecode/SampleHairline.cpp
@@ -7,10 +7,9 @@
#include "SampleCode.h"
#include "SkAnimTimer.h"
+#include "SkView.h"
#include "SkBitmap.h"
#include "SkCanvas.h"
-#include "SkColorFilter.h"
-#include "SkColorPriv.h"
#include "SkCornerPathEffect.h"
#include "SkGradientShader.h"
#include "SkGraphics.h"
@@ -18,12 +17,13 @@
#include "SkRandom.h"
#include "SkRegion.h"
#include "SkShader.h"
-#include "SkStream.h"
-#include "SkTime.h"
-#include "SkTo.h"
-#include "SkTypeface.h"
#include "SkUtils.h"
-#include "SkView.h"
+#include "SkColorPriv.h"
+#include "SkColorFilter.h"
+#include "SkTime.h"
+#include "SkTypeface.h"
+#include "SkStream.h"
+#include "SkColorPriv.h"
static SkRandom gRand;
diff --git a/samplecode/SamplePathClip.cpp b/samplecode/SamplePathClip.cpp
index 2db72c9..029b1c9 100644
--- a/samplecode/SamplePathClip.cpp
+++ b/samplecode/SamplePathClip.cpp
@@ -4,21 +4,19 @@
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
-
#include "SampleCode.h"
+#include "SkView.h"
#include "SkCanvas.h"
-#include "SkColorFilter.h"
-#include "SkColorPriv.h"
#include "SkGradientShader.h"
#include "SkGraphics.h"
#include "SkPath.h"
#include "SkRegion.h"
#include "SkShader.h"
-#include "SkTime.h"
-#include "SkTo.h"
-#include "SkTypeface.h"
#include "SkUtils.h"
-#include "SkView.h"
+#include "SkColorPriv.h"
+#include "SkColorFilter.h"
+#include "SkTime.h"
+#include "SkTypeface.h"
class PathClipView : public SampleView {
public:
diff --git a/src/codec/SkJpegCodec.cpp b/src/codec/SkJpegCodec.cpp
index fd95590..d44258f 100644
--- a/src/codec/SkJpegCodec.cpp
+++ b/src/codec/SkJpegCodec.cpp
@@ -14,7 +14,6 @@
#include "SkJpegInfo.h"
#include "SkStream.h"
#include "SkTemplates.h"
-#include "SkTo.h"
#include "SkTypes.h"
// stdio is needed for libjpeg-turbo
diff --git a/src/codec/SkWbmpCodec.cpp b/src/codec/SkWbmpCodec.cpp
index 8d4beb1..b5fd591 100644
--- a/src/codec/SkWbmpCodec.cpp
+++ b/src/codec/SkWbmpCodec.cpp
@@ -5,15 +5,13 @@
* found in the LICENSE file.
*/
-#include "SkWbmpCodec.h"
-
#include "SkCodec.h"
#include "SkCodecPriv.h"
#include "SkColorData.h"
#include "SkColorTable.h"
#include "SkData.h"
#include "SkStream.h"
-#include "SkTo.h"
+#include "SkWbmpCodec.h"
// Each bit represents a pixel, so width is actually a number of bits.
// A row will always be stored in bytes, so we round width up to the
diff --git a/src/codec/SkWebpCodec.cpp b/src/codec/SkWebpCodec.cpp
index e26f46d..2f9420b 100644
--- a/src/codec/SkWebpCodec.cpp
+++ b/src/codec/SkWebpCodec.cpp
@@ -5,9 +5,6 @@
* found in the LICENSE file.
*/
-#include "SkWebpCodec.h"
-
-#include "../jumper/SkJumper.h"
#include "SkBitmap.h"
#include "SkCanvas.h"
#include "SkCodecAnimation.h"
@@ -19,7 +16,8 @@
#include "SkSampler.h"
#include "SkStreamPriv.h"
#include "SkTemplates.h"
-#include "SkTo.h"
+#include "SkWebpCodec.h"
+#include "../jumper/SkJumper.h"
// A WebP decoder on top of (subset of) libwebp
// For more information on WebP image format, and libwebp library, see:
diff --git a/src/core/SkAAClip.cpp b/src/core/SkAAClip.cpp
index 46c09e0..fc8f771 100644
--- a/src/core/SkAAClip.cpp
+++ b/src/core/SkAAClip.cpp
@@ -6,7 +6,6 @@
*/
#include "SkAAClip.h"
-
#include "SkAtomics.h"
#include "SkBlitter.h"
#include "SkColorData.h"
@@ -14,7 +13,6 @@
#include "SkPath.h"
#include "SkRectPriv.h"
#include "SkScan.h"
-#include "SkTo.h"
#include "SkUtils.h"
class AutoAAClipValidate {
diff --git a/src/core/SkAlphaRuns.cpp b/src/core/SkAlphaRuns.cpp
index c5c4d15..37f57c1 100644
--- a/src/core/SkAlphaRuns.cpp
+++ b/src/core/SkAlphaRuns.cpp
@@ -5,8 +5,8 @@
* found in the LICENSE file.
*/
+
#include "SkAntiRun.h"
-#include "SkTo.h"
#include "SkUtils.h"
void SkAlphaRuns::reset(int width) {
diff --git a/src/core/SkAnalyticEdge.cpp b/src/core/SkAnalyticEdge.cpp
index 60c956a..e2da090 100644
--- a/src/core/SkAnalyticEdge.cpp
+++ b/src/core/SkAnalyticEdge.cpp
@@ -5,11 +5,10 @@
* found in the LICENSE file.
*/
-#include "SkAnalyticEdge.h"
+#include "SkAnalyticEdge.h"
#include "SkFDot6.h"
#include "SkMathPriv.h"
-#include "SkTo.h"
// This will become a bottleneck for small ovals rendering if we call SkFixedDiv twice here.
// Therefore, we'll let the outter function compute the slope once and send in the value.
diff --git a/src/core/SkAnalyticEdge.h b/src/core/SkAnalyticEdge.h
index b18ccac..5e8403f 100644
--- a/src/core/SkAnalyticEdge.h
+++ b/src/core/SkAnalyticEdge.h
@@ -9,7 +9,6 @@
#define SkAnalyticEdge_DEFINED
#include "SkEdge.h"
-#include "SkTo.h"
struct SkAnalyticEdge {
// Similar to SkEdge, the conic edges will be converted to quadratic edges
diff --git a/src/core/SkAntiRun.h b/src/core/SkAntiRun.h
index 92aabff..8b19036 100644
--- a/src/core/SkAntiRun.h
+++ b/src/core/SkAntiRun.h
@@ -5,11 +5,11 @@
* found in the LICENSE file.
*/
+
#ifndef SkAntiRun_DEFINED
#define SkAntiRun_DEFINED
#include "SkBlitter.h"
-#include "SkTo.h"
/** Sparse array of run-length-encoded alpha (supersampling coverage) values.
Sparseness allows us to independently compose several paths into the
diff --git a/src/core/SkBitmap.cpp b/src/core/SkBitmap.cpp
index 14bbe76..29a1a56 100644
--- a/src/core/SkBitmap.cpp
+++ b/src/core/SkBitmap.cpp
@@ -5,9 +5,8 @@
* found in the LICENSE file.
*/
-#include "SkBitmap.h"
-
#include "SkAtomics.h"
+#include "SkBitmap.h"
#include "SkColorData.h"
#include "SkConvertPixels.h"
#include "SkData.h"
@@ -24,7 +23,6 @@
#include "SkRect.h"
#include "SkScalar.h"
#include "SkTemplates.h"
-#include "SkTo.h"
#include "SkUnPreMultiply.h"
#include "SkWriteBuffer.h"
#include "SkWritePixelsRec.h"
diff --git a/src/core/SkBitmapProcState_matrixProcs.cpp b/src/core/SkBitmapProcState_matrixProcs.cpp
index 2fd1b9b..f9e3c82 100644
--- a/src/core/SkBitmapProcState_matrixProcs.cpp
+++ b/src/core/SkBitmapProcState_matrixProcs.cpp
@@ -14,11 +14,10 @@
*/
#include "SkBitmapProcState.h"
-#include "SkBitmapProcState_utils.h"
#include "SkShader.h"
-#include "SkTo.h"
#include "SkUtils.h"
#include "SkUtilsArm.h"
+#include "SkBitmapProcState_utils.h"
/* returns 0...(n-1) given any x (positive or negative).
diff --git a/src/core/SkBitmapProcState_utils.h b/src/core/SkBitmapProcState_utils.h
index b40b45c..ec35ca1 100644
--- a/src/core/SkBitmapProcState_utils.h
+++ b/src/core/SkBitmapProcState_utils.h
@@ -8,8 +8,6 @@
#ifndef SkBitmapProcState_utils_DEFINED
#define SkBitmapProcState_utils_DEFINED
-#include "SkTo.h"
-
// Helper to ensure that when we shift down, we do it w/o sign-extension
// so the caller doesn't have to manually mask off the top 16 bits
//
diff --git a/src/core/SkBlitter.cpp b/src/core/SkBlitter.cpp
index 7a45981..ee6100a 100644
--- a/src/core/SkBlitter.cpp
+++ b/src/core/SkBlitter.cpp
@@ -5,23 +5,21 @@
* found in the LICENSE file.
*/
-#include "SkBlitter.h"
-
-#include "SkAntiRun.h"
#include "SkArenaAlloc.h"
+#include "SkBlitter.h"
+#include "SkAntiRun.h"
#include "SkColor.h"
#include "SkColorFilter.h"
+#include "SkReadBuffer.h"
+#include "SkWriteBuffer.h"
#include "SkMask.h"
#include "SkMaskFilterBase.h"
#include "SkPaintPriv.h"
-#include "SkReadBuffer.h"
#include "SkRegionPriv.h"
#include "SkShaderBase.h"
#include "SkString.h"
#include "SkTLazy.h"
-#include "SkTo.h"
#include "SkUtils.h"
-#include "SkWriteBuffer.h"
#include "SkXfermodeInterpretation.h"
SkBlitter::~SkBlitter() {}
diff --git a/src/core/SkBlitter.h b/src/core/SkBlitter.h
index fc3bf8b..cf3edd3 100644
--- a/src/core/SkBlitter.h
+++ b/src/core/SkBlitter.h
@@ -15,7 +15,6 @@
#include "SkRect.h"
#include "SkRegion.h"
#include "SkShaderBase.h"
-#include "SkTo.h"
class SkArenaAlloc;
class SkMatrix;
diff --git a/src/core/SkBlurMask.cpp b/src/core/SkBlurMask.cpp
index b36bc0c..4b8293c 100644
--- a/src/core/SkBlurMask.cpp
+++ b/src/core/SkBlurMask.cpp
@@ -5,15 +5,15 @@
* found in the LICENSE file.
*/
-#include "SkBlurMask.h"
-#include "SkTo.h"
+#include "SkBlurMask.h"
#include "SkColorPriv.h"
#include "SkMaskBlurFilter.h"
#include "SkMath.h"
#include "SkTemplates.h"
#include "SkEndian.h"
+
// This constant approximates the scaling done in the software path's
// "high quality" mode, in SkBlurMask::Blur() (1 / sqrt(3)).
// IMHO, it actually should be 1: we blur "less" than we should do
diff --git a/src/core/SkBuffer.h b/src/core/SkBuffer.h
index 0338e76..7dfe2bb 100644
--- a/src/core/SkBuffer.h
+++ b/src/core/SkBuffer.h
@@ -5,11 +5,10 @@
* found in the LICENSE file.
*/
+
#ifndef SkBuffer_DEFINED
#define SkBuffer_DEFINED
-#include <limits>
-
#include "SkSafeMath.h"
#include "SkScalar.h"
#include "SkTypes.h"
diff --git a/src/core/SkCanvas.cpp b/src/core/SkCanvas.cpp
index 494bd3b..8494bdb 100644
--- a/src/core/SkCanvas.cpp
+++ b/src/core/SkCanvas.cpp
@@ -5,55 +5,53 @@
* found in the LICENSE file.
*/
-#include "SkCanvas.h"
-
#include "SkArenaAlloc.h"
#include "SkBitmapDevice.h"
+#include "SkCanvas.h"
#include "SkCanvasPriv.h"
-#include "SkClipOpPriv.h"
#include "SkClipStack.h"
#include "SkColorFilter.h"
#include "SkDraw.h"
+#include "SkDrawable.h"
#include "SkDrawFilter.h"
#include "SkDrawLooper.h"
-#include "SkDrawable.h"
#include "SkGlyphCache.h"
#include "SkGlyphRun.h"
#include "SkImage.h"
+#include "SkImage_Base.h"
#include "SkImageFilter.h"
#include "SkImageFilterCache.h"
-#include "SkImage_Base.h"
#include "SkLatticeIter.h"
-#include "SkMSAN.h"
#include "SkMakeUnique.h"
#include "SkMatrixUtils.h"
#include "SkMetaData.h"
+#include "SkMSAN.h"
#include "SkNoDrawCanvas.h"
#include "SkNx.h"
#include "SkPaintPriv.h"
#include "SkPatchUtils.h"
#include "SkPathEffect.h"
#include "SkPicture.h"
-#include "SkRRect.h"
#include "SkRasterClip.h"
#include "SkRasterHandleAllocator.h"
+#include "SkRRect.h"
#include "SkSpecialImage.h"
#include "SkStrikeCache.h"
#include "SkString.h"
#include "SkSurface_Base.h"
-#include "SkTLazy.h"
#include "SkTextBlob.h"
#include "SkTextFormatParams.h"
-#include "SkTo.h"
+#include "SkTLazy.h"
#include "SkTraceEvent.h"
-#include "SkVertices.h"
-
#include <new>
#if SK_SUPPORT_GPU
#include "GrContext.h"
#include "SkGr.h"
+
#endif
+#include "SkClipOpPriv.h"
+#include "SkVertices.h"
#define RETURN_ON_NULL(ptr) do { if (nullptr == (ptr)) return; } while (0)
#define RETURN_ON_FALSE(pred) do { if (!(pred)) return; } while (0)
diff --git a/src/core/SkColorData.h b/src/core/SkColorData.h
index 3e61c18..3fc0113 100644
--- a/src/core/SkColorData.h
+++ b/src/core/SkColorData.h
@@ -15,7 +15,6 @@
#include "SkColor.h"
#include "SkColorPriv.h"
-#include "SkTo.h"
//////////////////////////////////////////////////////////////////////////////
diff --git a/src/core/SkDescriptor.h b/src/core/SkDescriptor.h
index 7f1939d..84672e5 100644
--- a/src/core/SkDescriptor.h
+++ b/src/core/SkDescriptor.h
@@ -10,9 +10,7 @@
#include "SkMacros.h"
#include "SkOpts.h"
-#include "SkTo.h"
#include "SkTypes.h"
-
#include <memory>
#include <new>
diff --git a/src/core/SkDevice.cpp b/src/core/SkDevice.cpp
index aea08c5..aa9b1e2 100644
--- a/src/core/SkDevice.cpp
+++ b/src/core/SkDevice.cpp
@@ -6,7 +6,6 @@
*/
#include "SkDevice.h"
-
#include "SkColorFilter.h"
#include "SkDraw.h"
#include "SkDrawFilter.h"
@@ -29,7 +28,6 @@
#include "SkTLazy.h"
#include "SkTextBlobRunIterator.h"
#include "SkTextToPathIter.h"
-#include "SkTo.h"
#include "SkUtils.h"
#include "SkVertices.h"
diff --git a/src/core/SkDraw.cpp b/src/core/SkDraw.cpp
index 58489b9..69eadbe 100644
--- a/src/core/SkDraw.cpp
+++ b/src/core/SkDraw.cpp
@@ -5,7 +5,7 @@
* found in the LICENSE file.
*/
-#include "SkDraw.h"
+#define __STDC_LIMIT_MACROS
#include "SkArenaAlloc.h"
#include "SkAutoBlitterChoose.h"
@@ -14,6 +14,7 @@
#include "SkCanvas.h"
#include "SkColorData.h"
#include "SkDevice.h"
+#include "SkDraw.h"
#include "SkDrawProcs.h"
#include "SkFindAndPlaceGlyph.h"
#include "SkMaskFilterBase.h"
@@ -23,20 +24,19 @@
#include "SkPaint.h"
#include "SkPathEffect.h"
#include "SkPathPriv.h"
-#include "SkRRect.h"
#include "SkRasterClip.h"
#include "SkRectPriv.h"
+#include "SkRRect.h"
#include "SkScalerContext.h"
#include "SkScan.h"
#include "SkShader.h"
#include "SkString.h"
#include "SkStroke.h"
#include "SkStrokeRec.h"
-#include "SkTLazy.h"
#include "SkTemplates.h"
#include "SkTextMapStateProc.h"
#include "SkThreadedBMPDevice.h"
-#include "SkTo.h"
+#include "SkTLazy.h"
#include "SkUtils.h"
static SkPaint make_paint_with_image(
diff --git a/src/core/SkEdge.cpp b/src/core/SkEdge.cpp
index 0a19e53..1bb8e9e 100644
--- a/src/core/SkEdge.cpp
+++ b/src/core/SkEdge.cpp
@@ -5,11 +5,10 @@
* found in the LICENSE file.
*/
-#include "SkEdge.h"
+#include "SkEdge.h"
#include "SkFDot6.h"
#include "SkMathPriv.h"
-#include "SkTo.h"
/*
In setLine, setQuadratic, setCubic, the first thing we do is to convert
diff --git a/src/core/SkEdge.h b/src/core/SkEdge.h
index 7fc6851..509c0c4 100644
--- a/src/core/SkEdge.h
+++ b/src/core/SkEdge.h
@@ -5,13 +5,13 @@
* found in the LICENSE file.
*/
+
#ifndef SkEdge_DEFINED
#define SkEdge_DEFINED
+#include "SkRect.h"
#include "SkFDot6.h"
#include "SkMath.h"
-#include "SkRect.h"
-#include "SkTo.h"
// This correctly favors the lower-pixel when y0 is on a 1/2 pixel boundary
#define SkEdge_Compute_DY(top, y0) (SkLeftShift(top, 6) + 32 - (y0))
diff --git a/src/core/SkEdgeBuilder.cpp b/src/core/SkEdgeBuilder.cpp
index 48c1bca..b7d80b0 100644
--- a/src/core/SkEdgeBuilder.cpp
+++ b/src/core/SkEdgeBuilder.cpp
@@ -4,17 +4,14 @@
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
-
#include "SkEdgeBuilder.h"
-
-#include "SkAnalyticEdge.h"
#include "SkEdge.h"
+#include "SkAnalyticEdge.h"
#include "SkEdgeClipper.h"
-#include "SkGeometry.h"
#include "SkLineClipper.h"
+#include "SkGeometry.h"
#include "SkPath.h"
#include "SkPathPriv.h"
-#include "SkTo.h"
///////////////////////////////////////////////////////////////////////////////
diff --git a/src/core/SkFDot6.h b/src/core/SkFDot6.h
index 57e7d6a..0046661 100644
--- a/src/core/SkFDot6.h
+++ b/src/core/SkFDot6.h
@@ -5,13 +5,13 @@
* found in the LICENSE file.
*/
+
#ifndef SkFDot6_DEFINED
#define SkFDot6_DEFINED
#include "SkFixed.h"
-#include "SkMath.h"
#include "SkScalar.h"
-#include "SkTo.h"
+#include "SkMath.h"
typedef int32_t SkFDot6;
diff --git a/src/core/SkFont.cpp b/src/core/SkFont.cpp
index bde8c4c..77259ff 100644
--- a/src/core/SkFont.cpp
+++ b/src/core/SkFont.cpp
@@ -6,8 +6,6 @@
*/
#include "SkFont.h"
-
-#include "SkTo.h"
#include "SkTypeface.h"
#include "SkUtils.h"
diff --git a/src/core/SkGlyph.h b/src/core/SkGlyph.h
index 2b3adaf..06c0e42 100644
--- a/src/core/SkGlyph.h
+++ b/src/core/SkGlyph.h
@@ -12,7 +12,6 @@
#include "SkChecksum.h"
#include "SkFixed.h"
#include "SkMask.h"
-#include "SkTo.h"
#include "SkTypes.h"
class SkPath;
diff --git a/src/core/SkGlyphRun.cpp b/src/core/SkGlyphRun.cpp
index caea07a..6209b58 100644
--- a/src/core/SkGlyphRun.cpp
+++ b/src/core/SkGlyphRun.cpp
@@ -14,12 +14,11 @@
#include "SkDevice.h"
#include "SkDraw.h"
#include "SkGlyphCache.h"
-#include "SkMSAN.h"
#include "SkMakeUnique.h"
+#include "SkMSAN.h"
#include "SkPaint.h"
#include "SkPaintPriv.h"
#include "SkStrikeCache.h"
-#include "SkTo.h"
#include "SkUtils.h"
static SkTypeface::Encoding convert_encoding(SkPaint::TextEncoding encoding) {
diff --git a/src/core/SkIPoint16.h b/src/core/SkIPoint16.h
index 735f167..27052b3 100644
--- a/src/core/SkIPoint16.h
+++ b/src/core/SkIPoint16.h
@@ -8,7 +8,6 @@
#ifndef SkIPoint16_DEFINED
#define SkIPoint16_DEFINED
-#include "SkTo.h"
#include "SkTypes.h"
/** \struct SkIPoint16
diff --git a/src/core/SkLineClipper.cpp b/src/core/SkLineClipper.cpp
index 73a1819..62da6d0 100644
--- a/src/core/SkLineClipper.cpp
+++ b/src/core/SkLineClipper.cpp
@@ -6,7 +6,6 @@
*/
#include "SkLineClipper.h"
-#include "SkTo.h"
template <typename T> T pin_unsorted(T value, T limit0, T limit1) {
if (limit1 < limit0) {
diff --git a/src/core/SkMD5.h b/src/core/SkMD5.h
index 5ae14e1..8838d47 100644
--- a/src/core/SkMD5.h
+++ b/src/core/SkMD5.h
@@ -9,7 +9,6 @@
#define SkMD5_DEFINED
#include "SkStream.h"
-#include "SkTo.h"
/* Calculate a 128-bit MD5 message-digest of the bytes sent to this stream. */
class SkMD5 : public SkWStream {
diff --git a/src/core/SkMask.cpp b/src/core/SkMask.cpp
index 7336116..b3a6543 100644
--- a/src/core/SkMask.cpp
+++ b/src/core/SkMask.cpp
@@ -6,10 +6,8 @@
*/
#include "SkMask.h"
-
#include "SkMalloc.h"
#include "SkSafeMath.h"
-#include "SkTo.h"
/** returns the product if it is positive and fits in 31 bits. Otherwise this
returns 0.
diff --git a/src/core/SkMaskBlurFilter.cpp b/src/core/SkMaskBlurFilter.cpp
index 2c8cda5..ea3d8ab 100644
--- a/src/core/SkMaskBlurFilter.cpp
+++ b/src/core/SkMaskBlurFilter.cpp
@@ -5,15 +5,13 @@
* found in the LICENSE file.
*/
-#include "SkMaskBlurFilter.h"
-
#include "SkArenaAlloc.h"
#include "SkColorPriv.h"
#include "SkGaussFilter.h"
#include "SkMalloc.h"
+#include "SkMaskBlurFilter.h"
#include "SkNx.h"
#include "SkTemplates.h"
-#include "SkTo.h"
#include <cmath>
#include <climits>
diff --git a/src/core/SkMaskGamma.cpp b/src/core/SkMaskGamma.cpp
index e231d92..bbe72c4 100644
--- a/src/core/SkMaskGamma.cpp
+++ b/src/core/SkMaskGamma.cpp
@@ -5,12 +5,11 @@
* found in the LICENSE file.
*/
-#include "SkMaskGamma.h"
+#include "SkTypes.h"
#include "SkColor.h"
#include "SkFloatingPoint.h"
-#include "SkTo.h"
-#include "SkTypes.h"
+#include "SkMaskGamma.h"
class SkLinearColorSpaceLuminance : public SkColorSpaceLuminance {
SkScalar toLuma(SkScalar SkDEBUGCODE(gamma), SkScalar luminance) const override {
diff --git a/src/core/SkMatrix.cpp b/src/core/SkMatrix.cpp
index cb4b792..d3bdb38 100644
--- a/src/core/SkMatrix.cpp
+++ b/src/core/SkMatrix.cpp
@@ -5,8 +5,6 @@
* found in the LICENSE file.
*/
-#include "SkMatrix.h"
-
#include "SkFloatBits.h"
#include "SkMathPriv.h"
#include "SkMatrixPriv.h"
@@ -15,7 +13,6 @@
#include "SkPoint3.h"
#include "SkRSXform.h"
#include "SkString.h"
-#include "SkTo.h"
#include <stddef.h>
static void normalize_perspective(SkScalar mat[9]) {
diff --git a/src/core/SkMetaData.cpp b/src/core/SkMetaData.cpp
index e960321..d1564e9 100644
--- a/src/core/SkMetaData.cpp
+++ b/src/core/SkMetaData.cpp
@@ -5,11 +5,11 @@
* found in the LICENSE file.
*/
+
#include "SkMetaData.h"
#include "SkMalloc.h"
#include "SkRefCnt.h"
-#include "SkTo.h"
struct PtrPair {
void* fPtr;
diff --git a/src/core/SkMipMap.cpp b/src/core/SkMipMap.cpp
index f569682..edb800f 100644
--- a/src/core/SkMipMap.cpp
+++ b/src/core/SkMipMap.cpp
@@ -6,7 +6,6 @@
*/
#include "SkMipMap.h"
-
#include "SkBitmap.h"
#include "SkColorData.h"
#include "SkHalf.h"
@@ -15,7 +14,6 @@
#include "SkNx.h"
#include "SkPM4fPriv.h"
#include "SkSRGB.h"
-#include "SkTo.h"
#include "SkTypes.h"
#include <new>
diff --git a/src/core/SkNx.h b/src/core/SkNx.h
index 1636dde..9536540 100644
--- a/src/core/SkNx.h
+++ b/src/core/SkNx.h
@@ -11,8 +11,6 @@
#include "SkSafe_math.h"
#include "SkScalar.h"
#include "SkTypes.h"
-
-#include <algorithm>
#include <limits>
#include <type_traits>
diff --git a/src/core/SkOverdrawCanvas.cpp b/src/core/SkOverdrawCanvas.cpp
index 25bc7fb..e5bf5a6 100644
--- a/src/core/SkOverdrawCanvas.cpp
+++ b/src/core/SkOverdrawCanvas.cpp
@@ -5,14 +5,13 @@
* found in the LICENSE file.
*/
-#include "SkOverdrawCanvas.h"
-
#include "SkColorFilter.h"
-#include "SkDrawShadowInfo.h"
#include "SkDrawable.h"
+#include "SkDrawShadowInfo.h"
#include "SkFindAndPlaceGlyph.h"
#include "SkImagePriv.h"
#include "SkLatticeIter.h"
+#include "SkOverdrawCanvas.h"
#include "SkPatchUtils.h"
#include "SkPath.h"
#include "SkRRect.h"
@@ -20,7 +19,6 @@
#include "SkStrikeCache.h"
#include "SkTextBlob.h"
#include "SkTextBlobRunIterator.h"
-#include "SkTo.h"
namespace {
class ProcessOneGlyphBounds {
diff --git a/src/core/SkPaint.cpp b/src/core/SkPaint.cpp
index 7643bab..c76b981 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;
diff --git a/src/core/SkPath.cpp b/src/core/SkPath.cpp
index e38d736..d80ceee 100644
--- a/src/core/SkPath.cpp
+++ b/src/core/SkPath.cpp
@@ -5,8 +5,7 @@
* found in the LICENSE file.
*/
-#include "SkPath.h"
-
+#include <cmath>
#include "SkBuffer.h"
#include "SkCubicClipper.h"
#include "SkData.h"
@@ -19,9 +18,6 @@
#include "SkPointPriv.h"
#include "SkRRect.h"
#include "SkSafeMath.h"
-#include "SkTo.h"
-
-#include <cmath>
static float poly_eval(float A, float B, float C, float t) {
return (A * t + B) * t + C;
diff --git a/src/core/SkPathRef.cpp b/src/core/SkPathRef.cpp
index 20d3131..58782df 100644
--- a/src/core/SkPathRef.cpp
+++ b/src/core/SkPathRef.cpp
@@ -5,15 +5,13 @@
* found in the LICENSE file.
*/
-#include "SkPathRef.h"
-
#include "SkBuffer.h"
#include "SkNx.h"
#include "SkOnce.h"
#include "SkPath.h"
+#include "SkPathRef.h"
#include "SkPathPriv.h"
#include "SkSafeMath.h"
-#include "SkTo.h"
// Conic weights must be 0 < weight <= finite
static bool validate_conic_weights(const SkScalar weights[], int count) {
diff --git a/src/core/SkPath_serial.cpp b/src/core/SkPath_serial.cpp
index 6a372e6..e538a46 100644
--- a/src/core/SkPath_serial.cpp
+++ b/src/core/SkPath_serial.cpp
@@ -5,6 +5,7 @@
* found in the LICENSE file.
*/
+#include <cmath>
#include "SkBuffer.h"
#include "SkData.h"
#include "SkMath.h"
@@ -12,9 +13,6 @@
#include "SkPathRef.h"
#include "SkRRect.h"
#include "SkSafeMath.h"
-#include "SkTo.h"
-
-#include <cmath>
enum SerializationOffsets {
kType_SerializationShift = 28, // requires 4 bits
diff --git a/src/core/SkPicture.cpp b/src/core/SkPicture.cpp
index ad83031..34fa558 100644
--- a/src/core/SkPicture.cpp
+++ b/src/core/SkPicture.cpp
@@ -5,8 +5,6 @@
* found in the LICENSE file.
*/
-#include "SkPicture.h"
-
#include "SkAtomics.h"
#include "SkImageGenerator.h"
#include "SkMathPriv.h"
@@ -17,7 +15,6 @@
#include "SkPictureRecord.h"
#include "SkPictureRecorder.h"
#include "SkSerialProcs.h"
-#include "SkTo.h"
// When we read/write the SkPictInfo via a stream, we have a sentinel byte right after the info.
// Note: in the read/write buffer versions, we have a slightly different convention:
diff --git a/src/core/SkPictureData.cpp b/src/core/SkPictureData.cpp
index bd2be63..3d34b27 100644
--- a/src/core/SkPictureData.cpp
+++ b/src/core/SkPictureData.cpp
@@ -5,20 +5,18 @@
* found in the LICENSE file.
*/
-#include "SkPictureData.h"
+#include <new>
#include "SkAutoMalloc.h"
#include "SkImageGenerator.h"
#include "SkMakeUnique.h"
+#include "SkPictureData.h"
#include "SkPictureRecord.h"
#include "SkPicturePriv.h"
#include "SkReadBuffer.h"
#include "SkTextBlob.h"
#include "SkTypeface.h"
#include "SkWriteBuffer.h"
-#include "SkTo.h"
-
-#include <new>
#if SK_SUPPORT_GPU
#include "GrContext.h"
diff --git a/src/core/SkPictureRecord.cpp b/src/core/SkPictureRecord.cpp
index 87c8c4d..32748c1 100644
--- a/src/core/SkPictureRecord.cpp
+++ b/src/core/SkPictureRecord.cpp
@@ -6,9 +6,7 @@
*/
#include "SkPictureRecord.h"
-
#include "SkCanvasPriv.h"
-#include "SkClipOpPriv.h"
#include "SkDrawShadowInfo.h"
#include "SkImage_Base.h"
#include "SkMatrixPriv.h"
@@ -16,9 +14,9 @@
#include "SkPixelRef.h"
#include "SkRRect.h"
#include "SkRSXform.h"
-#include "SkTSearch.h"
#include "SkTextBlob.h"
-#include "SkTo.h"
+#include "SkTSearch.h"
+#include "SkClipOpPriv.h"
#define HEAP_BLOCK_SIZE 4096
diff --git a/src/core/SkPictureRecord.h b/src/core/SkPictureRecord.h
index ad2dbdf..9490f53 100644
--- a/src/core/SkPictureRecord.h
+++ b/src/core/SkPictureRecord.h
@@ -16,7 +16,6 @@
#include "SkTArray.h"
#include "SkTDArray.h"
#include "SkTHash.h"
-#include "SkTo.h"
#include "SkVertices.h"
#include "SkWriter32.h"
diff --git a/src/core/SkPixmap.cpp b/src/core/SkPixmap.cpp
index aad9e34..446f25b 100644
--- a/src/core/SkPixmap.cpp
+++ b/src/core/SkPixmap.cpp
@@ -5,16 +5,14 @@
* found in the LICENSE file.
*/
-#include "SkPixmap.h"
-
#include "SkBitmap.h"
#include "SkCanvas.h"
#include "SkColorData.h"
#include "SkConvertPixels.h"
#include "SkData.h"
-#include "SkHalf.h"
#include "SkImageInfoPriv.h"
#include "SkImageShader.h"
+#include "SkHalf.h"
#include "SkMask.h"
#include "SkNx.h"
#include "SkPM4f.h"
@@ -22,7 +20,6 @@
#include "SkReadPixelsRec.h"
#include "SkSurface.h"
#include "SkTemplates.h"
-#include "SkTo.h"
#include "SkUnPreMultiply.h"
#include "SkUtils.h"
diff --git a/src/core/SkRWBuffer.cpp b/src/core/SkRWBuffer.cpp
index 69e4a2e..ef33f91 100644
--- a/src/core/SkRWBuffer.cpp
+++ b/src/core/SkRWBuffer.cpp
@@ -8,10 +8,9 @@
#include "SkRWBuffer.h"
#include "SkAtomics.h"
-#include "SkMakeUnique.h"
#include "SkMalloc.h"
+#include "SkMakeUnique.h"
#include "SkStream.h"
-#include "SkTo.h"
#include <atomic>
#include <new>
diff --git a/src/core/SkRasterPipelineBlitter.cpp b/src/core/SkRasterPipelineBlitter.cpp
index 8b37bef..aa6b6e9 100644
--- a/src/core/SkRasterPipelineBlitter.cpp
+++ b/src/core/SkRasterPipelineBlitter.cpp
@@ -5,10 +5,9 @@
* found in the LICENSE file.
*/
-#include "../jumper/SkJumper.h"
#include "SkArenaAlloc.h"
-#include "SkBlendModePriv.h"
#include "SkBlitter.h"
+#include "SkBlendModePriv.h"
#include "SkColor.h"
#include "SkColorFilter.h"
#include "SkColorSpaceXformer.h"
@@ -18,8 +17,8 @@
#include "SkRasterPipeline.h"
#include "SkShader.h"
#include "SkShaderBase.h"
-#include "SkTo.h"
#include "SkUtils.h"
+#include "../jumper/SkJumper.h"
class SkRasterPipelineBlitter final : public SkBlitter {
public:
diff --git a/src/core/SkRecorder.cpp b/src/core/SkRecorder.cpp
index 65dcd7b..7d8a849 100644
--- a/src/core/SkRecorder.cpp
+++ b/src/core/SkRecorder.cpp
@@ -5,16 +5,13 @@
* found in the LICENSE file.
*/
-#include "SkRecorder.h"
-
#include "SkBigPicture.h"
#include "SkCanvasPriv.h"
#include "SkImage.h"
#include "SkPatchUtils.h"
#include "SkPicture.h"
+#include "SkRecorder.h"
#include "SkSurface.h"
-#include "SkTo.h"
-
#include <new>
SkDrawableList::~SkDrawableList() {
diff --git a/src/core/SkRegion.cpp b/src/core/SkRegion.cpp
index 3d48f36..1330067 100644
--- a/src/core/SkRegion.cpp
+++ b/src/core/SkRegion.cpp
@@ -5,14 +5,12 @@
* found in the LICENSE file.
*/
-#include "SkRegion.h"
#include "SkAtomics.h"
#include "SkMacros.h"
#include "SkRegionPriv.h"
#include "SkSafeMath.h"
#include "SkTemplates.h"
-#include "SkTo.h"
#include "SkUtils.h"
/* Region Layout
diff --git a/src/core/SkRegionPriv.h b/src/core/SkRegionPriv.h
index e0e46b2..08db564 100644
--- a/src/core/SkRegionPriv.h
+++ b/src/core/SkRegionPriv.h
@@ -5,6 +5,7 @@
* found in the LICENSE file.
*/
+
#ifndef SkRegionPriv_DEFINED
#define SkRegionPriv_DEFINED
@@ -12,7 +13,6 @@
#include "SkAtomics.h"
#include "SkMalloc.h"
-#include "SkTo.h"
inline bool SkRegionValueIsSentinel(int32_t value) {
return value == (int32_t)SkRegion::kRunTypeSentinel;
diff --git a/src/core/SkRegion_path.cpp b/src/core/SkRegion_path.cpp
index e54e251..4fb6826 100644
--- a/src/core/SkRegion_path.cpp
+++ b/src/core/SkRegion_path.cpp
@@ -5,14 +5,13 @@
* found in the LICENSE file.
*/
-#include "SkBlitter.h"
-#include "SkPath.h"
#include "SkRegionPriv.h"
+#include "SkBlitter.h"
#include "SkSafeMath.h"
#include "SkScan.h"
-#include "SkTDArray.h"
#include "SkTSort.h"
-#include "SkTo.h"
+#include "SkTDArray.h"
+#include "SkPath.h"
// The rgnbuilder caller *seems* to pass short counts, possible often seens early failure, so
// we may not want to promote this to a "std" routine just yet.
diff --git a/src/core/SkResourceCache.cpp b/src/core/SkResourceCache.cpp
index 0e8ceb1..5928b48 100644
--- a/src/core/SkResourceCache.cpp
+++ b/src/core/SkResourceCache.cpp
@@ -5,14 +5,12 @@
* found in the LICENSE file.
*/
-#include "SkResourceCache.h"
-
#include "SkDiscardableMemory.h"
#include "SkMessageBus.h"
#include "SkMipMap.h"
#include "SkMutex.h"
#include "SkOpts.h"
-#include "SkTo.h"
+#include "SkResourceCache.h"
#include "SkTraceMemoryDump.h"
#include <stddef.h>
diff --git a/src/core/SkSafeMath.h b/src/core/SkSafeMath.h
index c092272..f54be32 100644
--- a/src/core/SkSafeMath.h
+++ b/src/core/SkSafeMath.h
@@ -8,7 +8,6 @@
#ifndef SkSafeMath_DEFINED
#define SkSafeMath_DEFINED
-#include "SkTFitsIn.h"
#include "SkTypes.h"
#include <limits>
diff --git a/src/core/SkScalerContext.cpp b/src/core/SkScalerContext.cpp
index 3089ee9..b4a3565 100644
--- a/src/core/SkScalerContext.cpp
+++ b/src/core/SkScalerContext.cpp
@@ -29,7 +29,6 @@
#include "SkStrokeRec.h"
#include "SkSurfacePriv.h"
#include "SkTextFormatParams.h"
-#include "SkTo.h"
#include "SkWriteBuffer.h"
#include <new>
diff --git a/src/core/SkScan_AAAPath.cpp b/src/core/SkScan_AAAPath.cpp
index bd649e7..5e7f232 100644
--- a/src/core/SkScan_AAAPath.cpp
+++ b/src/core/SkScan_AAAPath.cpp
@@ -20,7 +20,6 @@
#include "SkScanPriv.h"
#include "SkTSort.h"
#include "SkTemplates.h"
-#include "SkTo.h"
#include "SkUtils.h"
///////////////////////////////////////////////////////////////////////////////
diff --git a/src/core/SkScan_AntiPath.cpp b/src/core/SkScan_AntiPath.cpp
index 9c64f32..45bc2e2 100644
--- a/src/core/SkScan_AntiPath.cpp
+++ b/src/core/SkScan_AntiPath.cpp
@@ -5,16 +5,15 @@
* found in the LICENSE file.
*/
-#include "SkScanPriv.h"
-#include "SkAntiRun.h"
-#include "SkBlitter.h"
-#include "SkCoverageDelta.h"
-#include "SkMatrix.h"
+#include "SkScanPriv.h"
#include "SkPath.h"
#include "SkPathPriv.h"
+#include "SkMatrix.h"
+#include "SkBlitter.h"
#include "SkRegion.h"
-#include "SkTo.h"
+#include "SkAntiRun.h"
+#include "SkCoverageDelta.h"
#define SHIFT SK_SUPERSAMPLE_SHIFT
#define SCALE (1 << SHIFT)
diff --git a/src/core/SkScan_Antihair.cpp b/src/core/SkScan_Antihair.cpp
index 37faed4..a552253 100644
--- a/src/core/SkScan_Antihair.cpp
+++ b/src/core/SkScan_Antihair.cpp
@@ -5,14 +5,13 @@
* found in the LICENSE file.
*/
-#include "SkScan.h"
+#include "SkScan.h"
#include "SkBlitter.h"
#include "SkColorData.h"
-#include "SkFDot6.h"
#include "SkLineClipper.h"
#include "SkRasterClip.h"
-#include "SkTo.h"
+#include "SkFDot6.h"
/* Our attempt to compute the worst case "bounds" for the horizontal and
vertical cases has some numerical bug in it, and we sometimes undervalue
diff --git a/src/core/SkStream.cpp b/src/core/SkStream.cpp
index f8f4350..57fd7f5 100644
--- a/src/core/SkStream.cpp
+++ b/src/core/SkStream.cpp
@@ -6,17 +6,15 @@
*/
#include "SkStream.h"
-
+#include "SkStreamPriv.h"
#include "SkData.h"
#include "SkFixed.h"
#include "SkMakeUnique.h"
-#include "SkOSFile.h"
#include "SkSafeMath.h"
-#include "SkStreamPriv.h"
#include "SkString.h"
-#include "SkTFitsIn.h"
-#include "SkTo.h"
+#include "SkOSFile.h"
#include "SkTypes.h"
+#include "SkTFitsIn.h"
#include <limits>
diff --git a/src/core/SkString.cpp b/src/core/SkString.cpp
index 7820f1d..a6d9335 100644
--- a/src/core/SkString.cpp
+++ b/src/core/SkString.cpp
@@ -5,13 +5,10 @@
* found in the LICENSE file.
*/
-#include "SkString.h"
-
#include "SkAtomics.h"
#include "SkSafeMath.h"
-#include "SkTo.h"
+#include "SkString.h"
#include "SkUtils.h"
-
#include <cstdio>
#include <new>
#include <stdarg.h>
diff --git a/src/core/SkStroke.cpp b/src/core/SkStroke.cpp
index bb216d1..3452c77 100644
--- a/src/core/SkStroke.cpp
+++ b/src/core/SkStroke.cpp
@@ -6,12 +6,10 @@
*/
#include "SkStrokerPriv.h"
-
#include "SkGeometry.h"
#include "SkMacros.h"
#include "SkPathPriv.h"
#include "SkPointPriv.h"
-#include "SkTo.h"
enum {
kTangent_RecursiveLimit,
diff --git a/src/core/SkStroke.h b/src/core/SkStroke.h
index 189b5cf..b286572 100644
--- a/src/core/SkStroke.h
+++ b/src/core/SkStroke.h
@@ -8,11 +8,10 @@
#ifndef SkStroke_DEFINED
#define SkStroke_DEFINED
-#include "SkPaint.h"
#include "SkPath.h"
#include "SkPoint.h"
+#include "SkPaint.h"
#include "SkStrokerPriv.h"
-#include "SkTo.h"
#ifdef SK_DEBUG
extern bool gDebugStrokerErrorSet;
diff --git a/src/core/SkTSort.h b/src/core/SkTSort.h
index a97baf9..e76f5c9 100644
--- a/src/core/SkTSort.h
+++ b/src/core/SkTSort.h
@@ -5,12 +5,12 @@
* found in the LICENSE file.
*/
+
#ifndef SkTSort_DEFINED
#define SkTSort_DEFINED
-#include "SkMathPriv.h"
-#include "SkTo.h"
#include "SkTypes.h"
+#include "SkMathPriv.h"
/* A comparison functor which performs the comparison 'a < b'. */
template <typename T> struct SkTCompareLT {
diff --git a/src/core/SkTime.cpp b/src/core/SkTime.cpp
index b70b89c..7988925 100644
--- a/src/core/SkTime.cpp
+++ b/src/core/SkTime.cpp
@@ -5,13 +5,10 @@
* found in the LICENSE file.
*/
-#include "SkTime.h"
-
#include "SkLeanWindows.h"
#include "SkString.h"
-#include "SkTo.h"
+#include "SkTime.h"
#include "SkTypes.h"
-
#include <chrono>
void SkTime::DateTime::toISO8601(SkString* dst) const {
diff --git a/src/core/SkUtils.cpp b/src/core/SkUtils.cpp
index e6fafa0..0b92510 100644
--- a/src/core/SkUtils.cpp
+++ b/src/core/SkUtils.cpp
@@ -5,9 +5,8 @@
* found in the LICENSE file.
*/
-#include "SkUtils.h"
-#include "SkTo.h"
+#include "SkUtils.h"
/* 0xxxxxxx 1 total
10xxxxxx // never a leading byte
@@ -414,4 +413,4 @@
const char SkHexadecimalDigits::gUpper[16] =
{ '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F' };
const char SkHexadecimalDigits::gLower[16] =
- { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f' };
+ { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f' };
\ No newline at end of file
diff --git a/src/core/SkVertices.cpp b/src/core/SkVertices.cpp
index 4aa56c8..e23d65f 100644
--- a/src/core/SkVertices.cpp
+++ b/src/core/SkVertices.cpp
@@ -5,14 +5,12 @@
* found in the LICENSE file.
*/
-#include "SkVertices.h"
-
#include "SkAtomics.h"
+#include "SkVertices.h"
#include "SkData.h"
#include "SkReader32.h"
#include "SkSafeMath.h"
#include "SkSafeRange.h"
-#include "SkTo.h"
#include "SkWriter32.h"
#include <new>
diff --git a/src/core/SkWriteBuffer.cpp b/src/core/SkWriteBuffer.cpp
index a40e9ab..b793dbf 100644
--- a/src/core/SkWriteBuffer.cpp
+++ b/src/core/SkWriteBuffer.cpp
@@ -6,7 +6,6 @@
*/
#include "SkWriteBuffer.h"
-
#include "SkBitmap.h"
#include "SkData.h"
#include "SkDeduper.h"
@@ -15,7 +14,6 @@
#include "SkPixelRef.h"
#include "SkPtrRecorder.h"
#include "SkStream.h"
-#include "SkTo.h"
#include "SkTypeface.h"
///////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/src/core/SkWriter32.cpp b/src/core/SkWriter32.cpp
index b1638e4..3261aad 100644
--- a/src/core/SkWriter32.cpp
+++ b/src/core/SkWriter32.cpp
@@ -8,8 +8,6 @@
#include "SkMatrixPriv.h"
#include "SkReader32.h"
#include "SkString.h"
-#include "SkTo.h"
-
#include "SkWriter32.h"
void SkWriter32::writeMatrix(const SkMatrix& matrix) {
diff --git a/src/core/SkWriter32.h b/src/core/SkWriter32.h
index de33c5c..2143c6b 100644
--- a/src/core/SkWriter32.h
+++ b/src/core/SkWriter32.h
@@ -1,3 +1,4 @@
+
/*
* Copyright 2008 The Android Open Source Project
*
@@ -5,9 +6,11 @@
* found in the LICENSE file.
*/
+
#ifndef SkWriter32_DEFINED
#define SkWriter32_DEFINED
+#include "../private/SkTemplates.h"
#include "SkData.h"
#include "SkMatrix.h"
#include "SkPath.h"
@@ -18,8 +21,6 @@
#include "SkRegion.h"
#include "SkScalar.h"
#include "SkStream.h"
-#include "SkTemplates.h"
-#include "SkTo.h"
#include "SkTypes.h"
class SK_API SkWriter32 : SkNoncopyable {
diff --git a/src/effects/SkDashPathEffect.cpp b/src/effects/SkDashPathEffect.cpp
index 8301592..c1f5f0a 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 d4e3741..e081186 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 e465909..d2dfed9 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 12b8fbb..dc1c007 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 fa68d11..5dbc784 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"
diff --git a/src/gpu/GrClipStackClip.cpp b/src/gpu/GrClipStackClip.cpp
index 212aa36..92a6d04 100644
--- a/src/gpu/GrClipStackClip.cpp
+++ b/src/gpu/GrClipStackClip.cpp
@@ -13,19 +13,18 @@
#include "GrDrawingManager.h"
#include "GrFixedClip.h"
#include "GrGpuResourcePriv.h"
-#include "GrProxyProvider.h"
#include "GrRenderTargetContextPriv.h"
-#include "GrSWMaskHelper.h"
+#include "GrProxyProvider.h"
#include "GrStencilAttachment.h"
+#include "GrSWMaskHelper.h"
#include "GrTextureProxy.h"
-#include "SkClipOpPriv.h"
-#include "SkMakeUnique.h"
-#include "SkTaskGroup.h"
-#include "SkTo.h"
-#include "SkTraceEvent.h"
#include "effects/GrConvexPolyEffect.h"
#include "effects/GrRRectEffect.h"
#include "effects/GrTextureDomain.h"
+#include "SkClipOpPriv.h"
+#include "SkMakeUnique.h"
+#include "SkTaskGroup.h"
+#include "SkTraceEvent.h"
typedef SkClipStack::Element Element;
typedef GrReducedClip::InitialState InitialState;
diff --git a/src/gpu/GrPathProcessor.cpp b/src/gpu/GrPathProcessor.cpp
index 0b4354c..43c0bb0 100644
--- a/src/gpu/GrPathProcessor.cpp
+++ b/src/gpu/GrPathProcessor.cpp
@@ -6,9 +6,7 @@
*/
#include "GrPathProcessor.h"
-
#include "GrShaderCaps.h"
-#include "SkTo.h"
#include "gl/GrGLGpu.h"
#include "gl/GrGLVaryingHandler.h"
#include "glsl/GrGLSLFragmentShaderBuilder.h"
diff --git a/src/gpu/GrProgramDesc.cpp b/src/gpu/GrProgramDesc.cpp
index b73a439..0a558e0 100644
--- a/src/gpu/GrProgramDesc.cpp
+++ b/src/gpu/GrProgramDesc.cpp
@@ -4,9 +4,7 @@
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
-
#include "GrProgramDesc.h"
-
#include "GrPipeline.h"
#include "GrPrimitiveProcessor.h"
#include "GrProcessor.h"
@@ -14,7 +12,6 @@
#include "GrShaderCaps.h"
#include "GrTexturePriv.h"
#include "SkChecksum.h"
-#include "SkTo.h"
#include "glsl/GrGLSLFragmentProcessor.h"
#include "glsl/GrGLSLFragmentShaderBuilder.h"
diff --git a/src/gpu/GrProgramDesc.h b/src/gpu/GrProgramDesc.h
index f687876..68fdcdb 100644
--- a/src/gpu/GrProgramDesc.h
+++ b/src/gpu/GrProgramDesc.h
@@ -12,7 +12,6 @@
#include "GrTypesPriv.h"
#include "SkOpts.h"
#include "SkTArray.h"
-#include "SkTo.h"
#include "glsl/GrGLSLFragmentShaderBuilder.h"
class GrShaderCaps;
diff --git a/src/gpu/GrRect.h b/src/gpu/GrRect.h
index 8c44ed7..95102a8 100644
--- a/src/gpu/GrRect.h
+++ b/src/gpu/GrRect.h
@@ -8,7 +8,6 @@
#ifndef GrRect_DEFINED
#define GrRect_DEFINED
-#include "SkTo.h"
#include "SkTypes.h"
#include "SkRect.h"
diff --git a/src/gpu/GrResourceCache.cpp b/src/gpu/GrResourceCache.cpp
index e8f9739..8e41ba6 100644
--- a/src/gpu/GrResourceCache.cpp
+++ b/src/gpu/GrResourceCache.cpp
@@ -5,6 +5,7 @@
* found in the LICENSE file.
*/
+
#include "GrResourceCache.h"
#include "GrCaps.h"
@@ -17,7 +18,6 @@
#include "SkMessageBus.h"
#include "SkOpts.h"
#include "SkTSort.h"
-#include "SkTo.h"
DECLARE_SKMESSAGEBUS_MESSAGE(GrUniqueKeyInvalidatedMessage);
diff --git a/src/gpu/SkGpuDevice.cpp b/src/gpu/SkGpuDevice.cpp
index ee8026c..210cefc 100644
--- a/src/gpu/SkGpuDevice.cpp
+++ b/src/gpu/SkGpuDevice.cpp
@@ -6,7 +6,6 @@
*/
#include "SkGpuDevice.h"
-
#include "../private/SkShadowFlags.h"
#include "GrBitmapTextureMaker.h"
#include "GrBlurUtils.h"
@@ -44,7 +43,6 @@
#include "SkSurface.h"
#include "SkSurface_Gpu.h"
#include "SkTLazy.h"
-#include "SkTo.h"
#include "SkUtils.h"
#include "SkVertState.h"
#include "SkVertices.h"
diff --git a/src/gpu/effects/GrPorterDuffXferProcessor.cpp b/src/gpu/effects/GrPorterDuffXferProcessor.cpp
index 7a134da..f4af7a4 100644
--- a/src/gpu/effects/GrPorterDuffXferProcessor.cpp
+++ b/src/gpu/effects/GrPorterDuffXferProcessor.cpp
@@ -14,7 +14,6 @@
#include "GrProcessorAnalysis.h"
#include "GrTypes.h"
#include "GrXferProcessor.h"
-#include "SkTo.h"
#include "glsl/GrGLSLBlend.h"
#include "glsl/GrGLSLFragmentShaderBuilder.h"
#include "glsl/GrGLSLProgramDataManager.h"
diff --git a/src/gpu/gl/GrGLCreateNullInterface.cpp b/src/gpu/gl/GrGLCreateNullInterface.cpp
index a14fc67..9df2265 100644
--- a/src/gpu/gl/GrGLCreateNullInterface.cpp
+++ b/src/gpu/gl/GrGLCreateNullInterface.cpp
@@ -5,13 +5,12 @@
* found in the LICENSE file.
*/
-#include "GrGLTestInterface.h"
+
#include "GrNonAtomicRef.h"
+#include "gl/GrGLInterface.h"
+#include "GrGLTestInterface.h"
#include "SkMutex.h"
#include "SkTDArray.h"
-#include "SkTo.h"
-#include "gl/GrGLInterface.h"
-
#include <type_traits>
// added to suppress 'no previous prototype' warning and because this code is duplicated in
diff --git a/src/gpu/gl/GrGLGpu.cpp b/src/gpu/gl/GrGLGpu.cpp
index 7a6d69b..3e2c1b4 100644
--- a/src/gpu/gl/GrGLGpu.cpp
+++ b/src/gpu/gl/GrGLGpu.cpp
@@ -7,6 +7,7 @@
#include "GrGLGpu.h"
+#include <cmath>
#include "../private/GrGLSL.h"
#include "GrBackendSemaphore.h"
#include "GrBackendSurface.h"
@@ -34,13 +35,10 @@
#include "SkSLCompiler.h"
#include "SkStrokeRec.h"
#include "SkTemplates.h"
-#include "SkTo.h"
#include "SkTraceEvent.h"
#include "SkTypes.h"
#include "builders/GrGLShaderStringBuilder.h"
-#include <cmath>
-
#define GL_CALL(X) GR_GL_CALL(this->glInterface(), X)
#define GL_CALL_RET(RET, X) GR_GL_CALL_RET(this->glInterface(), RET, X)
diff --git a/src/gpu/ops/GrOp.cpp b/src/gpu/ops/GrOp.cpp
index f020cde..798d29d 100644
--- a/src/gpu/ops/GrOp.cpp
+++ b/src/gpu/ops/GrOp.cpp
@@ -9,7 +9,6 @@
#include "GrMemoryPool.h"
#include "SkSpinlock.h"
-#include "SkTo.h"
// TODO I noticed a small benefit to using a larger exclusive pool for ops. Its very small, but
// seems to be mostly consistent. There is a lot in flux right now, but we should really revisit
diff --git a/src/gpu/ops/GrTextureOp.cpp b/src/gpu/ops/GrTextureOp.cpp
index 98228c5..2301930 100644
--- a/src/gpu/ops/GrTextureOp.cpp
+++ b/src/gpu/ops/GrTextureOp.cpp
@@ -6,7 +6,6 @@
*/
#include "GrTextureOp.h"
-
#include "GrAppliedClip.h"
#include "GrCaps.h"
#include "GrContext.h"
@@ -27,7 +26,6 @@
#include "SkMatrixPriv.h"
#include "SkPoint.h"
#include "SkPoint3.h"
-#include "SkTo.h"
#include "glsl/GrGLSLColorSpaceXformHelper.h"
#include "glsl/GrGLSLFragmentShaderBuilder.h"
#include "glsl/GrGLSLGeometryProcessor.h"
diff --git a/src/gpu/text/GrTextContext.cpp b/src/gpu/text/GrTextContext.cpp
index b63b726..2fc1f5b 100644
--- a/src/gpu/text/GrTextContext.cpp
+++ b/src/gpu/text/GrTextContext.cpp
@@ -4,9 +4,7 @@
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
-
#include "GrTextContext.h"
-
#include "GrCaps.h"
#include "GrContext.h"
#include "GrContextPriv.h"
@@ -17,14 +15,14 @@
#include "SkDrawFilter.h"
#include "SkDrawProcs.h"
#include "SkFindAndPlaceGlyph.h"
-#include "SkGlyphRun.h"
#include "SkGr.h"
#include "SkGraphics.h"
+#include "SkGlyphRun.h"
#include "SkMakeUnique.h"
#include "SkMaskFilterBase.h"
#include "SkPaintPriv.h"
#include "SkTextMapStateProc.h"
-#include "SkTo.h"
+
#include "ops/GrMeshDrawOp.h"
// DF sizes and thresholds for usage of the small and medium sizes. For example, above
diff --git a/src/gpu/vk/GrVkGpu.cpp b/src/gpu/vk/GrVkGpu.cpp
index dd98125..a999311 100644
--- a/src/gpu/vk/GrVkGpu.cpp
+++ b/src/gpu/vk/GrVkGpu.cpp
@@ -16,6 +16,7 @@
#include "GrPipeline.h"
#include "GrRenderTargetPriv.h"
#include "GrTexturePriv.h"
+
#include "GrVkAMDMemoryAllocator.h"
#include "GrVkCommandBuffer.h"
#include "GrVkGpuCommandBuffer.h"
@@ -32,13 +33,15 @@
#include "GrVkTextureRenderTarget.h"
#include "GrVkTransferBuffer.h"
#include "GrVkVertexBuffer.h"
+
#include "SkConvertPixels.h"
#include "SkMipMap.h"
-#include "SkSLCompiler.h"
-#include "SkTo.h"
+
#include "vk/GrVkInterface.h"
#include "vk/GrVkTypes.h"
+#include "SkSLCompiler.h"
+
#if !defined(SK_BUILD_FOR_WIN)
#include <unistd.h>
#endif // !defined(SK_BUILD_FOR_WIN)
diff --git a/src/opts/SkBitmapProcState_matrixProcs_neon.cpp b/src/opts/SkBitmapProcState_matrixProcs_neon.cpp
index 4f166fb..1efd1ed 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 <arm_neon.h>
diff --git a/src/opts/SkBitmapProcState_opts_SSE2.cpp b/src/opts/SkBitmapProcState_opts_SSE2.cpp
index 2484123..efe8f4d 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 <emmintrin.h>
#include "SkBitmapProcState_opts_SSE2.h"
#include "SkBitmapProcState_utils.h"
#include "SkColorData.h"
#include "SkPaint.h"
-#include "SkTo.h"
#include "SkUtils.h"
-#include <emmintrin.h>
-
void S32_opaque_D32_filter_DX_SSE2(const SkBitmapProcState& s,
const uint32_t* xy,
int count, uint32_t* colors) {
diff --git a/src/pdf/SkClusterator.cpp b/src/pdf/SkClusterator.cpp
index 6c56eb6..3d6800b 100644
--- a/src/pdf/SkClusterator.cpp
+++ b/src/pdf/SkClusterator.cpp
@@ -7,7 +7,6 @@
#include "SkClusterator.h"
-#include "SkTo.h"
#include "SkUtils.h"
static bool is_reversed(const uint32_t* clusters, uint32_t count) {
diff --git a/src/pdf/SkDeflate.cpp b/src/pdf/SkDeflate.cpp
index be3e182..6952ec4 100644
--- a/src/pdf/SkDeflate.cpp
+++ b/src/pdf/SkDeflate.cpp
@@ -5,12 +5,11 @@
* found in the LICENSE file.
*/
-#include "SkDeflate.h"
#include "SkData.h"
+#include "SkDeflate.h"
#include "SkMakeUnique.h"
#include "SkMalloc.h"
-#include "SkTo.h"
#include "SkTraceEvent.h"
#include "zlib.h"
diff --git a/src/pdf/SkJpegInfo.cpp b/src/pdf/SkJpegInfo.cpp
index 72e659e..df99de4 100644
--- a/src/pdf/SkJpegInfo.cpp
+++ b/src/pdf/SkJpegInfo.cpp
@@ -7,8 +7,6 @@
#include "SkJpegInfo.h"
-#include "SkTo.h"
-
#ifndef SK_HAS_JPEG_LIBRARY
namespace {
diff --git a/src/pdf/SkPDFBitmap.cpp b/src/pdf/SkPDFBitmap.cpp
index 38e5327..9d86d90 100644
--- a/src/pdf/SkPDFBitmap.cpp
+++ b/src/pdf/SkPDFBitmap.cpp
@@ -16,7 +16,6 @@
#include "SkPDFTypes.h"
#include "SkPDFUtils.h"
#include "SkStream.h"
-#include "SkTo.h"
#include "SkUnPreMultiply.h"
bool image_compute_is_opaque(const SkImage* image) {
diff --git a/src/pdf/SkPDFConvertType1FontStream.cpp b/src/pdf/SkPDFConvertType1FontStream.cpp
index 74e148c..387f0ef 100644
--- a/src/pdf/SkPDFConvertType1FontStream.cpp
+++ b/src/pdf/SkPDFConvertType1FontStream.cpp
@@ -6,9 +6,7 @@
*/
#include "SkPDFConvertType1FontStream.h"
-
#include "SkTemplates.h"
-#include "SkTo.h"
#include <ctype.h>
diff --git a/src/pdf/SkPDFDevice.cpp b/src/pdf/SkPDFDevice.cpp
index 4f214c1..f4c034e 100644
--- a/src/pdf/SkPDFDevice.cpp
+++ b/src/pdf/SkPDFDevice.cpp
@@ -45,7 +45,6 @@
#include "SkTemplates.h"
#include "SkTextBlobRunIterator.h"
#include "SkTextFormatParams.h"
-#include "SkTo.h"
#include "SkUtils.h"
#include "SkXfermodeInterpretation.h"
diff --git a/src/pdf/SkPDFDocument.cpp b/src/pdf/SkPDFDocument.cpp
index 577bac7..8219ad3 100644
--- a/src/pdf/SkPDFDocument.cpp
+++ b/src/pdf/SkPDFDocument.cpp
@@ -13,7 +13,6 @@
#include "SkPDFDevice.h"
#include "SkPDFUtils.h"
#include "SkStream.h"
-#include "SkTo.h"
SkPDFObjectSerializer::SkPDFObjectSerializer() : fBaseOffset(0), fNextToBeSerialized(0) {}
diff --git a/src/pdf/SkPDFFont.cpp b/src/pdf/SkPDFFont.cpp
index 16f78a6..cbb627f 100644
--- a/src/pdf/SkPDFFont.cpp
+++ b/src/pdf/SkPDFFont.cpp
@@ -5,8 +5,6 @@
* found in the LICENSE file.
*/
-#include "SkPDFFont.h"
-
#include "SkData.h"
#include "SkGlyphCache.h"
#include "SkMacros.h"
@@ -14,6 +12,7 @@
#include "SkPDFCanon.h"
#include "SkPDFConvertType1FontStream.h"
#include "SkPDFDevice.h"
+#include "SkPDFFont.h"
#include "SkPDFMakeCIDGlyphWidthsArray.h"
#include "SkPDFMakeToUnicodeCmap.h"
#include "SkPDFUtils.h"
@@ -21,7 +20,6 @@
#include "SkRefCnt.h"
#include "SkScalar.h"
#include "SkStream.h"
-#include "SkTo.h"
#include "SkTypes.h"
#include "SkUtils.h"
diff --git a/src/pdf/SkPDFGraphicState.cpp b/src/pdf/SkPDFGraphicState.cpp
index b44c114..cab071c 100644
--- a/src/pdf/SkPDFGraphicState.cpp
+++ b/src/pdf/SkPDFGraphicState.cpp
@@ -5,14 +5,12 @@
* found in the LICENSE file.
*/
-#include "SkPDFGraphicState.h"
-
#include "SkData.h"
+#include "SkPaint.h"
#include "SkPDFCanon.h"
#include "SkPDFFormXObject.h"
+#include "SkPDFGraphicState.h"
#include "SkPDFUtils.h"
-#include "SkPaint.h"
-#include "SkTo.h"
static const char* as_pdf_blend_mode_name(SkBlendMode mode) {
// PDF32000.book section 11.3.5 "Blend Mode"
diff --git a/src/pdf/SkPDFMakeCIDGlyphWidthsArray.cpp b/src/pdf/SkPDFMakeCIDGlyphWidthsArray.cpp
index 62902c1..4d5471d 100644
--- a/src/pdf/SkPDFMakeCIDGlyphWidthsArray.cpp
+++ b/src/pdf/SkPDFMakeCIDGlyphWidthsArray.cpp
@@ -5,12 +5,10 @@
* found in the LICENSE file.
*/
-#include "SkPDFMakeCIDGlyphWidthsArray.h"
-
#include "SkBitSet.h"
-#include "SkGlyphCache.h"
+#include "SkPDFMakeCIDGlyphWidthsArray.h"
#include "SkPaint.h"
-#include "SkTo.h"
+#include "SkGlyphCache.h"
// TODO(halcanary): Write unit tests for SkPDFMakeCIDGlyphWidthsArray().
diff --git a/src/pdf/SkPDFMakeToUnicodeCmap.cpp b/src/pdf/SkPDFMakeToUnicodeCmap.cpp
index 4f383e1..c93aa6f 100644
--- a/src/pdf/SkPDFMakeToUnicodeCmap.cpp
+++ b/src/pdf/SkPDFMakeToUnicodeCmap.cpp
@@ -6,9 +6,7 @@
*/
#include "SkPDFMakeToUnicodeCmap.h"
-
#include "SkPDFUtils.h"
-#include "SkTo.h"
#include "SkUtils.h"
static void append_tounicode_header(SkDynamicMemoryWStream* cmap,
diff --git a/src/pdf/SkPDFMetadata.cpp b/src/pdf/SkPDFMetadata.cpp
index 9234f44..ccb3ef3 100644
--- a/src/pdf/SkPDFMetadata.cpp
+++ b/src/pdf/SkPDFMetadata.cpp
@@ -5,12 +5,10 @@
* found in the LICENSE file.
*/
-#include "SkPDFMetadata.h"
-
#include "SkMD5.h"
#include "SkMilestone.h"
+#include "SkPDFMetadata.h"
#include "SkPDFTypes.h"
-#include "SkTo.h"
#include "SkUtils.h"
#include <utility>
diff --git a/src/pdf/SkPDFTypes.cpp b/src/pdf/SkPDFTypes.cpp
index 9e83c7a..56d19b1 100644
--- a/src/pdf/SkPDFTypes.cpp
+++ b/src/pdf/SkPDFTypes.cpp
@@ -5,16 +5,13 @@
* found in the LICENSE file.
*/
-#include "SkPDFTypes.h"
-
#include "SkData.h"
#include "SkDeflate.h"
#include "SkMakeUnique.h"
+#include "SkPDFTypes.h"
#include "SkPDFUtils.h"
#include "SkStream.h"
#include "SkStreamPriv.h"
-#include "SkTo.h"
-
#include <new>
////////////////////////////////////////////////////////////////////////////////
diff --git a/src/pdf/SkPDFTypes.h b/src/pdf/SkPDFTypes.h
index 434f8ba..bf3e266 100644
--- a/src/pdf/SkPDFTypes.h
+++ b/src/pdf/SkPDFTypes.h
@@ -14,7 +14,6 @@
#include "SkRefCnt.h"
#include "SkScalar.h"
#include "SkTHash.h"
-#include "SkTo.h"
#include "SkTypes.h"
class SkData;
diff --git a/src/pipe/SkPipeCanvas.cpp b/src/pipe/SkPipeCanvas.cpp
index d66953c..911595c 100644
--- a/src/pipe/SkPipeCanvas.cpp
+++ b/src/pipe/SkPipeCanvas.cpp
@@ -5,23 +5,21 @@
* found in the LICENSE file.
*/
-#include "SkPipeCanvas.h"
-
#include "SkAutoMalloc.h"
#include "SkCanvasPriv.h"
#include "SkColorFilter.h"
+#include "SkDrawable.h"
#include "SkDrawLooper.h"
#include "SkDrawShadowInfo.h"
-#include "SkDrawable.h"
#include "SkImageFilter.h"
#include "SkMaskFilter.h"
#include "SkPathEffect.h"
+#include "SkPipeCanvas.h"
#include "SkPipeFormat.h"
#include "SkRSXform.h"
#include "SkShader.h"
#include "SkStream.h"
#include "SkTextBlob.h"
-#include "SkTo.h"
#include "SkTypeface.h"
template <typename T> void write_rrect(T* writer, const SkRRect& rrect) {
diff --git a/src/ports/SkFontHost_FreeType.cpp b/src/ports/SkFontHost_FreeType.cpp
index e75ef2d..3e8e957 100644
--- a/src/ports/SkFontHost_FreeType.cpp
+++ b/src/ports/SkFontHost_FreeType.cpp
@@ -15,10 +15,10 @@
#include "SkFontHost_FreeType_common.h"
#include "SkGlyph.h"
#include "SkMakeUnique.h"
-#include "SkMalloc.h"
#include "SkMask.h"
#include "SkMaskGamma.h"
#include "SkMatrix22.h"
+#include "SkMalloc.h"
#include "SkMutex.h"
#include "SkOTUtils.h"
#include "SkPath.h"
@@ -26,8 +26,6 @@
#include "SkStream.h"
#include "SkString.h"
#include "SkTemplates.h"
-#include "SkTo.h"
-
#include <memory>
#include <ft2build.h>
diff --git a/src/ports/SkFontHost_FreeType_common.cpp b/src/ports/SkFontHost_FreeType_common.cpp
index 5627304..2a7a4ba 100644
--- a/src/ports/SkFontHost_FreeType_common.cpp
+++ b/src/ports/SkFontHost_FreeType_common.cpp
@@ -13,7 +13,6 @@
#include "SkFDot6.h"
#include "SkFontHost_FreeType_common.h"
#include "SkPath.h"
-#include "SkTo.h"
#include <ft2build.h>
#include FT_FREETYPE_H
diff --git a/src/ports/SkFontHost_mac.cpp b/src/ports/SkFontHost_mac.cpp
index 4c06e96..3cc51d4 100644
--- a/src/ports/SkFontHost_mac.cpp
+++ b/src/ports/SkFontHost_mac.cpp
@@ -42,7 +42,6 @@
#include "SkStream.h"
#include "SkString.h"
#include "SkTemplates.h"
-#include "SkTo.h"
#include "SkTypefaceCache.h"
#include "SkTypeface_mac.h"
#include "SkUtils.h"
diff --git a/src/ports/SkFontHost_win.cpp b/src/ports/SkFontHost_win.cpp
index 85e92ce..93e1cad 100644
--- a/src/ports/SkFontHost_win.cpp
+++ b/src/ports/SkFontHost_win.cpp
@@ -20,21 +20,21 @@
#include "SkMakeUnique.h"
#include "SkMaskGamma.h"
#include "SkMatrix22.h"
+#include "SkOnce.h"
#include "SkOTTable_OS_2.h"
#include "SkOTTable_maxp.h"
#include "SkOTTable_name.h"
#include "SkOTUtils.h"
-#include "SkOnce.h"
#include "SkPath.h"
#include "SkSFNTHeader.h"
#include "SkStream.h"
#include "SkString.h"
#include "SkTemplates.h"
-#include "SkTo.h"
-#include "SkTypefaceCache.h"
#include "SkTypeface_win.h"
+#include "SkTypefaceCache.h"
#include "SkUtils.h"
+#include "SkTypes.h"
#include <tchar.h>
#include <usp10.h>
#include <objbase.h>
diff --git a/src/ports/SkScalerContext_win_dw.cpp b/src/ports/SkScalerContext_win_dw.cpp
index fa6b910..98d8ca8 100644
--- a/src/ports/SkScalerContext_win_dw.cpp
+++ b/src/ports/SkScalerContext_win_dw.cpp
@@ -10,9 +10,9 @@
#undef GetGlyphIndices
+#include "SkDraw.h"
#include "SkDWrite.h"
#include "SkDWriteGeometrySink.h"
-#include "SkDraw.h"
#include "SkEndian.h"
#include "SkGlyph.h"
#include "SkHRESULT.h"
@@ -29,7 +29,6 @@
#include "SkScalerContext_win_dw.h"
#include "SkSharedMutex.h"
#include "SkTScopedComPtr.h"
-#include "SkTo.h"
#include "SkTypeface_win_dw.h"
#include <dwrite.h>
diff --git a/src/ports/SkTypeface_win_dw.cpp b/src/ports/SkTypeface_win_dw.cpp
index a7bad0d..d67350a 100644
--- a/src/ports/SkTypeface_win_dw.cpp
+++ b/src/ports/SkTypeface_win_dw.cpp
@@ -18,15 +18,14 @@
#include "SkDWriteFontFileStream.h"
#include "SkFontDescriptor.h"
#include "SkFontStream.h"
-#include "SkOTTable_OS_2.h"
#include "SkOTTable_fvar.h"
#include "SkOTTable_head.h"
#include "SkOTTable_hhea.h"
+#include "SkOTTable_OS_2.h"
#include "SkOTTable_post.h"
#include "SkOTUtils.h"
#include "SkScalerContext.h"
#include "SkScalerContext_win_dw.h"
-#include "SkTo.h"
#include "SkTypeface_win_dw.h"
#include "SkUtils.h"
diff --git a/src/sfnt/SkOTUtils.cpp b/src/sfnt/SkOTUtils.cpp
index 1bd051c..f46f86c 100644
--- a/src/sfnt/SkOTUtils.cpp
+++ b/src/sfnt/SkOTUtils.cpp
@@ -15,7 +15,6 @@
#include "SkOTTable_name.h"
#include "SkSFNTHeader.h"
#include "SkStream.h"
-#include "SkTo.h"
extern const uint8_t SK_OT_GlyphData_NoOutline[] = {
0x0,0x0, //SkOTTableGlyphData::numberOfContours
diff --git a/src/svg/SkSVGDevice.cpp b/src/svg/SkSVGDevice.cpp
index d552803..3462f7c 100644
--- a/src/svg/SkSVGDevice.cpp
+++ b/src/svg/SkSVGDevice.cpp
@@ -25,7 +25,6 @@
#include "SkShader.h"
#include "SkStream.h"
#include "SkTHash.h"
-#include "SkTo.h"
#include "SkTypeface.h"
#include "SkUtils.h"
#include "SkXMLWriter.h"
diff --git a/src/utils/SkInterpolator.cpp b/src/utils/SkInterpolator.cpp
index 141adaf..d64316d 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 887e251..53e8bb3 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 c7e3064..53e462a 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 f7081e6..493e6d4 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 a28abdf..8fafd14 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 300e23b..e7a78b0 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;
diff --git a/src/views/SkView.cpp b/src/views/SkView.cpp
index 26ee1ea..6c90988 100644
--- a/src/views/SkView.cpp
+++ b/src/views/SkView.cpp
@@ -6,9 +6,7 @@
*/
#include "SkView.h"
-
#include "SkCanvas.h"
-#include "SkTo.h"
static inline uint32_t SkSetClearShift(uint32_t bits, bool cond, unsigned shift) {
SkASSERT((int)cond == 0 || (int)cond == 1);
diff --git a/src/xml/SkDOM.cpp b/src/xml/SkDOM.cpp
index e6c3435..2e37dd7 100644
--- a/src/xml/SkDOM.cpp
+++ b/src/xml/SkDOM.cpp
@@ -5,10 +5,9 @@
* found in the LICENSE file.
*/
-#include "SkDOM.h"
+#include "SkDOM.h"
#include "SkStream.h"
-#include "SkTo.h"
#include "SkXMLParser.h"
#include "SkXMLWriter.h"
diff --git a/src/xml/SkXMLParser.cpp b/src/xml/SkXMLParser.cpp
index 36e1ab3..23c4e67 100644
--- a/src/xml/SkXMLParser.cpp
+++ b/src/xml/SkXMLParser.cpp
@@ -5,14 +5,12 @@
* found in the LICENSE file.
*/
-#include "SkXMLParser.h"
-
#include "expat.h"
#include "SkStream.h"
#include "SkString.h"
-#include "SkTo.h"
#include "SkTypes.h"
+#include "SkXMLParser.h"
static char const* const gErrorStrings[] = {
"empty or missing file ",
diff --git a/src/xml/SkXMLWriter.cpp b/src/xml/SkXMLWriter.cpp
index 0be9c55..67dcf59 100644
--- a/src/xml/SkXMLWriter.cpp
+++ b/src/xml/SkXMLWriter.cpp
@@ -6,9 +6,7 @@
*/
#include "SkXMLWriter.h"
-
#include "SkStream.h"
-#include "SkTo.h"
SkXMLWriter::SkXMLWriter(bool doEscapeMarkup) : fDoEscapeMarkup(doEscapeMarkup)
{}
diff --git a/src/xps/SkXPSDevice.cpp b/src/xps/SkXPSDevice.cpp
index 36d1bd1..ef5f488 100644
--- a/src/xps/SkXPSDevice.cpp
+++ b/src/xps/SkXPSDevice.cpp
@@ -49,7 +49,6 @@
#include "SkTLazy.h"
#include "SkTScopedComPtr.h"
#include "SkTTCFHeader.h"
-#include "SkTo.h"
#include "SkTypefacePriv.h"
#include "SkUtils.h"
#include "SkVertices.h"
diff --git a/tests/Float16Test.cpp b/tests/Float16Test.cpp
index 85f0ad5..e67d8f1 100644
--- a/tests/Float16Test.cpp
+++ b/tests/Float16Test.cpp
@@ -5,15 +5,14 @@
* found in the LICENSE file.
*/
+#include "Test.h"
#include "SkAutoPixmapStorage.h"
#include "SkColor.h"
#include "SkHalf.h"
#include "SkOpts.h"
-#include "SkPM4f.h"
#include "SkPixmap.h"
+#include "SkPM4f.h"
#include "SkRandom.h"
-#include "SkTo.h"
-#include "Test.h"
#include <cmath>
diff --git a/tests/MathTest.cpp b/tests/MathTest.cpp
index 857440c..b5d933d 100644
--- a/tests/MathTest.cpp
+++ b/tests/MathTest.cpp
@@ -13,7 +13,6 @@
#include "SkMathPriv.h"
#include "SkPoint.h"
#include "SkRandom.h"
-#include "SkTo.h"
#include "Test.h"
static void test_clz(skiatest::Reporter* reporter) {
diff --git a/tests/PDFDeflateWStreamTest.cpp b/tests/PDFDeflateWStreamTest.cpp
index d32828c..3d734c8 100644
--- a/tests/PDFDeflateWStreamTest.cpp
+++ b/tests/PDFDeflateWStreamTest.cpp
@@ -11,7 +11,6 @@
#include "SkDeflate.h"
#include "SkRandom.h"
-#include "SkTo.h"
namespace {
diff --git a/tests/PDFGlyphsToUnicodeTest.cpp b/tests/PDFGlyphsToUnicodeTest.cpp
index cf69705..2aeedf0 100644
--- a/tests/PDFGlyphsToUnicodeTest.cpp
+++ b/tests/PDFGlyphsToUnicodeTest.cpp
@@ -13,7 +13,6 @@
#include "SkData.h"
#include "SkPDFMakeToUnicodeCmap.h"
#include "SkStream.h"
-#include "SkTo.h"
static const int kMaximumGlyphCount = SK_MaxU16 + 1;
diff --git a/tests/PDFPrimitivesTest.cpp b/tests/PDFPrimitivesTest.cpp
index f23c8e3..d25adea 100644
--- a/tests/PDFPrimitivesTest.cpp
+++ b/tests/PDFPrimitivesTest.cpp
@@ -14,8 +14,8 @@
#include "SkCanvas.h"
#include "SkClusterator.h"
#include "SkData.h"
-#include "SkDeflate.h"
#include "SkDocument.h"
+#include "SkDeflate.h"
#include "SkImageEncoder.h"
#include "SkImageFilterPriv.h"
#include "SkMakeUnique.h"
@@ -29,7 +29,6 @@
#include "SkScalar.h"
#include "SkSpecialImage.h"
#include "SkStream.h"
-#include "SkTo.h"
#include "SkTypes.h"
#include "sk_tool_utils.h"
diff --git a/tests/PaintTest.cpp b/tests/PaintTest.cpp
index 2794058..e52308c 100644
--- a/tests/PaintTest.cpp
+++ b/tests/PaintTest.cpp
@@ -13,7 +13,6 @@
#include "SkPath.h"
#include "SkRandom.h"
#include "SkReadBuffer.h"
-#include "SkTo.h"
#include "SkTypeface.h"
#include "SkUtils.h"
#include "SkWriteBuffer.h"
diff --git a/tests/PathTest.cpp b/tests/PathTest.cpp
index 30d27c1..565e8d8 100644
--- a/tests/PathTest.cpp
+++ b/tests/PathTest.cpp
@@ -21,12 +21,11 @@
#include "SkStream.h"
#include "SkStrokeRec.h"
#include "SkSurface.h"
-#include "SkTo.h"
#include "SkWriter32.h"
#include "Test.h"
-
#include <cmath>
+
static void set_radii(SkVector radii[4], int index, float rad) {
sk_bzero(radii, sizeof(SkVector) * 4);
radii[index].set(rad, rad);
diff --git a/tests/ReadWriteAlphaTest.cpp b/tests/ReadWriteAlphaTest.cpp
index d7f4d54..0dc1fc0 100644
--- a/tests/ReadWriteAlphaTest.cpp
+++ b/tests/ReadWriteAlphaTest.cpp
@@ -18,7 +18,6 @@
#include "ProxyUtils.h"
#include "SkCanvas.h"
#include "SkSurface.h"
-#include "SkTo.h"
// This was made indivisible by 4 to ensure we test setting GL_PACK_ALIGNMENT properly.
static const int X_SIZE = 13;
diff --git a/tests/SVGDeviceTest.cpp b/tests/SVGDeviceTest.cpp
index 4d1d414..6cf533f 100644
--- a/tests/SVGDeviceTest.cpp
+++ b/tests/SVGDeviceTest.cpp
@@ -5,6 +5,7 @@
* found in the LICENSE file.
*/
+
#include "SkBitmap.h"
#include "SkCanvas.h"
#include "SkData.h"
@@ -13,7 +14,6 @@
#include "SkParse.h"
#include "SkShader.h"
#include "SkStream.h"
-#include "SkTo.h"
#include "Test.h"
#include <string.h>
diff --git a/tests/SkBase64Test.cpp b/tests/SkBase64Test.cpp
index 30bfbce..d855ef5 100644
--- a/tests/SkBase64Test.cpp
+++ b/tests/SkBase64Test.cpp
@@ -6,7 +6,6 @@
*/
#include "SkBase64.h"
-#include "SkTo.h"
#include "Test.h"
diff --git a/tests/SkPEGTest.cpp b/tests/SkPEGTest.cpp
index 2b51dfd..6773c1b 100644
--- a/tests/SkPEGTest.cpp
+++ b/tests/SkPEGTest.cpp
@@ -9,7 +9,6 @@
#if defined(SK_XML)
#include "SkPEG.h"
-#include "SkTo.h"
using namespace skpeg;
diff --git a/tests/SkRasterPipelineTest.cpp b/tests/SkRasterPipelineTest.cpp
index 4c76587..e54c8c8 100644
--- a/tests/SkRasterPipelineTest.cpp
+++ b/tests/SkRasterPipelineTest.cpp
@@ -5,11 +5,10 @@
* found in the LICENSE file.
*/
-#include "../src/jumper/SkJumper.h"
+#include "Test.h"
#include "SkHalf.h"
#include "SkRasterPipeline.h"
-#include "SkTo.h"
-#include "Test.h"
+#include "../src/jumper/SkJumper.h"
DEF_TEST(SkRasterPipeline, r) {
// Build and run a simple pipeline to exercise SkRasterPipeline,
diff --git a/tests/StreamTest.cpp b/tests/StreamTest.cpp
index 3372ee8..7cf8d92 100644
--- a/tests/StreamTest.cpp
+++ b/tests/StreamTest.cpp
@@ -14,7 +14,6 @@
#include "SkRandom.h"
#include "SkStream.h"
#include "SkStreamPriv.h"
-#include "SkTo.h"
#include "Test.h"
#include <functional>
diff --git a/tests/TextBlobTest.cpp b/tests/TextBlobTest.cpp
index c949558..6aabc45 100644
--- a/tests/TextBlobTest.cpp
+++ b/tests/TextBlobTest.cpp
@@ -8,7 +8,6 @@
#include "SkPaint.h"
#include "SkPoint.h"
#include "SkTextBlobRunIterator.h"
-#include "SkTo.h"
#include "SkTypeface.h"
#include "Test.h"
diff --git a/tests/Time.cpp b/tests/Time.cpp
index 5a07f08..f6bf9ff 100644
--- a/tests/Time.cpp
+++ b/tests/Time.cpp
@@ -6,7 +6,6 @@
*/
#include "SkTime.h"
-#include "SkTo.h"
#include "Test.h"
// Sanity checks for the GetDateTime function.
diff --git a/tools/fonts/SkTestTypeface.cpp b/tools/fonts/SkTestTypeface.cpp
index 79108ce..bf3a1a3 100644
--- a/tools/fonts/SkTestTypeface.cpp
+++ b/tools/fonts/SkTestTypeface.cpp
@@ -19,9 +19,8 @@
#include "SkRect.h"
#include "SkScalerContext.h"
#include "SkString.h"
-#include "SkTDArray.h"
#include "SkTestTypeface.h"
-#include "SkTo.h"
+#include "SkTDArray.h"
#include "SkUtils.h"
#include <utility>
diff --git a/tools/gpu/GrTest.cpp b/tools/gpu/GrTest.cpp
index 00abd95..14ba7a0 100644
--- a/tools/gpu/GrTest.cpp
+++ b/tools/gpu/GrTest.cpp
@@ -5,6 +5,8 @@
* found in the LICENSE file.
*/
+#include "GrTest.h"
+#include <algorithm>
#include "GrBackendSurface.h"
#include "GrContextOptions.h"
#include "GrContextPriv.h"
@@ -18,17 +20,14 @@
#include "GrResourceCache.h"
#include "GrSemaphore.h"
#include "GrSurfaceContextPriv.h"
-#include "GrTest.h"
#include "GrTexture.h"
#include "SkGr.h"
#include "SkImage_Gpu.h"
#include "SkMathPriv.h"
#include "SkString.h"
-#include "SkTo.h"
#include "ops/GrMeshDrawOp.h"
#include "text/GrGlyphCache.h"
#include "text/GrTextBlobCache.h"
-#include <algorithm>
namespace GrTest {
diff --git a/tools/gpu/gl/debug/DebugGLTestContext.cpp b/tools/gpu/gl/debug/DebugGLTestContext.cpp
index 59f3c93..2b05693 100644
--- a/tools/gpu/gl/debug/DebugGLTestContext.cpp
+++ b/tools/gpu/gl/debug/DebugGLTestContext.cpp
@@ -1,3 +1,4 @@
+
/*
* Copyright 2012 Google Inc.
*
@@ -15,10 +16,10 @@
#include "GrTextureObj.h"
#include "GrTextureUnitObj.h"
#include "GrVertexArrayObj.h"
-#include "SkMutex.h"
-#include "SkTo.h"
#include "gl/GrGLTestInterface.h"
+#include "SkMutex.h"
+
namespace {
// Helper macro to make creating an object (where you need to get back a derived type) easier
diff --git a/tools/sk_app/android/surface_glue_android.cpp b/tools/sk_app/android/surface_glue_android.cpp
index 04f8eea..9766d3a 100644
--- a/tools/sk_app/android/surface_glue_android.cpp
+++ b/tools/sk_app/android/surface_glue_android.cpp
@@ -22,7 +22,6 @@
#include "../Application.h"
#include "ResourceFactory.h"
-#include "SkTo.h"
#include "SkTypes.h"
#include "SkUtils.h"
#include "Window_android.h"
diff --git a/tools/skpinfo.cpp b/tools/skpinfo.cpp
index 53ea8f3..93834bb 100644
--- a/tools/skpinfo.cpp
+++ b/tools/skpinfo.cpp
@@ -6,12 +6,11 @@
*/
#include "SkCommandLineFlags.h"
-#include "SkFontDescriptor.h"
#include "SkPicture.h"
-#include "SkPictureCommon.h"
#include "SkPictureData.h"
+#include "SkPictureCommon.h"
#include "SkStream.h"
-#include "SkTo.h"
+#include "SkFontDescriptor.h"
DEFINE_string2(input, i, "", "skp on which to report");
DEFINE_bool2(version, v, true, "version");
diff --git a/tools/skqp/jni/org_skia_skqp_SkQPRunner.cpp b/tools/skqp/jni/org_skia_skqp_SkQPRunner.cpp
index 4eb01d4..b59af6a 100644
--- a/tools/skqp/jni/org_skia_skqp_SkQPRunner.cpp
+++ b/tools/skqp/jni/org_skia_skqp_SkQPRunner.cpp
@@ -16,7 +16,6 @@
#include "ResourceFactory.h"
#include "SkOSPath.h"
#include "SkStream.h"
-#include "SkTo.h"
#include "gm_knowledge.h"
#include "gm_runner.h"
#include "skqp_asset_manager.h"
diff --git a/tools/viewer/Viewer.cpp b/tools/viewer/Viewer.cpp
index 5a5489e..65280bc 100644
--- a/tools/viewer/Viewer.cpp
+++ b/tools/viewer/Viewer.cpp
@@ -5,6 +5,9 @@
* found in the LICENSE file.
*/
+#include "Viewer.h"
+#include <stdlib.h>
+#include <map>
#include "BisectSlide.h"
#include "GMSlide.h"
#include "GrContext.h"
@@ -34,15 +37,10 @@
#include "SkTaskGroup.h"
#include "SkTestFontMgr.h"
#include "SkThreadedBMPDevice.h"
-#include "SkTo.h"
#include "SvgSlide.h"
-#include "Viewer.h"
#include "ccpr/GrCoverageCountingPathRenderer.h"
#include "imgui.h"
-#include <stdlib.h>
-#include <map>
-
#if defined(SK_HAS_SKSG)
#include "SlideDir.h"
#endif