IWYU: SkUtils.h
Change-Id: Ieac05047826b1fb80950d65573d38494a1a5c5e7
Reviewed-on: https://skia-review.googlesource.com/148383
Commit-Queue: Hal Canary <halcanary@google.com>
Commit-Queue: Ben Wagner <bungeman@google.com>
Auto-Submit: Hal Canary <halcanary@google.com>
Reviewed-by: Ben Wagner <bungeman@google.com>
diff --git a/fuzz/FuzzCanvas.cpp b/fuzz/FuzzCanvas.cpp
index 9e56a3c..58cfcde 100644
--- a/fuzz/FuzzCanvas.cpp
+++ b/fuzz/FuzzCanvas.cpp
@@ -64,7 +64,7 @@
// SRC
#include "SkCommandLineFlags.h"
-#include "SkUtils.h"
+#include "SkUTF.h"
#if SK_SUPPORT_GPU
#include "GrContextFactory.h"
diff --git a/gm/atlastext.cpp b/gm/atlastext.cpp
index e3fed2e..cdcd694 100644
--- a/gm/atlastext.cpp
+++ b/gm/atlastext.cpp
@@ -16,7 +16,7 @@
#include "SkBitmap.h"
#include "SkCanvas.h"
#include "SkTypeface.h"
-#include "SkUtils.h"
+#include "SkUTF.h"
#include "gpu/TestContext.h"
#include "gpu/atlastext/GLTestAtlasTextRenderer.h"
#include "gpu/atlastext/TestAtlasTextRenderer.h"
diff --git a/gm/bleed.cpp b/gm/bleed.cpp
index 6dc0ebb..f7d582f 100644
--- a/gm/bleed.cpp
+++ b/gm/bleed.cpp
@@ -12,7 +12,7 @@
#include "SkImage.h"
#include "SkMaskFilter.h"
#include "SkTDArray.h"
-#include "SkUtils.h"
+#include "SkUTF.h"
#include "sk_tool_utils.h"
#include "GrContext.h"
diff --git a/gm/coloremoji_blendmodes.cpp b/gm/coloremoji_blendmodes.cpp
index 46ba67e..e962b9f 100644
--- a/gm/coloremoji_blendmodes.cpp
+++ b/gm/coloremoji_blendmodes.cpp
@@ -22,7 +22,7 @@
#include "SkString.h"
#include "SkTypeface.h"
#include "SkTypes.h"
-#include "SkUtils.h"
+#include "SkUTF.h"
#include "gm.h"
#include "sk_tool_utils.h"
diff --git a/gm/tilemodes.cpp b/gm/tilemodes.cpp
index 587e558..f9f6751 100644
--- a/gm/tilemodes.cpp
+++ b/gm/tilemodes.cpp
@@ -11,7 +11,7 @@
#include "SkPath.h"
#include "SkRegion.h"
#include "SkShader.h"
-#include "SkUtils.h"
+#include "SkUTF.h"
// effects
#include "SkGradientShader.h"
#include "SkBlurDrawLooper.h"
diff --git a/gm/tilemodes_scaled.cpp b/gm/tilemodes_scaled.cpp
index 3833fa2..7d001f1 100644
--- a/gm/tilemodes_scaled.cpp
+++ b/gm/tilemodes_scaled.cpp
@@ -11,7 +11,7 @@
#include "SkPath.h"
#include "SkRegion.h"
#include "SkShader.h"
-#include "SkUtils.h"
+#include "SkUTF.h"
// effects
#include "SkGradientShader.h"
diff --git a/gm/tinybitmap.cpp b/gm/tinybitmap.cpp
index 0f69afa..08bd4c1 100644
--- a/gm/tinybitmap.cpp
+++ b/gm/tinybitmap.cpp
@@ -9,7 +9,7 @@
#include "SkColorPriv.h"
#include "SkShader.h"
#include "SkCanvas.h"
-#include "SkUtils.h"
+#include "SkUTF.h"
namespace skiagm {
diff --git a/samplecode/SampleAll.cpp b/samplecode/SampleAll.cpp
index 6b94395..787ad04 100644
--- a/samplecode/SampleAll.cpp
+++ b/samplecode/SampleAll.cpp
@@ -29,7 +29,7 @@
#include "SkPicture.h"
#include "SkRandom.h"
#include "SkTypeface.h"
-#include "SkUtils.h"
+#include "SkUTF.h"
#include <math.h>
#include "DecodeFile.h"
diff --git a/samplecode/SampleAndroidShadows.cpp b/samplecode/SampleAndroidShadows.cpp
index d4603a1..a651ce1 100644
--- a/samplecode/SampleAndroidShadows.cpp
+++ b/samplecode/SampleAndroidShadows.cpp
@@ -16,7 +16,7 @@
#include "SkPathOps.h"
#include "SkPoint3.h"
#include "SkShadowUtils.h"
-#include "SkUtils.h"
+#include "SkUTF.h"
#include "sk_tool_utils.h"
////////////////////////////////////////////////////////////////////////////
diff --git a/samplecode/SampleAnimatedText.cpp b/samplecode/SampleAnimatedText.cpp
index 71f1a95..1aa50e2 100644
--- a/samplecode/SampleAnimatedText.cpp
+++ b/samplecode/SampleAnimatedText.cpp
@@ -7,7 +7,7 @@
#include "Sample.h"
#include "SkCanvas.h"
-#include "SkUtils.h"
+#include "SkUTF.h"
#include "SkColorPriv.h"
#include "SkColorFilter.h"
#include "SkImage.h"
diff --git a/samplecode/SampleArc.cpp b/samplecode/SampleArc.cpp
index 1222cf2..ed1f8df 100644
--- a/samplecode/SampleArc.cpp
+++ b/samplecode/SampleArc.cpp
@@ -20,7 +20,7 @@
#include "SkRegion.h"
#include "SkShader.h"
#include "SkString.h"
-#include "SkUtils.h"
+#include "SkUTF.h"
#include "Sk1DPathEffect.h"
#include "SkParsePath.h"
diff --git a/samplecode/SampleBitmapRect.cpp b/samplecode/SampleBitmapRect.cpp
index d8a6815..61f3361 100644
--- a/samplecode/SampleBitmapRect.cpp
+++ b/samplecode/SampleBitmapRect.cpp
@@ -14,7 +14,7 @@
#include "SkPath.h"
#include "SkRegion.h"
#include "SkShader.h"
-#include "SkUtils.h"
+#include "SkUTF.h"
#include "SkColorPriv.h"
#include "SkColorFilter.h"
#include "SkTime.h"
diff --git a/samplecode/SampleBlur.cpp b/samplecode/SampleBlur.cpp
index 3a078bd..6b5481e 100644
--- a/samplecode/SampleBlur.cpp
+++ b/samplecode/SampleBlur.cpp
@@ -12,7 +12,7 @@
#include "SkColorPriv.h"
#include "SkGradientShader.h"
#include "SkMaskFilter.h"
-#include "SkUtils.h"
+#include "SkUTF.h"
class BlurView : public Sample {
SkBitmap fBM;
diff --git a/samplecode/SampleCamera.cpp b/samplecode/SampleCamera.cpp
index 9a79003..6584867 100644
--- a/samplecode/SampleCamera.cpp
+++ b/samplecode/SampleCamera.cpp
@@ -17,7 +17,7 @@
#include "SkRegion.h"
#include "SkShader.h"
#include "SkString.h"
-#include "SkUtils.h"
+#include "SkUTF.h"
class CameraView : public Sample {
SkTArray<sk_sp<SkShader>> fShaders;
diff --git a/samplecode/SampleConcavePaths.cpp b/samplecode/SampleConcavePaths.cpp
index dd125bd..a2a5143 100644
--- a/samplecode/SampleConcavePaths.cpp
+++ b/samplecode/SampleConcavePaths.cpp
@@ -12,7 +12,7 @@
#include "SkPath.h"
#include "SkRegion.h"
#include "SkShader.h"
-#include "SkUtils.h"
+#include "SkUTF.h"
#include "SkColorPriv.h"
#include "SkColorFilter.h"
#include "SkParsePath.h"
diff --git a/samplecode/SampleDither.cpp b/samplecode/SampleDither.cpp
index 5eab2e1..c727f11 100644
--- a/samplecode/SampleDither.cpp
+++ b/samplecode/SampleDither.cpp
@@ -10,7 +10,7 @@
#include "SkPath.h"
#include "SkRegion.h"
#include "SkShader.h"
-#include "SkUtils.h"
+#include "SkUTF.h"
#include "Sk1DPathEffect.h"
#include "SkCornerPathEffect.h"
#include "SkPathMeasure.h"
diff --git a/samplecode/SampleEmboss.cpp b/samplecode/SampleEmboss.cpp
index 04823f3..0217d9e 100644
--- a/samplecode/SampleEmboss.cpp
+++ b/samplecode/SampleEmboss.cpp
@@ -15,7 +15,7 @@
#include "SkRandom.h"
#include "SkRegion.h"
#include "SkShader.h"
-#include "SkUtils.h"
+#include "SkUTF.h"
#include "SkColorPriv.h"
#include "SkColorFilter.h"
#include "SkTime.h"
diff --git a/samplecode/SampleFillType.cpp b/samplecode/SampleFillType.cpp
index cd60157..cf5825a 100644
--- a/samplecode/SampleFillType.cpp
+++ b/samplecode/SampleFillType.cpp
@@ -11,7 +11,7 @@
#include "SkPath.h"
#include "SkRegion.h"
#include "SkShader.h"
-#include "SkUtils.h"
+#include "SkUTF.h"
class FillTypeView : public Sample {
SkPath fPath;
diff --git a/samplecode/SampleFilter2.cpp b/samplecode/SampleFilter2.cpp
index 33d09f4..06b542e 100644
--- a/samplecode/SampleFilter2.cpp
+++ b/samplecode/SampleFilter2.cpp
@@ -17,7 +17,7 @@
#include "SkShader.h"
#include "SkString.h"
#include "SkTime.h"
-#include "SkUtils.h"
+#include "SkUTF.h"
static const char* gNames[] = {
"/skimages/background_01.png"
diff --git a/samplecode/SampleFlutterAnimate.cpp b/samplecode/SampleFlutterAnimate.cpp
index 975156f..343b33b 100644
--- a/samplecode/SampleFlutterAnimate.cpp
+++ b/samplecode/SampleFlutterAnimate.cpp
@@ -8,7 +8,7 @@
#include "Sample.h"
#include "SkAnimTimer.h"
#include "SkCanvas.h"
-#include "SkUtils.h"
+#include "SkUTF.h"
#include "SkColorPriv.h"
#include "SkColorFilter.h"
#include "SkImage.h"
diff --git a/samplecode/SampleFontScalerTest.cpp b/samplecode/SampleFontScalerTest.cpp
index c92f123..94e6f9a 100644
--- a/samplecode/SampleFontScalerTest.cpp
+++ b/samplecode/SampleFontScalerTest.cpp
@@ -18,7 +18,7 @@
#include "SkRegion.h"
#include "SkShader.h"
#include "SkTypeface.h"
-#include "SkUtils.h"
+#include "SkUTF.h"
static constexpr struct {
const char* fName;
diff --git a/samplecode/SampleHairline.cpp b/samplecode/SampleHairline.cpp
index 426b819..1ebbc1e 100644
--- a/samplecode/SampleHairline.cpp
+++ b/samplecode/SampleHairline.cpp
@@ -22,7 +22,7 @@
#include "SkTime.h"
#include "SkTo.h"
#include "SkTypeface.h"
-#include "SkUtils.h"
+#include "SkUTF.h"
static SkRandom gRand;
diff --git a/samplecode/SampleLayers.cpp b/samplecode/SampleLayers.cpp
index ac7b477..33cbe4d 100644
--- a/samplecode/SampleLayers.cpp
+++ b/samplecode/SampleLayers.cpp
@@ -20,7 +20,7 @@
#include "SkShader.h"
#include "SkTime.h"
#include "SkTypeface.h"
-#include "SkUtils.h"
+#include "SkUTF.h"
#include "SkClipOpPriv.h"
static void make_paint(SkPaint* paint, const SkMatrix& localMatrix) {
diff --git a/samplecode/SampleLines.cpp b/samplecode/SampleLines.cpp
index 0f270d6..1ec4748 100644
--- a/samplecode/SampleLines.cpp
+++ b/samplecode/SampleLines.cpp
@@ -15,7 +15,7 @@
#include "SkRandom.h"
#include "SkRegion.h"
#include "SkShader.h"
-#include "SkUtils.h"
+#include "SkUTF.h"
#include "SkColorPriv.h"
#include "SkColorFilter.h"
#include "SkTime.h"
diff --git a/samplecode/SampleMeasure.cpp b/samplecode/SampleMeasure.cpp
index 24f38a8..00943ba 100644
--- a/samplecode/SampleMeasure.cpp
+++ b/samplecode/SampleMeasure.cpp
@@ -10,7 +10,7 @@
#include "SkPath.h"
#include "SkRegion.h"
#include "SkShader.h"
-#include "SkUtils.h"
+#include "SkUTF.h"
#include "Sk1DPathEffect.h"
#include "SkCornerPathEffect.h"
#include "SkPathMeasure.h"
diff --git a/samplecode/SamplePatch.cpp b/samplecode/SamplePatch.cpp
index 7b62d9d..ba306d4 100644
--- a/samplecode/SamplePatch.cpp
+++ b/samplecode/SamplePatch.cpp
@@ -15,7 +15,7 @@
#include "SkRandom.h"
#include "SkRegion.h"
#include "SkShader.h"
-#include "SkUtils.h"
+#include "SkUTF.h"
#include "SkColorPriv.h"
#include "SkColorFilter.h"
#include "SkTime.h"
diff --git a/samplecode/SamplePath.cpp b/samplecode/SamplePath.cpp
index cf1ad24..e09db71 100644
--- a/samplecode/SamplePath.cpp
+++ b/samplecode/SamplePath.cpp
@@ -14,7 +14,7 @@
#include "SkPath.h"
#include "SkRegion.h"
#include "SkShader.h"
-#include "SkUtils.h"
+#include "SkUTF.h"
#include "SkColorPriv.h"
#include "SkColorFilter.h"
#include "SkParsePath.h"
diff --git a/samplecode/SamplePathClip.cpp b/samplecode/SamplePathClip.cpp
index 1d63a31..521c5a0 100644
--- a/samplecode/SamplePathClip.cpp
+++ b/samplecode/SamplePathClip.cpp
@@ -17,7 +17,7 @@
#include "SkTime.h"
#include "SkTo.h"
#include "SkTypeface.h"
-#include "SkUtils.h"
+#include "SkUTF.h"
#include <utility>
diff --git a/samplecode/SamplePathEffects.cpp b/samplecode/SamplePathEffects.cpp
index 42d190d..e59b64d 100644
--- a/samplecode/SamplePathEffects.cpp
+++ b/samplecode/SamplePathEffects.cpp
@@ -12,7 +12,7 @@
#include "SkPath.h"
#include "SkRegion.h"
#include "SkShader.h"
-#include "SkUtils.h"
+#include "SkUTF.h"
#include "Sk1DPathEffect.h"
#include "SkCornerPathEffect.h"
#include "SkPathMeasure.h"
diff --git a/samplecode/SamplePdfFileViewer.cpp b/samplecode/SamplePdfFileViewer.cpp
index df1b9d2..97ab0e5 100644
--- a/samplecode/SamplePdfFileViewer.cpp
+++ b/samplecode/SamplePdfFileViewer.cpp
@@ -19,7 +19,7 @@
#include "SkRandom.h"
#include "SkRegion.h"
#include "SkShader.h"
-#include "SkUtils.h"
+#include "SkUTF.h"
#include "SkColorPriv.h"
#include "SkColorFilter.h"
#include "SkTime.h"
diff --git a/samplecode/SamplePoints.cpp b/samplecode/SamplePoints.cpp
index a55203c..1570bdd 100644
--- a/samplecode/SamplePoints.cpp
+++ b/samplecode/SamplePoints.cpp
@@ -13,7 +13,7 @@
#include "SkRandom.h"
#include "SkRegion.h"
#include "SkShader.h"
-#include "SkUtils.h"
+#include "SkUTF.h"
#include "SkColorPriv.h"
#include "SkColorFilter.h"
#include "SkTime.h"
diff --git a/samplecode/SampleRectanizer.cpp b/samplecode/SampleRectanizer.cpp
index e6a8bc7..317d24c 100644
--- a/samplecode/SampleRectanizer.cpp
+++ b/samplecode/SampleRectanizer.cpp
@@ -9,7 +9,7 @@
#include "SkCanvas.h"
#include "SkRandom.h"
#include "SkPaint.h"
-#include "SkUtils.h"
+#include "SkUTF.h"
#if SK_SUPPORT_GPU
#include "GrRectanizer_pow2.h"
#include "GrRectanizer_skyline.h"
diff --git a/samplecode/SampleRegion.cpp b/samplecode/SampleRegion.cpp
index 7f691c6..4c5b588 100644
--- a/samplecode/SampleRegion.cpp
+++ b/samplecode/SampleRegion.cpp
@@ -12,7 +12,7 @@
#include "SkPath.h"
#include "SkRegion.h"
#include "SkShader.h"
-#include "SkUtils.h"
+#include "SkUTF.h"
#include <math.h>
diff --git a/samplecode/SampleShaders.cpp b/samplecode/SampleShaders.cpp
index 51c459f..bf64888 100644
--- a/samplecode/SampleShaders.cpp
+++ b/samplecode/SampleShaders.cpp
@@ -13,7 +13,7 @@
#include "SkPath.h"
#include "SkRegion.h"
#include "SkShader.h"
-#include "SkUtils.h"
+#include "SkUTF.h"
#include "SkColorPriv.h"
#include "SkColorFilter.h"
#include "SkTime.h"
diff --git a/samplecode/SampleShadowUtils.cpp b/samplecode/SampleShadowUtils.cpp
index 2dd086e..c6ae470 100644
--- a/samplecode/SampleShadowUtils.cpp
+++ b/samplecode/SampleShadowUtils.cpp
@@ -16,7 +16,7 @@
#include "SkPathOps.h"
#include "SkPoint3.h"
#include "SkShadowUtils.h"
-#include "SkUtils.h"
+#include "SkUTF.h"
#include "sk_tool_utils.h"
////////////////////////////////////////////////////////////////////////////
diff --git a/samplecode/SampleText.cpp b/samplecode/SampleText.cpp
index 1c8ccb6..8720c17 100644
--- a/samplecode/SampleText.cpp
+++ b/samplecode/SampleText.cpp
@@ -15,7 +15,7 @@
#include "SkRandom.h"
#include "SkRegion.h"
#include "SkShader.h"
-#include "SkUtils.h"
+#include "SkUTF.h"
#include "SkColorPriv.h"
#include "SkColorFilter.h"
#include "SkTime.h"
diff --git a/samplecode/SampleTextAlpha.cpp b/samplecode/SampleTextAlpha.cpp
index ff651de..14885e8 100644
--- a/samplecode/SampleTextAlpha.cpp
+++ b/samplecode/SampleTextAlpha.cpp
@@ -15,7 +15,7 @@
#include "SkRandom.h"
#include "SkRegion.h"
#include "SkShader.h"
-#include "SkUtils.h"
+#include "SkUTF.h"
#include "SkColorPriv.h"
#include "SkColorFilter.h"
#include "SkTime.h"
diff --git a/samplecode/SampleTextBox.cpp b/samplecode/SampleTextBox.cpp
index 80eee8e..1c698ac 100644
--- a/samplecode/SampleTextBox.cpp
+++ b/samplecode/SampleTextBox.cpp
@@ -23,7 +23,7 @@
#include "SkTextBlob.h"
#include "SkTime.h"
#include "SkTypeface.h"
-#include "SkUtils.h"
+#include "SkUTF.h"
extern void skia_set_text_gamma(float blackGamma, float whiteGamma);
diff --git a/samplecode/SampleTextEffects.cpp b/samplecode/SampleTextEffects.cpp
index 8e87880..4e580d8 100644
--- a/samplecode/SampleTextEffects.cpp
+++ b/samplecode/SampleTextEffects.cpp
@@ -12,7 +12,7 @@
#include "SkPath.h"
#include "SkRegion.h"
#include "SkShader.h"
-#include "SkUtils.h"
+#include "SkUTF.h"
#include "SkColorPriv.h"
#include "SkColorFilter.h"
#include "SkStrokeRec.h"
diff --git a/samplecode/SampleTiling.cpp b/samplecode/SampleTiling.cpp
index 76243f6..71cb428 100644
--- a/samplecode/SampleTiling.cpp
+++ b/samplecode/SampleTiling.cpp
@@ -13,7 +13,7 @@
#include "SkPictureRecorder.h"
#include "SkRegion.h"
#include "SkShader.h"
-#include "SkUtils.h"
+#include "SkUTF.h"
#include "SkColorPriv.h"
#include "SkColorFilter.h"
#include "SkPicture.h"
diff --git a/samplecode/SampleUnpremul.cpp b/samplecode/SampleUnpremul.cpp
index bf89a6c..3e670be 100644
--- a/samplecode/SampleUnpremul.cpp
+++ b/samplecode/SampleUnpremul.cpp
@@ -18,7 +18,7 @@
#include "SkStream.h"
#include "SkString.h"
#include "SkTypes.h"
-#include "SkUtils.h"
+#include "SkUTF.h"
/**
* Interprets c as an unpremultiplied color, and returns the
diff --git a/samplecode/SampleVertices.cpp b/samplecode/SampleVertices.cpp
index 4a511d0..15f2d31 100644
--- a/samplecode/SampleVertices.cpp
+++ b/samplecode/SampleVertices.cpp
@@ -13,7 +13,7 @@
#include "SkRandom.h"
#include "SkRegion.h"
#include "SkShader.h"
-#include "SkUtils.h"
+#include "SkUTF.h"
#include "SkColorPriv.h"
#include "SkColorFilter.h"
#include "SkTime.h"
diff --git a/samplecode/SampleWritePixels.cpp b/samplecode/SampleWritePixels.cpp
index ae39360..eaf14b4 100644
--- a/samplecode/SampleWritePixels.cpp
+++ b/samplecode/SampleWritePixels.cpp
@@ -12,7 +12,7 @@
#include "SkPath.h"
#include "SkRegion.h"
#include "SkShader.h"
-#include "SkUtils.h"
+#include "SkUTF.h"
static void create_bitmap(SkBitmap* bitmap) {
const int W = 100;
diff --git a/samplecode/SampleXfermodesBlur.cpp b/samplecode/SampleXfermodesBlur.cpp
index e063579..8819840 100644
--- a/samplecode/SampleXfermodesBlur.cpp
+++ b/samplecode/SampleXfermodesBlur.cpp
@@ -16,7 +16,7 @@
#include "SkRandom.h"
#include "SkRegion.h"
#include "SkShader.h"
-#include "SkUtils.h"
+#include "SkUTF.h"
#include "SkColorPriv.h"
#include "SkColorFilter.h"
#include "SkTime.h"
diff --git a/src/core/SkAAClip.cpp b/src/core/SkAAClip.cpp
index 24a8e58..3394738 100644
--- a/src/core/SkAAClip.cpp
+++ b/src/core/SkAAClip.cpp
@@ -15,7 +15,7 @@
#include "SkRectPriv.h"
#include "SkScan.h"
#include "SkTo.h"
-#include "SkUtils.h"
+#include "SkUTF.h"
#include <utility>
diff --git a/src/core/SkBlitter_RGB565.cpp b/src/core/SkBlitter_RGB565.cpp
index 6668f84..06792fb 100644
--- a/src/core/SkBlitter_RGB565.cpp
+++ b/src/core/SkBlitter_RGB565.cpp
@@ -8,7 +8,7 @@
#include "SkCoreBlitters.h"
#include "SkColorData.h"
#include "SkShader.h"
-#include "SkUtils.h"
+#include "SkUTF.h"
#include "SkXfermodePriv.h"
#include "SkBlitMask.h"
#include "SkColorData.h"
diff --git a/src/core/SkFindAndPlaceGlyph.h b/src/core/SkFindAndPlaceGlyph.h
index 74fa516..76fd9ba 100644
--- a/src/core/SkFindAndPlaceGlyph.h
+++ b/src/core/SkFindAndPlaceGlyph.h
@@ -14,7 +14,7 @@
#include "SkMatrixPriv.h"
#include "SkPaint.h"
#include "SkTemplates.h"
-#include "SkUtils.h"
+#include "SkUTF.h"
#include <utility>
class SkFindAndPlaceGlyph {
diff --git a/src/core/SkFont.cpp b/src/core/SkFont.cpp
index 081469f..f9423a2 100644
--- a/src/core/SkFont.cpp
+++ b/src/core/SkFont.cpp
@@ -9,7 +9,7 @@
#include "SkTo.h"
#include "SkTypeface.h"
-#include "SkUtils.h"
+#include "SkUTF.h"
SkFont::SkFont(sk_sp<SkTypeface> face, SkScalar size, SkScalar scaleX, SkScalar skewX, MaskType mt,
uint32_t flags)
diff --git a/src/core/SkGraphics.cpp b/src/core/SkGraphics.cpp
index e88b0d0..74f9cdc 100644
--- a/src/core/SkGraphics.cpp
+++ b/src/core/SkGraphics.cpp
@@ -27,7 +27,7 @@
#include "SkTSearch.h"
#include "SkTime.h"
#include "SkTypefaceCache.h"
-#include "SkUtils.h"
+#include "SkUTF.h"
#include <stdlib.h>
diff --git a/src/core/SkModeColorFilter.cpp b/src/core/SkModeColorFilter.cpp
index 269d2d4..948d212 100644
--- a/src/core/SkModeColorFilter.cpp
+++ b/src/core/SkModeColorFilter.cpp
@@ -18,7 +18,7 @@
#include "SkRasterPipeline.h"
#include "SkReadBuffer.h"
#include "SkString.h"
-#include "SkUtils.h"
+#include "SkUTF.h"
#include "SkValidationUtils.h"
#include "SkWriteBuffer.h"
diff --git a/src/core/SkPaintPriv.cpp b/src/core/SkPaintPriv.cpp
index 309d244..0114951 100644
--- a/src/core/SkPaintPriv.cpp
+++ b/src/core/SkPaintPriv.cpp
@@ -11,7 +11,7 @@
#include "SkImage.h"
#include "SkPaint.h"
#include "SkShaderBase.h"
-#include "SkUtils.h"
+#include "SkUTF.h"
#include "SkXfermodePriv.h"
static bool changes_alpha(const SkPaint& paint) {
diff --git a/src/core/SkRegion.cpp b/src/core/SkRegion.cpp
index 68aeaa2..ee1f014 100644
--- a/src/core/SkRegion.cpp
+++ b/src/core/SkRegion.cpp
@@ -13,7 +13,7 @@
#include "SkSafeMath.h"
#include "SkTemplates.h"
#include "SkTo.h"
-#include "SkUtils.h"
+#include "SkUTF.h"
#include <utility>
diff --git a/src/core/SkScan_AAAPath.cpp b/src/core/SkScan_AAAPath.cpp
index 9dbb271..16ecb91 100644
--- a/src/core/SkScan_AAAPath.cpp
+++ b/src/core/SkScan_AAAPath.cpp
@@ -21,7 +21,7 @@
#include "SkTSort.h"
#include "SkTemplates.h"
#include "SkTo.h"
-#include "SkUtils.h"
+#include "SkUTF.h"
#include <utility>
diff --git a/src/core/SkScan_DAAPath.cpp b/src/core/SkScan_DAAPath.cpp
index 572814b..a324d75 100644
--- a/src/core/SkScan_DAAPath.cpp
+++ b/src/core/SkScan_DAAPath.cpp
@@ -22,7 +22,7 @@
#include "SkScanPriv.h"
#include "SkTSort.h"
#include "SkTemplates.h"
-#include "SkUtils.h"
+#include "SkUTF.h"
///////////////////////////////////////////////////////////////////////////////
diff --git a/src/core/SkSpriteBlitter_ARGB32.cpp b/src/core/SkSpriteBlitter_ARGB32.cpp
index 945fd06..f6712e7 100644
--- a/src/core/SkSpriteBlitter_ARGB32.cpp
+++ b/src/core/SkSpriteBlitter_ARGB32.cpp
@@ -12,7 +12,7 @@
#include "SkColorData.h"
#include "SkPaint.h"
#include "SkTemplates.h"
-#include "SkUtils.h"
+#include "SkUTF.h"
#include "SkXfermodePriv.h"
///////////////////////////////////////////////////////////////////////////////
diff --git a/src/core/SkSpriteBlitter_RGB565.cpp b/src/core/SkSpriteBlitter_RGB565.cpp
index 488035e..8547f1d 100644
--- a/src/core/SkSpriteBlitter_RGB565.cpp
+++ b/src/core/SkSpriteBlitter_RGB565.cpp
@@ -12,7 +12,7 @@
#include "SkColorData.h"
#include "SkPaint.h"
#include "SkTemplates.h"
-#include "SkUtils.h"
+#include "SkUTF.h"
#include "SkXfermodePriv.h"
///////////////////////////////////////////////////////////////////////////////
diff --git a/src/core/SkStringUtils.cpp b/src/core/SkStringUtils.cpp
index 1743d0d..0f1bd5a 100644
--- a/src/core/SkStringUtils.cpp
+++ b/src/core/SkStringUtils.cpp
@@ -7,7 +7,7 @@
#include "SkString.h"
#include "SkStringUtils.h"
-#include "SkUtils.h"
+#include "SkUTF.h"
void SkAppendScalar(SkString* str, SkScalar value, SkScalarAsStringType asType) {
switch (asType) {
diff --git a/src/gpu/SkGpuDevice.cpp b/src/gpu/SkGpuDevice.cpp
index 2070110..88e106d 100644
--- a/src/gpu/SkGpuDevice.cpp
+++ b/src/gpu/SkGpuDevice.cpp
@@ -46,7 +46,7 @@
#include "SkSurface_Gpu.h"
#include "SkTLazy.h"
#include "SkTo.h"
-#include "SkUtils.h"
+#include "SkUTF.h"
#include "SkVertState.h"
#include "SkVertices.h"
#include "SkWritePixelsRec.h"
diff --git a/src/images/SkWebpEncoder.cpp b/src/images/SkWebpEncoder.cpp
index bda34dc..580f608 100644
--- a/src/images/SkWebpEncoder.cpp
+++ b/src/images/SkWebpEncoder.cpp
@@ -24,7 +24,7 @@
#include "SkStream.h"
#include "SkTemplates.h"
#include "SkUnPreMultiply.h"
-#include "SkUtils.h"
+#include "SkUTF.h"
#include "SkWebpEncoder.h"
// A WebP encoder only, on top of (subset of) libwebp
diff --git a/src/opts/SkBitmapProcState_opts_SSE2.cpp b/src/opts/SkBitmapProcState_opts_SSE2.cpp
index 2484123..92be971 100644
--- a/src/opts/SkBitmapProcState_opts_SSE2.cpp
+++ b/src/opts/SkBitmapProcState_opts_SSE2.cpp
@@ -10,7 +10,7 @@
#include "SkColorData.h"
#include "SkPaint.h"
#include "SkTo.h"
-#include "SkUtils.h"
+#include "SkUTF.h"
#include <emmintrin.h>
diff --git a/src/opts/SkBitmapProcState_opts_SSSE3.cpp b/src/opts/SkBitmapProcState_opts_SSSE3.cpp
index baabe69..e05b14c 100644
--- a/src/opts/SkBitmapProcState_opts_SSSE3.cpp
+++ b/src/opts/SkBitmapProcState_opts_SSSE3.cpp
@@ -8,7 +8,7 @@
#include "SkBitmapProcState_opts_SSSE3.h"
#include "SkColorData.h"
#include "SkPaint.h"
-#include "SkUtils.h"
+#include "SkUTF.h"
#include <tmmintrin.h> // SSSE3
diff --git a/src/opts/SkBlitRow_opts_SSE2.cpp b/src/opts/SkBlitRow_opts_SSE2.cpp
index d0ba5f5..222e99e 100644
--- a/src/opts/SkBlitRow_opts_SSE2.cpp
+++ b/src/opts/SkBlitRow_opts_SSE2.cpp
@@ -12,7 +12,7 @@
#include "SkColor_opts_SSE2.h"
#include "SkDither.h"
#include "SkMSAN.h"
-#include "SkUtils.h"
+#include "SkUTF.h"
/* SSE2 version of S32_Blend_BlitRow32()
* portable version is in core/SkBlitRow_D32.cpp
diff --git a/src/opts/SkBlitRow_opts_arm_neon.cpp b/src/opts/SkBlitRow_opts_arm_neon.cpp
index 530eac5..65f872d 100644
--- a/src/opts/SkBlitRow_opts_arm_neon.cpp
+++ b/src/opts/SkBlitRow_opts_arm_neon.cpp
@@ -12,7 +12,7 @@
#include "SkColorData.h"
#include "SkDither.h"
#include "SkMathPriv.h"
-#include "SkUtils.h"
+#include "SkUTF.h"
#include "SkColor_opts_neon.h"
#include <arm_neon.h>
diff --git a/src/pdf/SkClusterator.cpp b/src/pdf/SkClusterator.cpp
index 1b74d38..988c845 100644
--- a/src/pdf/SkClusterator.cpp
+++ b/src/pdf/SkClusterator.cpp
@@ -9,7 +9,7 @@
#include "SkGlyphRun.h"
#include "SkTo.h"
-#include "SkUtils.h"
+#include "SkUTF.h"
static bool is_reversed(const uint32_t* clusters, uint32_t count) {
// "ReversedChars" is how PDF deals with RTL text.
diff --git a/src/pdf/SkPDFDevice.cpp b/src/pdf/SkPDFDevice.cpp
index fb208f8..936743d 100644
--- a/src/pdf/SkPDFDevice.cpp
+++ b/src/pdf/SkPDFDevice.cpp
@@ -46,7 +46,7 @@
#include "SkTextBlob.h"
#include "SkTextFormatParams.h"
#include "SkTo.h"
-#include "SkUtils.h"
+#include "SkUTF.h"
#include "SkXfermodeInterpretation.h"
#ifndef SK_PDF_MASK_QUALITY
diff --git a/src/pdf/SkPDFFont.cpp b/src/pdf/SkPDFFont.cpp
index c25d724..c2ceb5c 100644
--- a/src/pdf/SkPDFFont.cpp
+++ b/src/pdf/SkPDFFont.cpp
@@ -23,7 +23,7 @@
#include "SkStream.h"
#include "SkTo.h"
#include "SkTypes.h"
-#include "SkUtils.h"
+#include "SkUTF.h"
#ifdef SK_PDF_USE_SFNTLY
#include "sample/chromium/font_subsetter.h"
diff --git a/src/pdf/SkPDFMakeToUnicodeCmap.cpp b/src/pdf/SkPDFMakeToUnicodeCmap.cpp
index 7fd2931..c6f8355 100644
--- a/src/pdf/SkPDFMakeToUnicodeCmap.cpp
+++ b/src/pdf/SkPDFMakeToUnicodeCmap.cpp
@@ -9,7 +9,7 @@
#include "SkPDFUtils.h"
#include "SkTo.h"
-#include "SkUtils.h"
+#include "SkUTF.h"
static void append_tounicode_header(SkDynamicMemoryWStream* cmap,
bool multibyte) {
diff --git a/src/ports/SkFontMgr_win_dw.cpp b/src/ports/SkFontMgr_win_dw.cpp
index 7954c77..01d09c4 100644
--- a/src/ports/SkFontMgr_win_dw.cpp
+++ b/src/ports/SkFontMgr_win_dw.cpp
@@ -22,7 +22,7 @@
#include "SkTypefaceCache.h"
#include "SkTypeface_win_dw.h"
#include "SkTypes.h"
-#include "SkUtils.h"
+#include "SkUTF.h"
#include <dwrite.h>
#include <dwrite_2.h>
diff --git a/src/ports/SkOSFile_stdio.cpp b/src/ports/SkOSFile_stdio.cpp
index 8c0be79..2df3019 100644
--- a/src/ports/SkOSFile_stdio.cpp
+++ b/src/ports/SkOSFile_stdio.cpp
@@ -20,7 +20,7 @@
#include <direct.h>
#include <io.h>
#include <vector>
-#include "SkUtils.h"
+#include "SkUTF.h"
#endif
#ifdef SK_BUILD_FOR_IOS
diff --git a/src/ports/SkRemotableFontMgr_win_dw.cpp b/src/ports/SkRemotableFontMgr_win_dw.cpp
index 2b99cf7..fbbe7e4 100644
--- a/src/ports/SkRemotableFontMgr_win_dw.cpp
+++ b/src/ports/SkRemotableFontMgr_win_dw.cpp
@@ -20,7 +20,7 @@
#include "SkTScopedComPtr.h"
#include "SkTypeface_win_dw.h"
#include "SkTypes.h"
-#include "SkUtils.h"
+#include "SkUTF.h"
#include <dwrite.h>
diff --git a/src/utils/SkWhitelistTypefaces.cpp b/src/utils/SkWhitelistTypefaces.cpp
index e02fd6b..eb6adc4 100644
--- a/src/utils/SkWhitelistTypefaces.cpp
+++ b/src/utils/SkWhitelistTypefaces.cpp
@@ -10,7 +10,7 @@
#include "SkStream.h"
#include "SkString.h"
#include "SkTypeface.h"
-#include "SkUtils.h"
+#include "SkUTF.h"
#include "../sfnt/SkOTUtils.h"
#include "SkWhitelistChecksums.inc"
diff --git a/tests/PaintTest.cpp b/tests/PaintTest.cpp
index 0bf6df6..a5f79ae 100644
--- a/tests/PaintTest.cpp
+++ b/tests/PaintTest.cpp
@@ -15,7 +15,7 @@
#include "SkReadBuffer.h"
#include "SkTo.h"
#include "SkTypeface.h"
-#include "SkUtils.h"
+#include "SkUTF.h"
#include "SkWriteBuffer.h"
#include "Test.h"
#undef ASSERT
diff --git a/tests/UnicodeTest.cpp b/tests/UnicodeTest.cpp
index 5dbcf08..43a8e6c 100644
--- a/tests/UnicodeTest.cpp
+++ b/tests/UnicodeTest.cpp
@@ -6,7 +6,7 @@
*/
#include "SkPaint.h"
-#include "SkUtils.h"
+#include "SkUTF.h"
#include "Test.h"
// Simple test to ensure that when we call textToGlyphs, we get the same
diff --git a/tools/fonts/create_test_font.cpp b/tools/fonts/create_test_font.cpp
index de19c09..cbf0b0b 100644
--- a/tools/fonts/create_test_font.cpp
+++ b/tools/fonts/create_test_font.cpp
@@ -18,7 +18,7 @@
#include "SkTArray.h"
#include "SkTSort.h"
#include "SkTypeface.h"
-#include "SkUtils.h"
+#include "SkUTF.h"
#include <stdio.h>
#define DEFAULT_FONT_NAME "sans-serif"
diff --git a/tools/fonts/sk_tool_utils_font.cpp b/tools/fonts/sk_tool_utils_font.cpp
index f14825a..15398c1 100644
--- a/tools/fonts/sk_tool_utils_font.cpp
+++ b/tools/fonts/sk_tool_utils_font.cpp
@@ -5,6 +5,8 @@
* found in the LICENSE file.
*/
+#include "sk_tool_utils.h"
+
#include "Resources.h"
#include "SkCommonFlags.h"
#include "SkFontMgr.h"
@@ -13,8 +15,8 @@
#include "SkOSFile.h"
#include "SkPaint.h"
#include "SkTestFontMgr.h"
-#include "SkUtils.h"
-#include "sk_tool_utils.h"
+#include "SkTypeface.h"
+#include "SkUTF.h"
namespace sk_tool_utils {
diff --git a/tools/sk_app/android/surface_glue_android.cpp b/tools/sk_app/android/surface_glue_android.cpp
index 04f8eea..5c8d21f 100644
--- a/tools/sk_app/android/surface_glue_android.cpp
+++ b/tools/sk_app/android/surface_glue_android.cpp
@@ -24,7 +24,7 @@
#include "ResourceFactory.h"
#include "SkTo.h"
#include "SkTypes.h"
-#include "SkUtils.h"
+#include "SkUTF.h"
#include "Window_android.h"
diff --git a/tools/sk_app/unix/Window_unix.cpp b/tools/sk_app/unix/Window_unix.cpp
index 745b4dd..09e3c52 100644
--- a/tools/sk_app/unix/Window_unix.cpp
+++ b/tools/sk_app/unix/Window_unix.cpp
@@ -9,7 +9,7 @@
#include "WindowContextFactory_unix.h"
-#include "SkUtils.h"
+#include "SkUTF.h"
#include "Timer.h"
#include "../GLWindowContext.h"
#include "Window_unix.h"