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

diff --git a/src/pdf/SkDeflate.cpp b/src/pdf/SkDeflate.cpp
index ebf203a264ef1278491603f8ba57d56bd852fbfb..d4a842969cdbb9ddb88680df8e7dab16c89f9a63 100644 (file)
--- 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 d3ce5e945fc88231b18f5480023951f5bf9784bf..387de40a15f12f3da7759389b40f93a684daa8b6 100644 (file)
--- 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 e483e341d948ae6dc3919b5a0740ef00dbe1c3c9..887bca4ab0f427b5e845e821d64f19099ca59ec6 100644 (file)
--- 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 86beef31cee3ba2184940f542b23e612ff72b6a9..8de796c70bae02d9c61b09668b5e2872a4b2fd95 100644 (file)
--- 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 c981217123bbfe23ee8f4b51faa0103e2b277d01..11bfb892d14407a75e80f6e01231d00cd8773af5 100644 (file)
--- 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 6d23e1bad284516d82ce7332aac4266380c4cf12..cae93c97c961bd503be0cd7b59153ce607ab34bc 100644 (file)
--- 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 b9e310d84650dc18d1439384202ba2bc4243d574..204678a687922e4bc32685c22a96518835ee105b 100644 (file)
--- 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 9e97f67f4e464665481f2e7d1549396ae158253f..4dded7316c785042384e1c15e9e612cdd751d5e5 100644 (file)
--- 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 781893190943c1066472e8e0f178996cb321ec45..c56d1ca9d45f9fc675d0ddf145f9e46cd03af9fc 100644 (file)
--- 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 97be32c41da531d3ca807413ea7780bc66612576..b213594d4a37c3f8fed7f3c5667d056eeb020186 100644 (file)
--- 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 397cc7f2a4d1c5282ed120ccbe5d30ef0336b730..79a05a8c3733c420e66ec41dcd79b82e7fdda3ad 100644 (file)
--- 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 5dda4592028fca1063d045c0d5f232c7de708215..f6d708ebe94f98e39136f7889dd8b4f05d60a99b 100644 (file)
--- 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 efa49baf45475cb4b5d6b47e186172d099022f72..0752eac32834bb3f5f67545b125f454414249791 100644 (file)
--- 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 06f1e119f04328bbedc1767a4073aa67ed75c494..569f9da7e66f44e091c7e10a79e664eaa323e41c 100644 (file)
--- 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 97ce71721aed80c87b59697acbb72af026b040aa..d3864882224c86567ff42a79f43fe35df75c3954 100644 (file)
--- 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 7891de8006a8f1ec77627b30c817767765ef0b4d..b24f8a5877b23f78faf86df791d2c4ef44aec4a9 100644 (file)
--- 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 c45b364adc896fdf5ed4dfbcbf8a3c0b9c9d9831..53932eea91b8d6f200979e3957851a4bb1d9710a 100644 (file)
--- 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 bfe33a84655861d8061b8d7d91b29cd5fa441b00..d15f48a2ee94590e30588aaf8f55a6510a1e2fc9 100644 (file)
--- 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 cf8cda543be9d09e247f64e8b57478f71365eda7..11a0c9769e11440bd514dfac8ef93049f17bc90e 100644 (file)
--- 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 19635ab84e1cde894d3f717041e30fa2dff8fbf3..f9ab5e492a26396ea0731e71e39acb44ff4d621d 100644 (file)
--- 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 d397d754f01f4cd7c9cac6b3ecaea2690429d10d..cff60e539add4d0a0a58ea976b90a47c909a312d 100644 (file)
--- 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 4e1a6d792da20fd8c04f8e36d0d5de90551fbfb7..b8d65092b07e8065f8cce15e2ba60fbf3eff7cc3 100644 (file)
--- 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 693d9cd398059cc7e7ddef1e6adb341bc6d8a375..cb6e29fe4151ad35ed7a1c99132aa1a5e7a68cd2 100644 (file)
--- 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;