IWYU -- SkShader.h Bug: skia: Change-Id: I57bffc14c4888627a22158e35f3ac3b762138f02 Reviewed-on: https://skia-review.googlesource.com/98520 Reviewed-by: Mike Reed <reed@google.com> Commit-Queue: Mike Reed <reed@google.com>

commit: 75ae421c24ee7ab5a86334e43404b24a6a6fb1f4 [log] [tgz]
author: Mike Reed <reed@google.com> Tue Jan 23 11:24:08 2018 -0500
committer: Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Jan 23 18:08:30 2018 +0000
tree: e74c3ca16e981519c1a514619b0e873fa74cfd1f
parent: ca4439f6fd17644be45468b10f5a2f45dcb2aebf [diff]
diff --git a/bench/AlternatingColorPatternBench.cpp b/bench/AlternatingColorPatternBench.cpp
index 3777f2b..57ff25a 100644
--- a/bench/AlternatingColorPatternBench.cpp
+++ b/bench/AlternatingColorPatternBench.cpp

@@ -6,6 +6,7 @@
  */
 
 #include "Benchmark.h"
+#include "SkBitmap.h"
 #include "SkCanvas.h"
 #include "SkGradientShader.h"
 #include "SkPaint.h"

diff --git a/bench/BlurImageFilterBench.cpp b/bench/BlurImageFilterBench.cpp
index 5438daf..fdd77ae 100644
--- a/bench/BlurImageFilterBench.cpp
+++ b/bench/BlurImageFilterBench.cpp

@@ -6,6 +6,7 @@
  */
 
 #include "Benchmark.h"
+#include "SkBitmap.h"
 #include "SkBlurImageFilter.h"
 #include "SkOffsetImageFilter.h"
 #include "SkCanvas.h"

diff --git a/bench/GameBench.cpp b/bench/GameBench.cpp
index dfd0aa1..ae0cb7e 100644
--- a/bench/GameBench.cpp
+++ b/bench/GameBench.cpp

@@ -6,6 +6,7 @@
  */
 
 #include "Benchmark.h"
+#include "SkBitmap.h"
 #include "SkCanvas.h"
 #include "SkPaint.h"
 #include "SkRandom.h"

diff --git a/bench/RectBench.cpp b/bench/RectBench.cpp
index b5fcacf..386fb43 100644
--- a/bench/RectBench.cpp
+++ b/bench/RectBench.cpp

@@ -4,7 +4,9 @@
  * 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"
 #include "SkCommandLineFlags.h"
 #include "SkPaint.h"

diff --git a/include/core/SkImage.h b/include/core/SkImage.h
index 74d5b90..6b63076 100644
--- a/include/core/SkImage.h
+++ b/include/core/SkImage.h

@@ -21,6 +21,7 @@
 
 class SkData;
 class SkCanvas;
+class SkImageFilter;
 class SkImageGenerator;
 class SkPaint;
 class SkPicture;

diff --git a/include/core/SkShader.h b/include/core/SkShader.h
index 61da334..290d09f 100644
--- a/include/core/SkShader.h
+++ b/include/core/SkShader.h

@@ -8,16 +8,15 @@
 #ifndef SkShader_DEFINED
 #define SkShader_DEFINED
 
-#include "SkBitmap.h"
+#include "SkBlendMode.h"
 #include "SkFilterQuality.h"
 #include "SkFlattenable.h"
 #include "SkImageInfo.h"
-#include "SkMask.h"
 #include "SkMatrix.h"
-#include "SkPaint.h"
 #include "../gpu/GrColor.h"
 
 class SkArenaAlloc;
+class SkBitmap;
 class SkColorFilter;
 class SkColorSpace;
 class SkColorSpaceXformer;

diff --git a/samplecode/SampleAARectModes.cpp b/samplecode/SampleAARectModes.cpp
index 12c074e..2e790e2 100644
--- a/samplecode/SampleAARectModes.cpp
+++ b/samplecode/SampleAARectModes.cpp

@@ -7,6 +7,7 @@
 
 #include "SampleCode.h"
 #include "SkView.h"
+#include "SkBitmap.h"
 #include "SkCanvas.h"
 #include "SkColorPriv.h"
 #include "SkShader.h"

diff --git a/samplecode/SampleAARects.cpp b/samplecode/SampleAARects.cpp
index 942242b..3676240 100644
--- a/samplecode/SampleAARects.cpp
+++ b/samplecode/SampleAARects.cpp

@@ -6,6 +6,7 @@
  */
 #include "SampleCode.h"
 #include "SkView.h"
