Revert "Revert "IWYU""

This reverts commit 3c727d2386.

BUG=skia:

Change-Id: I72e9b40fec96d044e0ac12906669a52529e77882
Reviewed-on: https://skia-review.googlesource.com/8356
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>

gm/drawregion.cpp

@@ -7,6 +7,7 @@
 
 #include "gm.h"
 #include "SkCanvas.h"
+#include "SkRegion.h"
 
 /**
  *  This is very similar to the RectGrid macrobench in Android.

gm/drawregionmodes.cpp

@@ -11,6 +11,7 @@
 #include "SkDashPathEffect.h"
 #include "SkGradientShader.h"
 #include "SkImageFilter.h"
+#include "SkRegion.h"
 
 class DrawRegionModesGM : public skiagm::GM {
 public:

gm/imagealphathreshold.cpp

@@ -8,6 +8,7 @@
 #include "gm.h"
 #include "SkAlphaThresholdFilter.h"
 #include "SkOffsetImageFilter.h"
+#include "SkRegion.h"
 #include "SkSurface.h"
 
 #define WIDTH 500

include/core/SkBitmap.h

@@ -21,7 +21,6 @@ struct SkRect;
 class SkPaint;
 class SkPixelRef;
 class SkPixelRefFactory;
-class SkRegion;
 class SkString;
 
 /** \class SkBitmap

include/core/SkCanvas.h

@@ -8,35 +8,36 @@
 #ifndef SkCanvas_DEFINED
 #define SkCanvas_DEFINED
 
-#include "SkTypes.h"
 #include "SkBlendMode.h"
-#include "SkBitmap.h"
 #include "SkClipOp.h"
 #include "SkDeque.h"
-#include "SkImage.h"
 #include "SkPaint.h"
 #include "SkRasterHandleAllocator.h"
-#include "SkRefCnt.h"
-#include "SkRegion.h"
 #include "SkSurfaceProps.h"
 #include "SkLights.h"
 #include "../private/SkShadowParams.h"
 
+// remove this as soon as clients do their own IWYU
+#include "SkRegion.h"
+
 class GrContext;
 class GrRenderTargetContext;
 class SkBaseDevice;
+class SkBitmap;
 class SkCanvasClipVisitor;
 class SkClipStack;
 class SkData;
 class SkDraw;
 class SkDrawable;
 class SkDrawFilter;
+class SkImage;
 class SkImageFilter;
 class SkMetaData;
 class SkPath;
 class SkPicture;
 class SkPixmap;
 class SkRasterClip;
+class SkRegion;
 class SkRRect;
 struct SkRSXform;
 class SkSurface;

include/private/SkRecords.h

@@ -16,6 +16,7 @@
 #include "SkPath.h"
 #include "SkPicture.h"
 #include "SkRect.h"
+#include "SkRegion.h"
 #include "SkRRect.h"
 #include "SkRSXform.h"
 #include "SkString.h"

samplecode/SampleDitherBitmap.cpp

@@ -10,6 +10,7 @@
 #include "SkColorPriv.h"
 #include "SkGradientShader.h"
 #include "SkPath.h"
+#include "SkRegion.h"
 #include "SkUtils.h"
 #include "SkView.h"
 

src/core/SkLiteDL.cpp

@@ -12,6 +12,7 @@
 #include "SkLiteDL.h"
 #include "SkMath.h"
 #include "SkPicture.h"
+#include "SkRegion.h"
 #include "SkRSXform.h"
 #include "SkTextBlob.h"
 

src/utils/SkCanvasStack.h

@@ -9,6 +9,7 @@
 #define SkCanvasStack_DEFINED
 
 #include "SkNWayCanvas.h"
+#include "SkRegion.h"
 #include "SkTArray.h"
 
 /**

src/utils/SkDumpCanvas.cpp

@@ -10,6 +10,7 @@
 #include "SkPatchUtils.h"
 #include "SkPicture.h"
 #include "SkPixelRef.h"
+#include "SkRegion.h"
 #include "SkRRect.h"
 #include "SkString.h"
 #include "SkTextBlob.h"

tests/PathOpsExtendedTest.cpp

@@ -12,6 +12,7 @@
 #include "SkMatrix.h"
 #include "SkMutex.h"
 #include "SkPaint.h"
+#include "SkRegion.h"
 #include "SkStream.h"
 
 #include <stdlib.h>

tests/SurfaceTest.cpp

@@ -13,6 +13,7 @@
 #include "SkImage_Base.h"
 #include "SkOverdrawCanvas.h"
 #include "SkPath.h"
+#include "SkRegion.h"
 #include "SkRRect.h"
 #include "SkSurface.h"
 #include "SkUtils.h"

tools/debugger/SkDrawCommand.h

@@ -11,6 +11,7 @@
 #include "SkCanvas.h"
 #include "SkTLazy.h"
 #include "SkPath.h"
+#include "SkRegion.h"
 #include "SkRRect.h"
 #include "SkRSXform.h"
 #include "SkString.h"