diff options
author | Florin Malita <fmalita@chromium.org> | 2017-05-03 15:41:00 +0000 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-05-03 15:41:07 +0000 |
commit | 9d5f66d9c21eda7d3e2ed47654180c0c4b6e38b1 (patch) | |
tree | 14830ff2d997033a05a4582ab33c4734232b263d /include | |
parent | e188f8b14b6abb4ce8265f330b37f0faa406e04d (diff) |
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>
Diffstat (limited to 'include')
-rw-r--r-- | include/core/SkCanvas.h | 2 | ||||
-rw-r--r-- | include/private/SkRecords.h | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/include/core/SkCanvas.h b/include/core/SkCanvas.h index 87ae7f8e2a..a259e531f3 100644 --- a/include/core/SkCanvas.h +++ b/include/core/SkCanvas.h @@ -14,6 +14,7 @@ #include "SkPaint.h" #include "SkRasterHandleAllocator.h" #include "SkSurfaceProps.h" +#include "SkLights.h" class GrContext; class GrRenderTargetContext; @@ -26,7 +27,6 @@ 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 f26b6ba880..02d2108a4c 100644 --- a/include/private/SkRecords.h +++ b/include/private/SkRecords.h @@ -11,7 +11,6 @@ #include "SkData.h" #include "SkCanvas.h" #include "SkDrawable.h" -#include "SkImage.h" #include "SkImageFilter.h" #include "SkMatrix.h" #include "SkPath.h" |