+#include "SkBitmap.h"
 #include "SkCanvas.h"
 #include "SkPaint.h"
 #include "SkShader.h"

diff --git a/samplecode/SampleBitmapRect.cpp b/samplecode/SampleBitmapRect.cpp
index ccf2d26..90275b1 100644
--- a/samplecode/SampleBitmapRect.cpp
+++ b/samplecode/SampleBitmapRect.cpp

@@ -8,6 +8,7 @@
 #include "SampleCode.h"
 #include "SkAnimTimer.h"
 #include "SkView.h"
+#include "SkBitmap.h"
 #include "SkCanvas.h"
 #include "SkGradientShader.h"
 #include "SkGraphics.h"

diff --git a/samplecode/SampleBlur.cpp b/samplecode/SampleBlur.cpp
index 507c57e..a5e5a18 100644
--- a/samplecode/SampleBlur.cpp
+++ b/samplecode/SampleBlur.cpp

@@ -6,6 +6,7 @@
  */
 
 #include "SampleCode.h"
+#include "SkBitmap.h"
 #include "SkBlurMask.h"
 #include "SkBlurMaskFilter.h"
 #include "SkCanvas.h"

diff --git a/samplecode/SampleHairModes.cpp b/samplecode/SampleHairModes.cpp
index dfe7572..320cb0c 100644
--- a/samplecode/SampleHairModes.cpp
+++ b/samplecode/SampleHairModes.cpp

@@ -7,6 +7,7 @@
 
 #include "SampleCode.h"
 #include "SkView.h"
+#include "SkBitmap.h"
 #include "SkCanvas.h"
 #include "SkColorPriv.h"
 #include "SkShader.h"

diff --git a/samplecode/SampleHairline.cpp b/samplecode/SampleHairline.cpp
index 0adc9c3..51fff8d 100644
--- a/samplecode/SampleHairline.cpp
+++ b/samplecode/SampleHairline.cpp

@@ -8,6 +8,7 @@
 #include "SampleCode.h"
 #include "SkAnimTimer.h"
 #include "SkView.h"
+#include "SkBitmap.h"
 #include "SkCanvas.h"
 #include "SkCornerPathEffect.h"
 #include "SkGradientShader.h"

diff --git a/samplecode/SamplePath.cpp b/samplecode/SamplePath.cpp
index dceb925..56bdbff 100644
--- a/samplecode/SamplePath.cpp
+++ b/samplecode/SamplePath.cpp

@@ -8,6 +8,7 @@
 #include "SampleCode.h"
 #include "SkAnimTimer.h"
 #include "SkView.h"
+#include "SkBitmap.h"
 #include "SkCanvas.h"
 #include "SkGradientShader.h"
 #include "SkGraphics.h"

diff --git a/samplecode/SampleRegion.cpp b/samplecode/SampleRegion.cpp
index 0ddd894..31b06ec 100644
--- a/samplecode/SampleRegion.cpp
+++ b/samplecode/SampleRegion.cpp

@@ -7,6 +7,7 @@
 
 #include "SampleCode.h"
 #include "SkView.h"
+#include "SkBitmap.h"
 #include "SkCanvas.h"
 #include "SkGradientShader.h"
 #include "SkPath.h"

diff --git a/samplecode/SampleRepeatTile.cpp b/samplecode/SampleRepeatTile.cpp
index e0f9910..f648031 100644
--- a/samplecode/SampleRepeatTile.cpp
+++ b/samplecode/SampleRepeatTile.cpp

@@ -6,6 +6,7 @@
  */
 #include "SampleCode.h"
 #include "SkView.h"
+#include "SkBitmap.h"
 #include "SkCanvas.h"
 #include "SkShader.h"
 

diff --git a/samplecode/SampleShaderText.cpp b/samplecode/SampleShaderText.cpp
index cf0cb0f..b6e3538 100644
--- a/samplecode/SampleShaderText.cpp
+++ b/samplecode/SampleShaderText.cpp

@@ -6,6 +6,7 @@
  */
 
 #include "SampleCode.h"
+#include "SkBitmap.h"
 #include "SkCanvas.h"
 #include "SkGradientShader.h"
 #include "SkPath.h"

diff --git a/samplecode/SampleTiling.cpp b/samplecode/SampleTiling.cpp
index e09354e..cb8061e 100644
--- a/samplecode/SampleTiling.cpp
+++ b/samplecode/SampleTiling.cpp

@@ -4,8 +4,10 @@
  * 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 "SkBitmap.h"
 #include "SkCanvas.h"
 #include "SkPaint.h"
 #include "SkPath.h"

