From 267be7fbc38174652c750ec69d8dc1feaa72db0c Mon Sep 17 00:00:00 2001 From: Mike Reed Date: Mon, 13 Feb 2017 09:32:54 -0500 Subject: [PATCH] Revert "Revert "IWYU"" This reverts commit 3c727d2386059c1d7cbdcdc9bef5fa18ed33667e. BUG=skia: Change-Id: I72e9b40fec96d044e0ac12906669a52529e77882 Reviewed-on: https://skia-review.googlesource.com/8356 Reviewed-by: Mike Reed Commit-Queue: Mike Reed --- gm/drawregion.cpp | 1 + gm/drawregionmodes.cpp | 1 + gm/imagealphathreshold.cpp | 1 + include/core/SkBitmap.h | 1 - include/core/SkCanvas.h | 11 ++++++----- include/private/SkRecords.h | 1 + samplecode/SampleDitherBitmap.cpp | 1 + src/core/SkLiteDL.cpp | 1 + src/utils/SkCanvasStack.h | 1 + src/utils/SkDumpCanvas.cpp | 1 + tests/PathOpsExtendedTest.cpp | 1 + tests/SurfaceTest.cpp | 1 + tools/debugger/SkDrawCommand.h | 1 + 13 files changed, 17 insertions(+), 6 deletions(-) diff --git a/gm/drawregion.cpp b/gm/drawregion.cpp index a2633f9d9f..2230f09190 100644 --- a/gm/drawregion.cpp +++ b/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. diff --git a/gm/drawregionmodes.cpp b/gm/drawregionmodes.cpp index be1c2d20e0..efccc88ace 100644 --- a/gm/drawregionmodes.cpp +++ b/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: diff --git a/gm/imagealphathreshold.cpp b/gm/imagealphathreshold.cpp index 547e812e11..4a35018435 100644 --- a/gm/imagealphathreshold.cpp +++ b/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 diff --git a/include/core/SkBitmap.h b/include/core/SkBitmap.h index 08faaafd43..c404481371 100644 --- a/include/core/SkBitmap.h +++ b/include/core/SkBitmap.h @@ -21,7 +21,6 @@ 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 d58b7ea515..00597ef134 100644 --- a/include/core/SkCanvas.h +++ b/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; diff --git a/include/private/SkRecords.h b/include/private/SkRecords.h index d1fadc3395..b81bca87ee 100644 --- a/include/private/SkRecords.h +++ b/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" diff --git a/samplecode/SampleDitherBitmap.cpp b/samplecode/SampleDitherBitmap.cpp index 34241c5e02..676d4c3530 100644 --- a/samplecode/SampleDitherBitmap.cpp +++ b/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" diff --git a/src/core/SkLiteDL.cpp b/src/core/SkLiteDL.cpp index 2548a818e7..95e801a0da 100644 --- a/src/core/SkLiteDL.cpp +++ b/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" diff --git a/src/utils/SkCanvasStack.h b/src/utils/SkCanvasStack.h index 73a3386c0f..cdeeb843b6 100644 --- a/src/utils/SkCanvasStack.h +++ b/src/utils/SkCanvasStack.h @@ -9,6 +9,7 @@ #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 85e02430de..dc420136f5 100644 --- a/src/utils/SkDumpCanvas.cpp +++ b/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" diff --git a/tests/PathOpsExtendedTest.cpp b/tests/PathOpsExtendedTest.cpp index d70deb30fc..279faa422c 100644 --- a/tests/PathOpsExtendedTest.cpp +++ b/tests/PathOpsExtendedTest.cpp @@ -12,6 +12,7 @@ #include "SkMatrix.h" #include "SkMutex.h" #include "SkPaint.h" +#include "SkRegion.h" #include "SkStream.h" #include diff --git a/tests/SurfaceTest.cpp b/tests/SurfaceTest.cpp index dd71943dd9..b85ac81788 100644 --- a/tests/SurfaceTest.cpp +++ b/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" diff --git a/tools/debugger/SkDrawCommand.h b/tools/debugger/SkDrawCommand.h index 266fc99fad..964badcf58 100644 --- a/tools/debugger/SkDrawCommand.h +++ b/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"