Remove unnecessary includes in src/pdf/

Use forward declaration more.

BUG=None
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2110033002

Review-Url: https://codereview.chromium.org/2110033002

23 files changed, 21 insertions, 43 deletions

diff --git a/src/pdf/SkDeflate.cpp b/src/pdf/SkDeflate.cpp
index ebf203a264..d4a842969c 100644
--- a/src/pdf/SkDeflate.cpp
+++ b/src/pdf/SkDeflate.cpp
@@ -8,7 +8,6 @@
 
 #include "SkData.h"
 #include "SkDeflate.h"
-#include "SkStream.h"
 
 #ifdef ZLIB_INCLUDE
     #include ZLIB_INCLUDE
diff --git a/src/pdf/SkDeflate.h b/src/pdf/SkDeflate.h
index d3ce5e945f..387de40a15 100644
--- a/src/pdf/SkDeflate.h
+++ b/src/pdf/SkDeflate.h
@@ -9,8 +9,6 @@
 #ifndef SkFlate_DEFINED
 #define SkFlate_DEFINED
 
-#include "SkTypes.h"
-
 #include "SkStream.h"
 
 /**
diff --git a/src/pdf/SkPDFBitmap.cpp b/src/pdf/SkPDFBitmap.cpp
index e483e341d9..887bca4ab0 100644
--- a/src/pdf/SkPDFBitmap.cpp
+++ b/src/pdf/SkPDFBitmap.cpp
@@ -12,6 +12,7 @@
 #include "SkJpegInfo.h"
 #include "SkPDFBitmap.h"
 #include "SkPDFCanon.h"
+#include "SkPDFTypes.h"
 #include "SkStream.h"
 #include "SkUnPreMultiply.h"
 
diff --git a/src/pdf/SkPDFBitmap.h b/src/pdf/SkPDFBitmap.h
index 86beef31ce..8de796c70b 100644
--- a/src/pdf/SkPDFBitmap.h
+++ b/src/pdf/SkPDFBitmap.h
@@ -7,9 +7,11 @@
 #ifndef SkPDFBitmap_DEFINED
 #define SkPDFBitmap_DEFINED
 
-#include "SkPDFTypes.h"
+#include "SkRefCnt.h"
 
 class SkImage;
+class SkPixelSerializer;
+class SkPDFObject;
 
 /**
  * SkPDFBitmap wraps a SkImage and serializes it as an image Xobject.
diff --git a/src/pdf/SkPDFCanon.cpp b/src/pdf/SkPDFCanon.cpp
index c981217123..11bfb892d1 100644
--- a/src/pdf/SkPDFCanon.cpp
+++ b/src/pdf/SkPDFCanon.cpp
@@ -9,7 +9,6 @@
 #include "SkPDFBitmap.h"
 #include "SkPDFCanon.h"
 #include "SkPDFFont.h"
-#include "SkPDFShader.h"
 
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/pdf/SkPDFCanon.h b/src/pdf/SkPDFCanon.h
index 6d23e1bad2..cae93c97c9 100644
--- a/src/pdf/SkPDFCanon.h
+++ b/src/pdf/SkPDFCanon.h
@@ -15,8 +15,6 @@
 #include "SkBitmapKey.h"
 
 class SkPDFFont;
-class SkPaint;
-class SkImage;
 
 /**
  *  The SkPDFCanon canonicalizes objects across PDF pages
diff --git a/src/pdf/SkPDFDevice.cpp b/src/pdf/SkPDFDevice.cpp
index b9e310d846..204678a687 100644
--- a/src/pdf/SkPDFDevice.cpp
+++ b/src/pdf/SkPDFDevice.cpp
@@ -8,12 +8,11 @@
 #include "SkPDFDevice.h"
 
 #include "SkAnnotationKeys.h"
+#include "SkBitmapKey.h"
 #include "SkColor.h"
 #include "SkColorFilter.h"
-#include "SkClipStack.h"
 #include "SkDraw.h"
 #include "SkGlyphCache.h"
-#include "SkPaint.h"
 #include "SkPath.h"
 #include "SkPathEffect.h"
 #include "SkPathOps.h"
@@ -29,7 +28,6 @@
 #include "SkPDFTypes.h"
 #include "SkPDFUtils.h"
 #include "SkRasterClip.h"
-#include "SkRect.h"
 #include "SkRRect.h"
 #include "SkString.h"
 #include "SkSurface.h"
diff --git a/src/pdf/SkPDFDevice.h b/src/pdf/SkPDFDevice.h
index 9e97f67f4e..4dded7316c 100644
--- a/src/pdf/SkPDFDevice.h
+++ b/src/pdf/SkPDFDevice.h
@@ -9,22 +9,20 @@
 #define SkPDFDevice_DEFINED
 
 #include "SkBitmap.h"
-#include "SkBitmapKey.h"
 #include "SkCanvas.h"
 #include "SkClipStack.h"
 #include "SkData.h"
 #include "SkDevice.h"
 #include "SkPaint.h"
-#include "SkPath.h"
-#include "SkPicture.h"
 #include "SkRect.h"
 #include "SkRefCnt.h"
 #include "SkStream.h"
 #include "SkTDArray.h"
-#include "SkTemplates.h"
 
 #include "SkSinglyLinkedList.h"
 
+class SkImageBitmap;
+class SkPath;
 class SkPDFArray;
 class SkPDFCanon;
 class SkPDFDevice;
@@ -33,10 +31,7 @@ class SkPDFDict;
 class SkPDFFont;
 class SkPDFFormXObject;
 class SkPDFGlyphSetMap;
-class SkPDFGraphicState;
 class SkPDFObject;
-class SkPDFShader;
-class SkPDFStream;
 class SkRRect;
 
 /** \class SkPDFDevice
diff --git a/src/pdf/SkPDFDocument.cpp b/src/pdf/SkPDFDocument.cpp
index 7818931909..c56d1ca9d4 100644
--- a/src/pdf/SkPDFDocument.cpp
+++ b/src/pdf/SkPDFDocument.cpp
@@ -6,11 +6,9 @@
  */
 
 #include "SkColorSpace_Base.h"
