diff options
| author |  Florin Malita <fmalita@chromium.org> | 2017-05-03 19:16:58 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-05-03 19:17:11 +0000 |
| commit | ab244f045a0740fa6106ed21a4e5824cd09f84f3 (patch) | |
| tree | 77545cce4d67b088b7f91ceebf388b6b0ccf96c8 /include | |
| parent | ac6f8ef9e6065a97320e543b7c32248094ee56e4 (diff) | |
Revert "Revert "Reland: Remove SkLights include from SkCanvas.h""
This reverts commit 9d5f66d9c21eda7d3e2ed47654180c0c4b6e38b1.
Reason for revert: Leon landed Android fixes.
Original change's description:
> Revert "Reland: Remove SkLights include from SkCanvas.h"
>
> This reverts commit fed00319c9bafa41c8df658708030c072b301a41.
>
> Reason for revert: breaking the Android roll.
>
> Original change's description:
> > Reland: Remove SkLights include from SkCanvas.h
> >
> > SkLights.h pulls in a bunch of other headers and is not needed (fwdecl
> > works fine).
> >
> > Change-Id: I3ed97cd7861e51dcb7cfa7950a97b420dbc6fbfb
> > TBR=reed@google.com
> > Reviewed-on: https://skia-review.googlesource.com/15143
> > Commit-Queue: Florin Malita <fmalita@chromium.org>
> > Reviewed-by: Florin Malita <fmalita@chromium.org>
> >
>
> TBR=fmalita@chromium.org,reed@google.com
> NOPRESUBMIT=true
> NOTREECHECKS=true
> NOTRY=true
>
> Change-Id: I3b0e69f1d04d160f16a5567b09982d35cc9ca84e
> Reviewed-on: https://skia-review.googlesource.com/15195
> Reviewed-by: Florin Malita <fmalita@chromium.org>
> Commit-Queue: Florin Malita <fmalita@chromium.org>
>
TBR=msarett@google.com,reviews@skia.org,fmalita@chromium.org,reed@google.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Change-Id: I0a1c2f9df61f16987ab72dfb4f3a205fbcc37667
Reviewed-on: https://skia-review.googlesource.com/15229
Reviewed-by: Florin Malita <fmalita@chromium.org>
Commit-Queue: Florin Malita <fmalita@chromium.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/core/SkCanvas.h | 2 | ||||
| -rw-r--r-- | include/private/SkRecords.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/include/core/SkCanvas.h b/include/core/SkCanvas.h index 37896dea45..646ef24320 100644 --- a/include/core/SkCanvas.h +++ b/include/core/SkCanvas.h @@ -14,7 +14,6 @@ #include "SkPaint.h" #include "SkRasterHandleAllocator.h" #include "SkSurfaceProps.h" -#include "SkLights.h" class GrContext; class GrRenderTargetContext; @@ -27,6 +26,7 @@ class SkDrawable; class SkDrawFilter; class SkImage; class SkImageFilter; +class SkLights; class SkMetaData; class SkPath; class SkPicture; diff --git a/include/private/SkRecords.h b/include/private/SkRecords.h index 02d2108a4c..f26b6ba880 100644 --- a/include/private/SkRecords.h +++ b/include/private/SkRecords.h @@ -11,6 +11,7 @@ #include "SkData.h" #include "SkCanvas.h" #include "SkDrawable.h" +#include "SkImage.h" #include "SkImageFilter.h" #include "SkMatrix.h" #include "SkPath.h" |