diff options
33 files changed, 36 insertions, 4 deletions
diff --git a/bench/AlternatingColorPatternBench.cpp b/bench/AlternatingColorPatternBench.cpp index 3777f2bbf3..57ff25a16c 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 5438daf789..fdd77ae88c 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 dfd0aa1649..ae0cb7ed1b 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 b5fcacf8d8..386fb43dfb 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 74d5b90652..6b6307619e 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 61da334490..290d09fc87 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 12c074ea55..2e790e2dd3 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 942242b02e..3676240ba8 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 ccf2d26fe9..90275b1cde 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 507c57e29d..a5e5a18cb9 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 dfe7572c2c..320cb0cc0b 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 0adc9c31b2..51fff8df79 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 dceb925ca0..56bdbffc77 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 0ddd8940ec..31b06ec3b9 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 e0f9910fe8..f648031ad4 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 cf0cb0fe75..b6e3538bf3 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 e09354ec72..cb8061ec9f 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 004befe654..55ded036b4 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 912567d06b..2aff982d3d 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 ff198bcf8b..ec478dbcac 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 9d227e9b43..3a3da75086 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 37be03016c..1f12efefc5 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 bf0f21a0e2..945fd06224 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 8151347ceb..488035e1b3 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 278cdcb87a..34650719b3 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 8831878602..f72863e498 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 ee701bd57b..19eabcfd91 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 11bf96d98f..528a6baa7e 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 2576ef42d7..176461106f 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 07b5999db6..ccc9a73e8f 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 4ca7522ceb..e148b1d99b 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 03653368ab..7ca7bc3948 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 698d5442d8..b154446e68 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" |