-#include "SkPDFCanon.h"
 #include "SkPDFCanvas.h"
 #include "SkPDFDevice.h"
 #include "SkPDFDocument.h"
-#include "SkPDFFont.h"
 #include "SkPDFStream.h"
 #include "SkPDFUtils.h"
 #include "SkStream.h"
diff --git a/src/pdf/SkPDFFont.cpp b/src/pdf/SkPDFFont.cpp
index 97be32c41d..b213594d4a 100644
--- a/src/pdf/SkPDFFont.cpp
+++ b/src/pdf/SkPDFFont.cpp
@@ -15,7 +15,6 @@
 #include "SkPDFFont.h"
 #include "SkPDFFontImpl.h"
 #include "SkPDFStream.h"
-#include "SkPDFTypes.h"
 #include "SkPDFUtils.h"
 #include "SkRefCnt.h"
 #include "SkScalar.h"
diff --git a/src/pdf/SkPDFFont.h b/src/pdf/SkPDFFont.h
index 397cc7f2a4..79a05a8c37 100644
--- a/src/pdf/SkPDFFont.h
+++ b/src/pdf/SkPDFFont.h
@@ -15,9 +15,7 @@
 #include "SkTDArray.h"
 #include "SkTypeface.h"
 
-class SkPaint;
 class SkPDFCanon;
