move GrColor.h to private, IWYU
Bug: skia:
Change-Id: I0f0dabd7cc54cb7786f53bd6da0c0c012375037e
Reviewed-on: https://skia-review.googlesource.com/104160
Commit-Queue: Mike Reed <reed@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>
diff --git a/gm/aaxfermodes.cpp b/gm/aaxfermodes.cpp
index 1420e3d..43b441c 100644
--- a/gm/aaxfermodes.cpp
+++ b/gm/aaxfermodes.cpp
@@ -6,8 +6,9 @@
*/
#include "gm.h"
+#include "GrColor.h"
#include "sk_tool_utils.h"
-#include "SkBlendModePriv.h"
+#include "SkColorPriv.h"
#include "SkPath.h"
#include "SkShader.h"
diff --git a/gm/composeshader.cpp b/gm/composeshader.cpp
index ac5457f..8033ff7 100644
--- a/gm/composeshader.cpp
+++ b/gm/composeshader.cpp
@@ -7,6 +7,7 @@
#include "gm.h"
+#include "SkColorPriv.h"
#include "SkCanvas.h"
#include "SkGradientShader.h"
#include "SkGraphics.h"
diff --git a/gm/filterbug.cpp b/gm/filterbug.cpp
index 181ba7c..258374f 100644
--- a/gm/filterbug.cpp
+++ b/gm/filterbug.cpp
@@ -6,6 +6,7 @@
*/
#include "gm.h"
+#include "SkColorPriv.h"
#include "SkImageShader.h"
static const sk_sp<SkImage> make_image(int firstBlackRow, int lastBlackRow) {
diff --git a/gm/image.cpp b/gm/image.cpp
index e98daef..fc91d6b 100644
--- a/gm/image.cpp
+++ b/gm/image.cpp
@@ -9,6 +9,7 @@
#include "gm.h"
#include "sk_tool_utils.h"
#include "SkAutoPixmapStorage.h"
+#include "SkColorPriv.h"
#include "SkData.h"
#include "SkCanvas.h"
#include "SkRandom.h"
diff --git a/gm/jpg_color_cube.cpp b/gm/jpg_color_cube.cpp
index 408cc90..b083428 100644
--- a/gm/jpg_color_cube.cpp
+++ b/gm/jpg_color_cube.cpp
@@ -7,6 +7,7 @@
#include "gm.h"
#include "sk_tool_utils.h"
#include "SkCanvas.h"
+#include "SkColorPriv.h"
#include "SkData.h"
#include "SkImage.h"
#include "SkImageEncoder.h"
diff --git a/gm/shapes_as_paths.cpp b/gm/shapes_as_paths.cpp
index 774ceed..4ad760d 100644
--- a/gm/shapes_as_paths.cpp
+++ b/gm/shapes_as_paths.cpp
@@ -8,6 +8,7 @@
#include "gm.h"
#include "SkAutoPixmapStorage.h"
+#include "SkColorPriv.h"
#include "SkImage.h"
#include "SkPath.h"
#include "SkSurface.h"
diff --git a/gm/showmiplevels.cpp b/gm/showmiplevels.cpp
index 4f27365..6f0975d 100644
--- a/gm/showmiplevels.cpp
+++ b/gm/showmiplevels.cpp
@@ -9,6 +9,7 @@
#include "sk_tool_utils.h"
#include "Resources.h"
+#include "SkColorPriv.h"
#include "SkGradientShader.h"
#include "SkTypeface.h"
#include "SkStream.h"
diff --git a/gm/simple_magnification.cpp b/gm/simple_magnification.cpp
index 14dade1..ef5f9c6 100644
--- a/gm/simple_magnification.cpp
+++ b/gm/simple_magnification.cpp
@@ -7,6 +7,7 @@
#include "gm.h"
#include "sk_tool_utils.h"
+#include "SkColorPriv.h"
#include "SkImageSource.h"
#include "SkMagnifierImageFilter.h"
#include "SkSurface.h"
diff --git a/gn/gpu.gni b/gn/gpu.gni
index 4d8f3d8..8e6f76b 100644
--- a/gn/gpu.gni
+++ b/gn/gpu.gni
@@ -12,7 +12,6 @@
"$_include/gpu/GrBackendSurface.h",
"$_include/gpu/GrBlend.h",
"$_include/gpu/GrCaps.h",
- "$_include/gpu/GrColor.h",
"$_include/gpu/GrConfig.h",
"$_include/gpu/GrContextOptions.h",
"$_include/gpu/GrContext.h",
@@ -34,6 +33,7 @@
# Private includes
"$_include/private/GrAuditTrail.h",
+ "$_include/private/GrColor.h",
"$_include/private/GrGLSL.h",
"$_include/private/GrOpList.h",
"$_include/private/GrSingleOwner.h",
diff --git a/include/core/SkImage.h b/include/core/SkImage.h
index deb0313..9e4e237 100644
--- a/include/core/SkImage.h
+++ b/include/core/SkImage.h
@@ -8,6 +8,7 @@
#ifndef SkImage_DEFINED
#define SkImage_DEFINED
+#include "GrTypes.h"
#include "SkFilterQuality.h"
#include "SkImageInfo.h"
#include "SkImageEncoder.h"
diff --git a/include/core/SkShader.h b/include/core/SkShader.h
index 290d09f..a5ba12e 100644
--- a/include/core/SkShader.h
+++ b/include/core/SkShader.h
@@ -9,11 +9,11 @@
#define SkShader_DEFINED
#include "SkBlendMode.h"
+#include "SkColor.h"
#include "SkFilterQuality.h"
#include "SkFlattenable.h"
#include "SkImageInfo.h"
#include "SkMatrix.h"
-#include "../gpu/GrColor.h"
class SkArenaAlloc;
class SkBitmap;
diff --git a/include/gpu/GrBlend.h b/include/gpu/GrBlend.h
index 30b0b9b..8c968f2 100644
--- a/include/gpu/GrBlend.h
+++ b/include/gpu/GrBlend.h
@@ -9,7 +9,7 @@
#ifndef GrBlend_DEFINED
#define GrBlend_DEFINED
-#include "GrColor.h"
+#include "GrTypes.h"
#include "../private/SkTLogic.h"
/**
diff --git a/include/gpu/GrContext.h b/include/gpu/GrContext.h
index d0ca90e..df9b85b 100644
--- a/include/gpu/GrContext.h
+++ b/include/gpu/GrContext.h
@@ -9,7 +9,6 @@
#define GrContext_DEFINED
#include "GrCaps.h"
-#include "GrColor.h"
#include "SkMatrix.h"
#include "SkPathEffect.h"
#include "SkTypes.h"
diff --git a/include/gpu/GrColor.h b/include/private/GrColor.h
similarity index 100%
rename from include/gpu/GrColor.h
rename to include/private/GrColor.h
diff --git a/src/core/SkPixmap.cpp b/src/core/SkPixmap.cpp
index 7873a9b..42e2c66 100644
--- a/src/core/SkPixmap.cpp
+++ b/src/core/SkPixmap.cpp
@@ -19,6 +19,7 @@
#include "SkReadPixelsRec.h"
#include "SkSurface.h"
#include "SkTemplates.h"
+#include "SkUnPreMultiply.h"
#include "SkUtils.h"
/////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/src/core/SkUnPreMultiplyPriv.h b/src/core/SkUnPreMultiplyPriv.h
index 073e239..f25e78f 100644
--- a/src/core/SkUnPreMultiplyPriv.h
+++ b/src/core/SkUnPreMultiplyPriv.h
@@ -9,6 +9,7 @@
#define SkUnPreMultiplyPriv_DEFINED
#include "SkColor.h"
+#include "SkUnPreMultiply.h"
template <bool kSwapRB>
void SkUnpremultiplyRow(uint32_t* dst, const uint32_t* src, int count) {
diff --git a/src/effects/SkBlurMask.cpp b/src/effects/SkBlurMask.cpp
index f06e2b9..59d7020 100644
--- a/src/effects/SkBlurMask.cpp
+++ b/src/effects/SkBlurMask.cpp
@@ -7,6 +7,7 @@
#include "SkBlurMask.h"
+#include "SkColorPriv.h"
#include "SkMaskBlurFilter.h"
#include "SkMath.h"
#include "SkTemplates.h"
diff --git a/src/effects/SkEmbossMaskFilter.cpp b/src/effects/SkEmbossMaskFilter.cpp
index 4caef9e..9fa26c5 100644
--- a/src/effects/SkEmbossMaskFilter.cpp
+++ b/src/effects/SkEmbossMaskFilter.cpp
@@ -8,6 +8,7 @@
#include "SkEmbossMaskFilter.h"
#include "SkBlurMaskFilter.h"
#include "SkBlurMask.h"
+#include "SkColorPriv.h"
#include "SkEmbossMask.h"
#include "SkReadBuffer.h"
#include "SkWriteBuffer.h"
diff --git a/src/gpu/GrBlend.cpp b/src/gpu/GrBlend.cpp
index 1bb4dd3..436829c 100644
--- a/src/gpu/GrBlend.cpp
+++ b/src/gpu/GrBlend.cpp
@@ -6,6 +6,7 @@
*/
#include "GrBlend.h"
+#include "../private/GrColor.h"
/**
* MaskedColor is used to evaluate the color and valid color component flags through the
diff --git a/tests/EncodeTest.cpp b/tests/EncodeTest.cpp
index 40e9956..8d5db7d 100644
--- a/tests/EncodeTest.cpp
+++ b/tests/EncodeTest.cpp
@@ -9,6 +9,7 @@
#include "Test.h"
#include "SkBitmap.h"
+#include "SkColorPriv.h"
#include "SkEncodedImageFormat.h"
#include "SkImage.h"
#include "SkJpegEncoder.h"