diff options
| author |  Mike Reed <reed@google.com> | 2017-02-13 09:32:54 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-02-13 15:59:35 +0000 |
| commit | 267be7fbc38174652c750ec69d8dc1feaa72db0c (patch) | |
| tree | d554bdabc1e5682c94bf5f0567076a7f79da47b5 /include | |
| parent | 03a7f5fe2de9b0c886be4063533c91720ced0bf9 (diff) | |
Revert "Revert "IWYU""
This reverts commit 3c727d2386059c1d7cbdcdc9bef5fa18ed33667e.
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>
Diffstat (limited to 'include')
| -rw-r--r-- | include/core/SkBitmap.h | 1 | ||||
| -rw-r--r-- | include/core/SkCanvas.h | 11 | ||||
| -rw-r--r-- | include/private/SkRecords.h | 1 |
3 files changed, 7 insertions, 6 deletions
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" |