-class SkPDFObjNumMap;
 class SkPDFFont;
 
 class SkPDFGlyphSet : SkNoncopyable {
diff --git a/src/pdf/SkPDFFormXObject.h b/src/pdf/SkPDFFormXObject.h
index 5dda459202..f6d708ebe9 100644
--- a/src/pdf/SkPDFFormXObject.h
+++ b/src/pdf/SkPDFFormXObject.h
@@ -10,14 +10,11 @@
 #define SkPDFFormXObject_DEFINED
 
 #include "SkPDFStream.h"
-#include "SkPDFTypes.h"
-#include "SkRect.h"
-#include "SkRefCnt.h"
-#include "SkString.h"
 
-class SkMatrix;
+class SkPDFArray;
 class SkPDFDevice;
-class SkPDFObjNumMap;
+class SkPDFDict;
+struct SkRect;
 
 /** \class SkPDFFormXObject
 
diff --git a/src/pdf/SkPDFGraphicState.cpp b/src/pdf/SkPDFGraphicState.cpp
index efa49baf45..0752eac328 100644
--- a/src/pdf/SkPDFGraphicState.cpp
+++ b/src/pdf/SkPDFGraphicState.cpp
@@ -6,6 +6,7 @@
  */
 
 #include "SkData.h"
+#include "SkPaint.h"
 #include "SkPDFCanon.h"
 #include "SkPDFFormXObject.h"
 #include "SkPDFGraphicState.h"
diff --git a/src/pdf/SkPDFGraphicState.h b/src/pdf/SkPDFGraphicState.h
index 06f1e119f0..569f9da7e6 100644
--- a/src/pdf/SkPDFGraphicState.h
+++ b/src/pdf/SkPDFGraphicState.h
@@ -9,10 +9,10 @@
 #ifndef SkPDFGraphicState_DEFINED
 #define SkPDFGraphicState_DEFINED
 
-#include "SkPaint.h"
 #include "SkPDFStream.h"
 #include "SkChecksum.h"
 
+class SkPaint;
 class SkPDFCanon;
 class SkPDFFormXObject;
 
diff --git a/src/pdf/SkPDFMetadata.h b/src/pdf/SkPDFMetadata.h
index 97ce71721a..d386488222 100644
--- a/src/pdf/SkPDFMetadata.h
+++ b/src/pdf/SkPDFMetadata.h
@@ -9,7 +9,6 @@
 #define SkPDFMetadata_DEFINED
 
 #include "SkDocument.h"
-#include "SkTime.h"
 
 class SkPDFObject;
 
diff --git a/src/pdf/SkPDFResourceDict.cpp b/src/pdf/SkPDFResourceDict.cpp
index 7891de8006..b24f8a5877 100644
--- a/src/pdf/SkPDFResourceDict.cpp
+++ b/src/pdf/SkPDFResourceDict.cpp
@@ -6,6 +6,7 @@
  */
 
 #include "SkPDFResourceDict.h"
+#include "SkPDFTypes.h"
 #include "SkPostConfig.h"
 
 // Sanity check that the values of enum SkPDFResourceType correspond to the
diff --git a/src/pdf/SkPDFResourceDict.h b/src/pdf/SkPDFResourceDict.h
index c45b364adc..53932eea91 100644
--- a/src/pdf/SkPDFResourceDict.h
+++ b/src/pdf/SkPDFResourceDict.h
@@ -8,9 +8,11 @@
 #ifndef SkPDFResourceDict_DEFINED
 #define SkPDFResourceDict_DEFINED
 
-#include "SkPDFTypes.h"
+#include "SkRefCnt.h"
 #include "SkTDArray.h"
-#include "SkTypes.h"
+
+class SkPDFDict;
+class SkPDFObject;
 
 /** \class SkPDFResourceDict
 
diff --git a/src/pdf/SkPDFStream.cpp b/src/pdf/SkPDFStream.cpp
index bfe33a8465..d15f48a2ee 100644
--- a/src/pdf/SkPDFStream.cpp
+++ b/src/pdf/SkPDFStream.cpp
@@ -9,7 +9,6 @@
 #include "SkData.h"
 #include "SkDeflate.h"
 #include "SkPDFStream.h"
-#include "SkStream.h"
 #include "SkStreamPriv.h"
 
 SkPDFStream::~SkPDFStream() {}
diff --git a/src/pdf/SkPDFStream.h b/src/pdf/SkPDFStream.h
index cf8cda543b..11a0c9769e 100644
--- a/src/pdf/SkPDFStream.h
+++ b/src/pdf/SkPDFStream.h
@@ -10,11 +10,7 @@
 #define SkPDFStream_DEFINED
 
 #include "SkPDFTypes.h"
-#include "SkRefCnt.h"
 #include "SkStream.h"
-#include "SkTemplates.h"
-
-class SkPDFObjNumMap;
 
 /** \class SkPDFStream
 
diff --git a/src/pdf/SkPDFTypes.cpp b/src/pdf/SkPDFTypes.cpp
index 19635ab84e..f9ab5e492a 100644
--- a/src/pdf/SkPDFTypes.cpp
+++ b/src/pdf/SkPDFTypes.cpp
@@ -8,6 +8,7 @@
 #include "SkDeflate.h"
 #include "SkPDFTypes.h"
 #include "SkPDFUtils.h"
+#include "SkStream.h"
 #include "SkStreamPriv.h"
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/src/pdf/SkPDFTypes.h b/src/pdf/SkPDFTypes.h
index d397d754f0..cff60e539a 100644
--- a/src/pdf/SkPDFTypes.h
+++ b/src/pdf/SkPDFTypes.h
@@ -11,15 +11,15 @@
 
 #include "SkRefCnt.h"
 #include "SkScalar.h"
-#include "SkStream.h"
-#include "SkString.h"
-#include "SkTDArray.h"
 #include "SkTHash.h"
 #include "SkTypes.h"
 
 class SkPDFObjNumMap;
 class SkPDFObject;
 class SkPDFSubstituteMap;
+class SkStreamAsset;
+class SkString;
+class SkWStream;
 
 #ifdef SK_PDF_IMAGE_STATS
 #include "SkAtomics.h"
diff --git a/src/pdf/SkPDFUtils.cpp b/src/pdf/SkPDFUtils.cpp
index 4e1a6d792d..b8d65092b0 100644
--- a/src/pdf/SkPDFUtils.cpp
+++ b/src/pdf/SkPDFUtils.cpp
@@ -8,8 +8,6 @@
 
 #include "SkData.h"
 #include "SkGeometry.h"
-#include "SkPaint.h"
-#include "SkPath.h"
 #include "SkPDFResourceDict.h"
 #include "SkPDFUtils.h"
 #include "SkStream.h"
diff --git a/src/pdf/SkPDFUtils.h b/src/pdf/SkPDFUtils.h
index 693d9cd398..cb6e29fe41 100644
--- a/src/pdf/SkPDFUtils.h
+++ b/src/pdf/SkPDFUtils.h
@@ -13,7 +13,6 @@
 #include "SkPath.h"
 
 class SkMatrix;
-class SkPath;
 class SkPDFArray;
 struct SkRect;
 class SkWStream;