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/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"