diff --git a/samplecode/SampleVertices.cpp b/samplecode/SampleVertices.cpp
index 004befe..55ded03 100644
--- a/samplecode/SampleVertices.cpp
+++ b/samplecode/SampleVertices.cpp

@@ -6,6 +6,7 @@
  */
 #include "SampleCode.h"
 #include "SkView.h"
+#include "SkBitmap.h"
 #include "SkCanvas.h"
 #include "SkGradientShader.h"
 #include "SkGraphics.h"

diff --git a/samplecode/SampleWritePixels.cpp b/samplecode/SampleWritePixels.cpp
index 912567d..2aff982 100644
--- a/samplecode/SampleWritePixels.cpp
+++ b/samplecode/SampleWritePixels.cpp

@@ -6,6 +6,7 @@
  */
 #include "SampleCode.h"
 #include "SkView.h"
+#include "SkBitmap.h"
 #include "SkCanvas.h"
 #include "SkCornerPathEffect.h"
 #include "SkGradientShader.h"

diff --git a/samplecode/SampleXfermodesBlur.cpp b/samplecode/SampleXfermodesBlur.cpp
index ff198bc..ec478db 100644
--- a/samplecode/SampleXfermodesBlur.cpp
+++ b/samplecode/SampleXfermodesBlur.cpp

@@ -7,6 +7,7 @@
 
 #include "SampleCode.h"
 #include "SkView.h"
+#include "SkBitmap.h"
 #include "SkBlurMask.h"
 #include "SkCanvas.h"
 #include "SkCornerPathEffect.h"

diff --git a/src/core/SkCoreBlitters.h b/src/core/SkCoreBlitters.h
index 9d227e9..3a3da75 100644
--- a/src/core/SkCoreBlitters.h
+++ b/src/core/SkCoreBlitters.h

@@ -11,6 +11,7 @@
 #include "SkBitmapProcShader.h"
 #include "SkBlitter.h"
 #include "SkBlitRow.h"
+#include "SkPaint.h"
 #include "SkShaderBase.h"
 #include "SkXfermodePriv.h"
 

diff --git a/src/core/SkScan_Hairline.cpp b/src/core/SkScan_Hairline.cpp
index 37be030..1f12efe 100644
--- a/src/core/SkScan_Hairline.cpp
+++ b/src/core/SkScan_Hairline.cpp

@@ -8,6 +8,7 @@
 #include "SkScan.h"
 #include "SkBlitter.h"
 #include "SkMathPriv.h"
+#include "SkPaint.h"
 #include "SkRasterClip.h"
 #include "SkFDot6.h"
 #include "SkLineClipper.h"

diff --git a/src/core/SkSpriteBlitter_ARGB32.cpp b/src/core/SkSpriteBlitter_ARGB32.cpp
index bf0f21a..945fd06 100644
--- a/src/core/SkSpriteBlitter_ARGB32.cpp
+++ b/src/core/SkSpriteBlitter_ARGB32.cpp

@@ -10,6 +10,7 @@
 #include "SkBlitRow.h"
 #include "SkColorFilter.h"
 #include "SkColorData.h"
+#include "SkPaint.h"
 #include "SkTemplates.h"
 #include "SkUtils.h"
 #include "SkXfermodePriv.h"

diff --git a/src/core/SkSpriteBlitter_RGB565.cpp b/src/core/SkSpriteBlitter_RGB565.cpp
index 8151347..488035e 100644
--- a/src/core/SkSpriteBlitter_RGB565.cpp
+++ b/src/core/SkSpriteBlitter_RGB565.cpp

@@ -10,6 +10,7 @@
 #include "SkBlitRow.h"
 #include "SkColorFilter.h"
 #include "SkColorData.h"
+#include "SkPaint.h"
 #include "SkTemplates.h"
 #include "SkUtils.h"
 #include "SkXfermodePriv.h"

diff --git a/src/core/SkWriteBuffer.cpp b/src/core/SkWriteBuffer.cpp
index 278cdcb..3465071 100644
--- a/src/core/SkWriteBuffer.cpp
+++ b/src/core/SkWriteBuffer.cpp

@@ -9,6 +9,7 @@
 #include "SkBitmap.h"
 #include "SkData.h"
 #include "SkDeduper.h"
+#include "SkPaint.h"
 #include "SkPixelRef.h"
 #include "SkPtrRecorder.h"
 #include "SkStream.h"

diff --git a/src/shaders/SkShaderBase.h b/src/shaders/SkShaderBase.h
index 8831878..f72863e 100644
--- a/src/shaders/SkShaderBase.h
+++ b/src/shaders/SkShaderBase.h

