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 /src | |
| 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 'src')
| -rw-r--r-- | src/core/SkCanvas.cpp | 1 | ||||
| -rw-r--r-- | src/core/SkDraw.h | 1 | ||||
| -rw-r--r-- | src/core/SkLiteDL.cpp | 1 | ||||
| -rw-r--r-- | src/core/SkLiteDL.h | 1 | ||||
| -rw-r--r-- | src/core/SkPictureCommon.h | 1 | ||||
| -rw-r--r-- | src/core/SkRecord.cpp | 1 | ||||
| -rw-r--r-- | src/core/SkRecordDraw.cpp | 1 | ||||
| -rw-r--r-- | src/fonts/SkRandomScalerContext.cpp | 1 | ||||
| -rw-r--r-- | src/pdf/SkPDFCanvas.cpp | 1 | ||||
| -rw-r--r-- | src/utils/SkDumpCanvas.cpp | 1 | ||||
| -rw-r--r-- | src/utils/SkShadowUtils.cpp | 1 |
11 files changed, 0 insertions, 11 deletions
diff --git a/src/core/SkCanvas.cpp b/src/core/SkCanvas.cpp index b890ead9cf..5e33dbf371 100644 --- a/src/core/SkCanvas.cpp +++ b/src/core/SkCanvas.cpp @@ -20,7 +20,6 @@ #include "SkImageFilter.h" #include "SkImageFilterCache.h" #include "SkLatticeIter.h" -#include "SkLights.h" #include "SkMakeUnique.h" #include "SkMatrixUtils.h" #include "SkMetaData.h" diff --git a/src/core/SkDraw.h b/src/core/SkDraw.h index f2d5946c9e..b142e7edf7 100644 --- a/src/core/SkDraw.h +++ b/src/core/SkDraw.h @@ -13,7 +13,6 @@ #include "SkCanvas.h" #include "SkMask.h" #include "SkPaint.h" -#include "SkPixmap.h" #include "SkStrokeRec.h" #include "SkVertices.h" diff --git a/src/core/SkLiteDL.cpp b/src/core/SkLiteDL.cpp index b3149a7d42..0162327d40 100644 --- a/src/core/SkLiteDL.cpp +++ b/src/core/SkLiteDL.cpp @@ -8,7 +8,6 @@ #include "SkCanvas.h" #include "SkData.h" #include "SkDrawFilter.h" -#include "SkImage.h" #include "SkImageFilter.h" #include "SkLiteDL.h" #include "SkMath.h" diff --git a/src/core/SkLiteDL.h b/src/core/SkLiteDL.h index c5df350957..270b2ef4ce 100644 --- a/src/core/SkLiteDL.h +++ b/src/core/SkLiteDL.h @@ -14,7 +14,6 @@ #include "SkDrawable.h" #include "SkRect.h" #include "SkTDArray.h" -#include "SkTemplates.h" class SkLiteDL final { public: diff --git a/src/core/SkPictureCommon.h b/src/core/SkPictureCommon.h index a400264c7f..6f6a9f1fcf 100644 --- a/src/core/SkPictureCommon.h +++ b/src/core/SkPictureCommon.h @@ -14,7 +14,6 @@ #include "SkPathEffect.h" #include "SkRecords.h" -#include "SkShader.h" #include "SkTLogic.h" // N.B. This name is slightly historical: hunting season is now open for SkImages too. diff --git a/src/core/SkRecord.cpp b/src/core/SkRecord.cpp index 3553ff5b45..4df4131340 100644 --- a/src/core/SkRecord.cpp +++ b/src/core/SkRecord.cpp @@ -6,7 +6,6 @@ */ #include "SkRecord.h" -#include "SkImage.h" #include <algorithm> SkRecord::~SkRecord() { diff --git a/src/core/SkRecordDraw.cpp b/src/core/SkRecordDraw.cpp index e668cc874c..fbb7f7ce6a 100644 --- a/src/core/SkRecordDraw.cpp +++ b/src/core/SkRecordDraw.cpp @@ -6,7 +6,6 @@ */ #include "SkRecordDraw.h" -#include "SkImage.h" #include "SkPatchUtils.h" void SkRecordDraw(const SkRecord& record, diff --git a/src/fonts/SkRandomScalerContext.cpp b/src/fonts/SkRandomScalerContext.cpp index a38f695563..3a292dcd79 100644 --- a/src/fonts/SkRandomScalerContext.cpp +++ b/src/fonts/SkRandomScalerContext.cpp @@ -5,7 +5,6 @@ * found in the LICENSE file. */ -#include "SkBitmap.h" #include "SkCanvas.h" #include "SkGlyph.h" #include "SkMakeUnique.h" diff --git a/src/pdf/SkPDFCanvas.cpp b/src/pdf/SkPDFCanvas.cpp index c5cde3d113..d946f48197 100644 --- a/src/pdf/SkPDFCanvas.cpp +++ b/src/pdf/SkPDFCanvas.cpp @@ -5,7 +5,6 @@ * found in the LICENSE file. */ -#include "SkImage.h" #include "SkLatticeIter.h" #include "SkPDFCanvas.h" #include "SkPDFDevice.h" diff --git a/src/utils/SkDumpCanvas.cpp b/src/utils/SkDumpCanvas.cpp index 05cabadefe..35b88de595 100644 --- a/src/utils/SkDumpCanvas.cpp +++ b/src/utils/SkDumpCanvas.cpp @@ -7,7 +7,6 @@ #include "SkData.h" #include "SkDumpCanvas.h" -#include "SkImage.h" #include "SkPatchUtils.h" #include "SkPicture.h" #include "SkPixelRef.h" diff --git a/src/utils/SkShadowUtils.cpp b/src/utils/SkShadowUtils.cpp index 279ca7338c..f3311cd268 100644 --- a/src/utils/SkShadowUtils.cpp +++ b/src/utils/SkShadowUtils.cpp @@ -8,7 +8,6 @@ #include "SkShadowUtils.h" #include "SkCanvas.h" #include "SkColorFilter.h" -#include "SkColorPriv.h" #include "SkPath.h" #include "SkRandom.h" #include "SkResourceCache.h" |