Revert "IWYU"

This reverts commit 2aeae78a2ce3b036f0401fd0381d6fd6e2a7a1fc.

Reason for revert: It looks like this is breaking the android roll

out/target/product/angler/obj/SHARED_LIBRARIES/libandroid_runtime_intermediates/android_graphics_Canvas.o frameworks/base/core/jni/android_graphics_Canvas.cpp"
frameworks/base/core/jni/android_graphics_Canvas.cpp:178:15: error: incomplete type 'SkRegion' named in nested name specifier



Original change's description:
> IWYU
> 
> BUG=skia:
> 
> Change-Id: Ib6b4d52841dbe3fa69a86ddb6b97d6a5d0f004ee
> Reviewed-on: https://skia-review.googlesource.com/8231
> Reviewed-by: Florin Malita <fmalita@chromium.org>
> Commit-Queue: Mike Reed <reed@google.com>
> 

TBR=fmalita@chromium.org,reed@google.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:

Change-Id: If979c3dd9dc3fe08ac450ced113b3d1e9a86f02a
Reviewed-on: https://skia-review.googlesource.com/8346
Commit-Queue: Robert Phillips <robertphillips@google.com>
Reviewed-by: Robert Phillips <robertphillips@google.com>

13 files changed, 6 insertions, 14 deletions

diff --git a/gm/drawregion.cpp b/gm/drawregion.cpp
index 2230f09190..a2633f9d9f 100644
--- a/gm/drawregion.cpp
+++ b/gm/drawregion.cpp
@@ -7,7 +7,6 @@
 
 #include "gm.h"
 #include "SkCanvas.h"
-#include "SkRegion.h"
 
 /**
  *  This is very similar to the RectGrid macrobench in Android.
diff --git a/gm/drawregionmodes.cpp b/gm/drawregionmodes.cpp
index efccc88ace..be1c2d20e0 100644
--- a/gm/drawregionmodes.cpp
+++ b/gm/drawregionmodes.cpp
@@ -11,7 +11,6 @@
 #include "SkDashPathEffect.h"
 #include "SkGradientShader.h"
 #include "SkImageFilter.h"
-#include "SkRegion.h"
 
 class DrawRegionModesGM : public skiagm::GM {
 public:
diff --git a/gm/imagealphathreshold.cpp b/gm/imagealphathreshold.cpp
index 4a35018435..547e812e11 100644
--- a/gm/imagealphathreshold.cpp
+++ b/gm/imagealphathreshold.cpp
@@ -8,7 +8,6 @@
 #include "gm.h"
 #include "SkAlphaThresholdFilter.h"
 #include "SkOffsetImageFilter.h"
-#include "SkRegion.h"
 #include "SkSurface.h"
 
 #define WIDTH 500
diff --git a/include/core/SkBitmap.h b/include/core/SkBitmap.h
index c404481371..08faaafd43 100644
--- a/include/core/SkBitmap.h
+++ b/include/core/SkBitmap.h
@@ -21,6 +21,7 @@ struct SkRect;
 class SkPaint;
 class SkPixelRef;
 class SkPixelRefFactory;
+class SkRegion;
 class SkString;
 
 /** \class SkBitmap
diff --git a/include/core/SkCanvas.h b/include/core/SkCanvas.h
index 193d1afd69..d58b7ea515 100644
--- a/include/core/SkCanvas.h
+++ b/include/core/SkCanvas.h
@@ -8,11 +8,16 @@
 #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"
@@ -20,21 +25,18 @@
 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;
diff --git a/include/private/SkRecords.h b/include/private/SkRecords.h
index b81bca87ee..d1fadc3395 100644
--- a/include/private/SkRecords.h
+++ b/include/private/SkRecords.h
@@ -16,7 +16,6 @@
 #include "SkPath.h"
 #include "SkPicture.h"
 #include "SkRect.h"
-#include "SkRegion.h"
 #include "SkRRect.h"
 #include "SkRSXform.h"
 #include "SkString.h"
diff --git a/samplecode/SampleDitherBitmap.cpp b/samplecode/SampleDitherBitmap.cpp
index 676d4c3530..34241c5e02 100644
--- a/samplecode/SampleDitherBitmap.cpp
+++ b/samplecode/SampleDitherBitmap.cpp
@@ -10,7 +10,6 @@
 #include "SkColorPriv.h"
 #include "SkGradientShader.h"
 #include "SkPath.h"
-#include "SkRegion.h"
 #include "SkUtils.h"
 #include "SkView.h"
 
diff --git a/src/core/SkLiteDL.cpp b/src/core/SkLiteDL.cpp
index 95e801a0da..2548a818e7 100644
--- a/src/core/SkLiteDL.cpp
+++ b/src/core/SkLiteDL.cpp
@@ -12,7 +12,6 @@
 #include "SkLiteDL.h"
 #include "SkMath.h"
 #include "SkPicture.h"
-#include "SkRegion.h"
 #include "SkRSXform.h"
 #include "SkTextBlob.h"
 
diff --git a/src/utils/SkCanvasStack.h b/src/utils/SkCanvasStack.h
index cdeeb843b6..73a3386c0f 100644
--- a/src/utils/SkCanvasStack.h
+++ b/src/utils/SkCanvasStack.h
@@ -9,7 +9,6 @@
 #define SkCanvasStack_DEFINED
 
 #include "SkNWayCanvas.h"
-#include "SkRegion.h"
 #include "SkTArray.h"
 
 /**
diff --git a/src/utils/SkDumpCanvas.cpp b/src/utils/SkDumpCanvas.cpp
index dc420136f5..85e02430de 100644
--- a/src/utils/SkDumpCanvas.cpp
+++ b/src/utils/SkDumpCanvas.cpp
@@ -10,7 +10,6 @@
 #include "SkPatchUtils.h"
 #include "SkPicture.h"
 #include "SkPixelRef.h"
-#include "SkRegion.h"
 #include "SkRRect.h"
 #include "SkString.h"
 #include "SkTextBlob.h"
diff --git a/tests/PathOpsExtendedTest.cpp b/tests/PathOpsExtendedTest.cpp
index 279faa422c..d70deb30fc 100644
--- a/tests/PathOpsExtendedTest.cpp
+++ b/tests/PathOpsExtendedTest.cpp
@@ -12,7 +12,6 @@
 #include "SkMatrix.h"
 #include "SkMutex.h"
 #include "SkPaint.h"
-#include "SkRegion.h"
 #include "SkStream.h"
 
 #include <stdlib.h>
diff --git a/tests/SurfaceTest.cpp b/tests/SurfaceTest.cpp
index b85ac81788..dd71943dd9 100644
--- a/tests/SurfaceTest.cpp
+++ b/tests/SurfaceTest.cpp
@@ -13,7 +13,6 @@
 #include "SkImage_Base.h"
 #include "SkOverdrawCanvas.h"
 #include "SkPath.h"
-#include "SkRegion.h"
 #include "SkRRect.h"
 #include "SkSurface.h"
 #include "SkUtils.h"
diff --git a/tools/debugger/SkDrawCommand.h b/tools/debugger/SkDrawCommand.h
index 964badcf58..266fc99fad 100644
--- a/tools/debugger/SkDrawCommand.h
+++ b/tools/debugger/SkDrawCommand.h
@@ -11,7 +11,6 @@
 #include "SkCanvas.h"
 #include "SkTLazy.h"
 #include "SkPath.h"
-#include "SkRegion.h"
 #include "SkRRect.h"
 #include "SkRSXform.h"
 #include "SkString.h"