@@ -9,6 +9,7 @@
 #define SkShaderBase_DEFINED
 
 #include "SkFilterQuality.h"
+#include "SkMask.h"
 #include "SkMatrix.h"
 #include "SkShader.h"
 

diff --git a/src/shaders/gradients/Sk4fGradientBase.cpp b/src/shaders/gradients/Sk4fGradientBase.cpp
index ee701bd..19eabcf 100644
--- a/src/shaders/gradients/Sk4fGradientBase.cpp
+++ b/src/shaders/gradients/Sk4fGradientBase.cpp

@@ -6,7 +6,7 @@
  */
 
 #include "Sk4fGradientBase.h"
-
+#include "SkPaint.h"
 #include <functional>
 
 namespace {

diff --git a/src/shaders/gradients/Sk4fLinearGradient.cpp b/src/shaders/gradients/Sk4fLinearGradient.cpp
index 11bf96d..528a6ba 100644
--- a/src/shaders/gradients/Sk4fLinearGradient.cpp
+++ b/src/shaders/gradients/Sk4fLinearGradient.cpp

@@ -7,6 +7,7 @@
 
 #include "Sk4fLinearGradient.h"
 #include "Sk4x4f.h"
+#include "SkPaint.h"
 
 #include <cmath>
 

diff --git a/tests/DefaultPathRendererTest.cpp b/tests/DefaultPathRendererTest.cpp
index 2576ef4..1764611 100644
--- a/tests/DefaultPathRendererTest.cpp
+++ b/tests/DefaultPathRendererTest.cpp

@@ -6,6 +6,7 @@
  */
 
 #include "Test.h"
+#include "SkBitmap.h"
 
 #if SK_SUPPORT_GPU
 #include "GrClip.h"

diff --git a/tests/GrMeshTest.cpp b/tests/GrMeshTest.cpp
index 07b5999..ccc9a73 100644
--- a/tests/GrMeshTest.cpp
+++ b/tests/GrMeshTest.cpp

@@ -18,6 +18,7 @@
 #include "GrRenderTargetContextPriv.h"
 #include "GrResourceProvider.h"
 #include "GrResourceKey.h"
+#include "SkBitmap.h"
 #include "SkMakeUnique.h"
 #include "glsl/GrGLSLVertexGeoBuilder.h"
 #include "glsl/GrGLSLFragmentShaderBuilder.h"

diff --git a/tests/OnFlushCallbackTest.cpp b/tests/OnFlushCallbackTest.cpp
index 4ca7522..e148b1d 100644
--- a/tests/OnFlushCallbackTest.cpp
+++ b/tests/OnFlushCallbackTest.cpp

@@ -18,6 +18,7 @@
 #include "GrRenderTargetContextPriv.h"
 #include "GrResourceProvider.h"
 #include "GrQuad.h"
+#include "SkBitmap.h"
 #include "SkPointPriv.h"
 #include "effects/GrSimpleTextureEffect.h"
 #include "ops/GrSimpleMeshDrawOpHelper.h"

diff --git a/tests/PaintImageFilterTest.cpp b/tests/PaintImageFilterTest.cpp
index 0365336..7ca7bc3 100644
--- a/tests/PaintImageFilterTest.cpp
+++ b/tests/PaintImageFilterTest.cpp

@@ -5,6 +5,7 @@
  * found in the LICENSE file.
  */
 
+#include "SkBitmap.h"
 #include "SkCanvas.h"
 #include "SkGradientShader.h"
 #include "SkPaintImageFilter.h"

diff --git a/tests/ShaderOpacityTest.cpp b/tests/ShaderOpacityTest.cpp
index 698d544..b154446 100644
--- a/tests/ShaderOpacityTest.cpp
+++ b/tests/ShaderOpacityTest.cpp

@@ -5,6 +5,7 @@
  * found in the LICENSE file.
  */
 
+#include "SkBitmap.h"
 #include "SkColorShader.h"
 #include "SkGradientShader.h"
 #include "SkShader.h"
commit	75ae421c24ee7ab5a86334e43404b24a6a6fb1f4	[log] [tgz]
author	Mike Reed <reed@google.com>	Tue Jan 23 11:24:08 2018 -0500
committer	Skia Commit-Bot <skia-commit-bot@chromium.org>	Tue Jan 23 18:08:30 2018 +0000
tree	e74c3ca16e981519c1a514619b0e873fa74cfd1f
parent	ca4439f6fd17644be45468b10f5a2f45dcb2aebf [diff]