Make header files self-sufficient

Change-Id: Ice7d761b1023da77e50e5d6aa597964f7d9aa1d8
Reviewed-on: https://skia-review.googlesource.com/8302
Commit-Queue: Hal Canary <halcanary@google.com>
Reviewed-by: Mike Reed <reed@google.com>

29 files changed, 58 insertions, 14 deletions

diff --git a/src/android/SkBitmapRegionDecoderPriv.h b/src/android/SkBitmapRegionDecoderPriv.h
index baa891e9c3..db7bd42051 100644
--- a/src/android/SkBitmapRegionDecoderPriv.h
+++ b/src/android/SkBitmapRegionDecoderPriv.h
@@ -8,6 +8,8 @@
 #ifndef SkBitmapRegionDecoderPriv_DEFINED
 #define SkBitmapRegionDecoderPriv_DEFINED
 
+#include "SkRect.h"
+
 enum SubsetType {
     kFullyInside_SubsetType,
     kPartiallyInside_SubsetType,
diff --git a/src/core/SkDeduper.h b/src/core/SkDeduper.h
index f82f4fd8c2..4ba685f10d 100644
--- a/src/core/SkDeduper.h
+++ b/src/core/SkDeduper.h
@@ -8,7 +8,7 @@
 #ifndef SkDeduper_DEFINED
 #define SkDeduper_DEFINED
 
-#include "SkTypes.h"
+#include "SkFlattenable.h"
 
 class SkImage;
 class SkPicture;
diff --git a/src/core/SkICCPriv.h b/src/core/SkICCPriv.h
index bc8a9e9533..4c656f17d8 100644
--- a/src/core/SkICCPriv.h
+++ b/src/core/SkICCPriv.h
@@ -5,6 +5,11 @@
  * found in the LICENSE file.
  */
 
+#ifndef SkICCPriv_DEFINED
+#define SkICCPriv_DEFINED
+
+#include "SkTypes.h"
+
 // This is equal to the header size according to the ICC specification (128)
 // plus the size of the tag count (4).  We include the tag count since we
 // always require it to be present anyway.
@@ -44,3 +49,4 @@ enum ParaCurveType {
     kGABDE_ParaCurveType       = 3,
     kGABCDEF_ParaCurveType     = 4,
 };
+#endif  // SkICCPriv_DEFINED
diff --git a/src/core/SkImageInfoPriv.h b/src/core/SkImageInfoPriv.h
index 81d7070062..40209f8946 100644
--- a/src/core/SkImageInfoPriv.h
+++ b/src/core/SkImageInfoPriv.h
@@ -5,6 +5,11 @@
  * found in the LICENSE file.
  */
 
+#ifndef SkImageInfoPriv_DEFINED
+#define SkImageInfoPriv_DEFINED
+
+#include "SkImageInfo.h"
+
 /**
  *  Returns true if |info| contains a valid combination of width, height, colorType, alphaType,
  *  colorSpace.  Returns false otherwise.
@@ -85,3 +90,4 @@ static inline bool SkImageInfoValidConversion(const SkImageInfo& dst, const SkIm
 
     return true;
 }
+#endif  // SkImageInfoPriv_DEFINED
diff --git a/src/core/SkMatrixUtils.h b/src/core/SkMatrixUtils.h
index 0e01fbe953..c311a6cfd2 100644
--- a/src/core/SkMatrixUtils.h
+++ b/src/core/SkMatrixUtils.h
@@ -8,6 +8,7 @@
 #ifndef SkMatrixUtils_DEFINED
 #define SkMatrixUtils_DEFINED
 
+#include "SkPoint.h"
 #include "SkSize.h"
 
 class SkMatrix;
diff --git a/src/core/SkPictureContentInfo.h b/src/core/SkPictureContentInfo.h
index 81c8a274e3..36cfa7784f 100644
--- a/src/core/SkPictureContentInfo.h
+++ b/src/core/SkPictureContentInfo.h
@@ -8,6 +8,7 @@
 #ifndef SkPictureContentInfo_DEFINED
 #define SkPictureContentInfo_DEFINED
 
+#include "SkPaint.h"
 #include "SkTDArray.h"
 
 class GrContext;
diff --git a/src/core/SkPipe.h b/src/core/SkPipe.h
index 1418387e3b..027edfba7a 100644
--- a/src/core/SkPipe.h
+++ b/src/core/SkPipe.h
@@ -9,16 +9,19 @@
 #define SkPipe_DEFINED
 
 #include "SkData.h"
+#include "SkImage.h"
+#include "SkPicture.h"
 
 class SkCanvas;
-class SkImage;
-class SkPicture;
-class SkTypefaceSerializer;
-class SkTypefaceDeserializer;
-class SkImageSerializer;
 class SkImageDeserializer;
+class SkImageSerializer;
+class SkTypeface;
+class SkTypefaceDeserializer;
+class SkTypefaceSerializer;
 class SkWStream;
 
+struct SkRect;
+
 class SkPipeSerializer {
 public:
     SkPipeSerializer();
diff --git a/src/core/SkRecordPattern.h b/src/core/SkRecordPattern.h
index 45f45724c1..73fe7630c4 100644
--- a/src/core/SkRecordPattern.h
+++ b/src/core/SkRecordPattern.h
@@ -8,6 +8,7 @@
 #ifndef SkRecordPattern_DEFINED
 #define SkRecordPattern_DEFINED
 
+#include "SkRecord.h"
 #include "SkTLogic.h"
 
 namespace SkRecords {
diff --git a/src/core/SkSpecialSurface.h b/src/core/SkSpecialSurface.h
index 2aa03dd4de..96b74a4dac 100644
--- a/src/core/SkSpecialSurface.h
+++ b/src/core/SkSpecialSurface.h
@@ -8,13 +8,17 @@
 #ifndef SkSpecialSurface_DEFINED
 #define SkSpecialSurface_DEFINED
 
+#include "SkImageInfo.h"
 #include "SkRefCnt.h"
 #include "SkSurfaceProps.h"
 
+#if SK_SUPPORT_GPU
+#include "GrTypes.h"
+#endif
+
 class GrContext;
-struct GrSurfaceDesc;
+class SkBitmap;
 class SkCanvas;
-struct SkImageInfo;
 class SkSpecialImage;
 
 /**
diff --git a/src/core/SkStringUtils.h b/src/core/SkStringUtils.h
index fd158c30bd..fecf833d73 100644
--- a/src/core/SkStringUtils.h
+++ b/src/core/SkStringUtils.h
@@ -8,6 +8,8 @@
 #ifndef SkStringUtils_DEFINED
 #define SkStringUtils_DEFINED
 
+#include "SkScalar.h"
+
 class SkString;
 
 /**
diff --git a/src/core/SkValidationUtils.h b/src/core/SkValidationUtils.h
index d71666c929..5e2b91d4d3 100644
--- a/src/core/SkValidationUtils.h
+++ b/src/core/SkValidationUtils.h
@@ -10,6 +10,7 @@
 
 #include "SkBitmap.h"
 #include "SkBlendMode.h"
+#include "SkXfermodePriv.h"
 
 /** Returns true if coeff's value is in the SkXfermode::Coeff enum.
   */
diff --git a/src/gpu/GrAppliedClip.h b/src/gpu/GrAppliedClip.h
index 27fbde0b29..ed75becd3e 100644
--- a/src/gpu/GrAppliedClip.h
+++ b/src/gpu/GrAppliedClip.h
@@ -8,11 +8,10 @@
 #ifndef GrAppliedClip_DEFINED
 #define GrAppliedClip_DEFINED
 
+#include "GrFragmentProcessor.h"
 #include "GrScissorState.h"
 #include "GrWindowRectsState.h"
 
-class GrFragmentProcessor;
-
 /**
  * Produced by GrClip. It provides a set of modifications to the drawing state that are used to
  * create the final GrPipeline for a GrOp.
diff --git a/src/gpu/GrPathRenderingRenderTargetContext.h b/src/gpu/GrPathRenderingRenderTargetContext.h
index d26f08ecdb..420bbe83b3 100644
--- a/src/gpu/GrPathRenderingRenderTargetContext.h
+++ b/src/gpu/GrPathRenderingRenderTargetContext.h
@@ -8,9 +8,7 @@
 #ifndef GrPathRenderingRenderTargetContext_DEFINED
 #define GrPathRenderingRenderTargetContext_DEFINED
 
-#include "GrRenderTargetContext.h"
-
-class GrStencilAndCoverTextContext;
+#include "text/GrStencilAndCoverTextContext.h"
 
 class GrPathRenderingRenderTargetContext : public GrRenderTargetContext {
 public:
diff --git a/src/gpu/ops/GrStencilPathOp.h b/src/gpu/ops/GrStencilPathOp.h
index f21b524f2f..462b626a83 100644
--- a/src/gpu/ops/GrStencilPathOp.h
+++ b/src/gpu/ops/GrStencilPathOp.h
@@ -14,6 +14,7 @@
 #include "GrPath.h"
 #include "GrPathRendering.h"
 #include "GrRenderTarget.h"
+#include "GrStencilSettings.h"
 
 class GrStencilPathOp final : public GrOp {
 public:
diff --git a/src/opts/SkBlurImageFilter_opts.h b/src/opts/SkBlurImageFilter_opts.h
index 497bcde33f..f953a2e7e8 100644
--- a/src/opts/SkBlurImageFilter_opts.h
+++ b/src/opts/SkBlurImageFilter_opts.h
@@ -9,7 +9,7 @@
 #define SkBlurImageFilter_opts_DEFINED
 
 #include "SkColorPriv.h"
-#include "SkTypes.h"
+#include "SkRect.h"
 
 #if SK_CPU_SSE_LEVEL >= SK_CPU_SSE_LEVEL_SSE2
     #include <immintrin.h>
diff --git a/src/opts/SkMorphologyImageFilter_opts.h b/src/opts/SkMorphologyImageFilter_opts.h
index e30a9e4973..0c29ff1af2 100644
--- a/src/opts/SkMorphologyImageFilter_opts.h
+++ b/src/opts/SkMorphologyImageFilter_opts.h
@@ -8,6 +8,8 @@
 #ifndef SkMorphologyImageFilter_opts_DEFINED
 #define SkMorphologyImageFilter_opts_DEFINED
 
+#include "SkColor.h"
+
 namespace SK_OPTS_NS {
 
 enum MorphType { kDilate, kErode };
diff --git a/src/sfnt/SkTTCFHeader.h b/src/sfnt/SkTTCFHeader.h
index 2dc77eea57..71c6661e10 100644
--- a/src/sfnt/SkTTCFHeader.h
+++ b/src/sfnt/SkTTCFHeader.h
@@ -9,6 +9,7 @@
 #define SkTTCFHeader_DEFINED
 
 #include "SkOTTableTypes.h"
+#include "SkSFNTHeader.h"
 
 #pragma pack(push, 1)
 
diff --git a/src/sksl/ast/SkSLASTParameter.h b/src/sksl/ast/SkSLASTParameter.h
index 7b653ad289..6bb13acf49 100644
--- a/src/sksl/ast/SkSLASTParameter.h
+++ b/src/sksl/ast/SkSLASTParameter.h
@@ -8,6 +8,7 @@
 #ifndef SKSL_ASTPARAMETER
 #define SKSL_ASTPARAMETER
 
+#include "SkSLASTPositionNode.h"
 #include "SkSLASTType.h"
 #include "../ir/SkSLModifiers.h"
 
diff --git a/src/sksl/ast/SkSLASTType.h b/src/sksl/ast/SkSLASTType.h
index 81594000e5..9cbded1043 100644
--- a/src/sksl/ast/SkSLASTType.h
+++ b/src/sksl/ast/SkSLASTType.h
@@ -8,6 +8,8 @@
 #ifndef SKSL_ASTTYPE
 #define SKSL_ASTTYPE
 
+#include "SkSLASTPositionNode.h"
+
 namespace SkSL {
 
 /**
diff --git a/src/sksl/ir/SkSLField.h b/src/sksl/ir/SkSLField.h
index f73b6025ec..53d85e0d5b 100644
--- a/src/sksl/ir/SkSLField.h
+++ b/src/sksl/ir/SkSLField.h
@@ -12,6 +12,7 @@
 #include "SkSLPosition.h"
 #include "SkSLSymbol.h"
 #include "SkSLType.h"
+#include "SkSLVariable.h"
 
 namespace SkSL {
 
diff --git a/src/sksl/ir/SkSLFunctionReference.h b/src/sksl/ir/SkSLFunctionReference.h
index ec1fc3804c..e95833d6e6 100644
--- a/src/sksl/ir/SkSLFunctionReference.h
+++ b/src/sksl/ir/SkSLFunctionReference.h
@@ -10,6 +10,7 @@
 
 #include "SkSLContext.h"
 #include "SkSLExpression.h"
+#include "SkSLFunctionDeclaration.h"
 
 namespace SkSL {
 
diff --git a/src/sksl/ir/SkSLIntLiteral.h b/src/sksl/ir/SkSLIntLiteral.h
index 23325e65fb..b6a23d650c 100644
--- a/src/sksl/ir/SkSLIntLiteral.h
+++ b/src/sksl/ir/SkSLIntLiteral.h
@@ -8,6 +8,7 @@
 #ifndef SKSL_INTLITERAL
 #define SKSL_INTLITERAL
 
+#include "SkSLContext.h"
 #include "SkSLExpression.h"
 
 namespace SkSL {
diff --git a/src/sksl/ir/SkSLInterfaceBlock.h b/src/sksl/ir/SkSLInterfaceBlock.h
index bc84396b2d..0141953c35 100644
--- a/src/sksl/ir/SkSLInterfaceBlock.h
+++ b/src/sksl/ir/SkSLInterfaceBlock.h
@@ -9,6 +9,7 @@
 #define SKSL_INTERFACEBLOCK
 
 #include "SkSLProgramElement.h"
+#include "SkSLSymbolTable.h"
 #include "SkSLVarDeclarations.h"
 
 namespace SkSL {
diff --git a/src/sksl/ir/SkSLPostfixExpression.h b/src/sksl/ir/SkSLPostfixExpression.h
index 6c9fafe5a0..05ff1675e0 100644
--- a/src/sksl/ir/SkSLPostfixExpression.h
+++ b/src/sksl/ir/SkSLPostfixExpression.h
@@ -9,6 +9,7 @@
 #define SKSL_POSTFIXEXPRESSION
 
 #include "SkSLExpression.h"
+#include "SkSLToken.h"
 
 namespace SkSL {
 
diff --git a/src/sksl/ir/SkSLPrefixExpression.h b/src/sksl/ir/SkSLPrefixExpression.h
index b7db99a0a4..dafe1e9599 100644
--- a/src/sksl/ir/SkSLPrefixExpression.h
+++ b/src/sksl/ir/SkSLPrefixExpression.h
@@ -9,6 +9,7 @@
 #define SKSL_PREFIXEXPRESSION
 
 #include "SkSLExpression.h"
+#include "SkSLToken.h"
 
 namespace SkSL {
 
diff --git a/src/sksl/ir/SkSLSwizzle.h b/src/sksl/ir/SkSLSwizzle.h
index 8ad9001ada..0803f3bc36 100644
--- a/src/sksl/ir/SkSLSwizzle.h
+++ b/src/sksl/ir/SkSLSwizzle.h
@@ -8,6 +8,7 @@
 #ifndef SKSL_SWIZZLE
 #define SKSL_SWIZZLE
 
+#include "SkSLContext.h"
 #include "SkSLExpression.h"
 #include "SkSLUtil.h"
 
diff --git a/src/sksl/ir/SkSLVarDeclarations.h b/src/sksl/ir/SkSLVarDeclarations.h
index 490259a081..5781230ece 100644
--- a/src/sksl/ir/SkSLVarDeclarations.h
+++ b/src/sksl/ir/SkSLVarDeclarations.h
@@ -9,6 +9,7 @@
 #define SKSL_VARDECLARATIONS
 
 #include "SkSLExpression.h"
+#include "SkSLProgramElement.h"
 #include "SkSLStatement.h"
 #include "SkSLVariable.h"
 
diff --git a/src/sksl/ir/SkSLVariableReference.h b/src/sksl/ir/SkSLVariableReference.h
index fecb04e2e5..7d90511590 100644
--- a/src/sksl/ir/SkSLVariableReference.h
+++ b/src/sksl/ir/SkSLVariableReference.h
@@ -9,6 +9,9 @@
 #define SKSL_VARIABLEREFERENCE
 
 #include "SkSLExpression.h"
+#include "SkSLFloatLiteral.h"
+#include "SkSLIRGenerator.h"
+#include "SkSLIntLiteral.h"
 
 namespace SkSL {
 
diff --git a/src/utils/SkTextureCompressor_Utils.h b/src/utils/SkTextureCompressor_Utils.h
index 9b115a2964..6fb0d6b190 100644
--- a/src/utils/SkTextureCompressor_Utils.h
+++ b/src/utils/SkTextureCompressor_Utils.h
@@ -8,6 +8,8 @@
 #ifndef SkTextureCompressorUtils_DEFINED
 #define SkTextureCompressorUtils_DEFINED
 
+#include <cstdint>
+
 namespace SkTextureCompressor {
 
     // In some compression formats used for grayscale alpha, i.e. coverage masks, three