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 /gm | |
| 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 'gm')
| -rw-r--r-- | gm/bitmapimage.cpp | 1 | ||||
| -rw-r--r-- | gm/colorspacexform.cpp | 1 | ||||
| -rw-r--r-- | gm/composeshader.cpp | 1 | ||||
| -rw-r--r-- | gm/deferredtextureimage.cpp | 1 | ||||
| -rw-r--r-- | gm/encode-platform.cpp | 1 | ||||
| -rw-r--r-- | gm/encode-srgb.cpp | 1 | ||||
| -rw-r--r-- | gm/encode.cpp | 1 | ||||
| -rw-r--r-- | gm/gammaencodedpremul.cpp | 1 | ||||
| -rw-r--r-- | gm/subsetshader.cpp | 1 |
9 files changed, 0 insertions, 9 deletions
diff --git a/gm/bitmapimage.cpp b/gm/bitmapimage.cpp index be17af8520..8c37d5da44 100644 --- a/gm/bitmapimage.cpp +++ b/gm/bitmapimage.cpp @@ -8,7 +8,6 @@ #include "gm.h" #include "Resources.h" #include "SkCodec.h" -#include "SkImage.h" namespace skiagm { diff --git a/gm/colorspacexform.cpp b/gm/colorspacexform.cpp index eb98b010d7..4657f6ad11 100644 --- a/gm/colorspacexform.cpp +++ b/gm/colorspacexform.cpp @@ -10,7 +10,6 @@ #include "SkColorSpace_Base.h" #include "SkColorSpaceXform.h" #include "SkRect.h" -#include "SkShader.h" class ColorSpaceXformGM : public skiagm::GM { public: diff --git a/gm/composeshader.cpp b/gm/composeshader.cpp index a6210c9240..90fcedc970 100644 --- a/gm/composeshader.cpp +++ b/gm/composeshader.cpp @@ -10,7 +10,6 @@ #include "SkCanvas.h" #include "SkGradientShader.h" #include "SkGraphics.h" -#include "SkImage.h" #include "SkShader.h" #include "SkString.h" #include "SkTDArray.h" diff --git a/gm/deferredtextureimage.cpp b/gm/deferredtextureimage.cpp index 9c1fe6a6f2..c88b878ccb 100644 --- a/gm/deferredtextureimage.cpp +++ b/gm/deferredtextureimage.cpp @@ -7,7 +7,6 @@ #include <vector> #include "gm.h" -#include "SkImage.h" #include "SkMipMap.h" #include "Resources.h" diff --git a/gm/encode-platform.cpp b/gm/encode-platform.cpp index b6e0c1c1c3..f53ebc0d9a 100644 --- a/gm/encode-platform.cpp +++ b/gm/encode-platform.cpp @@ -10,7 +10,6 @@ #include "Resources.h" #include "SkCanvas.h" #include "SkData.h" -#include "SkImage.h" #include "SkImageEncoderPriv.h" #include "SkJpegEncoder.h" #include "SkUnPreMultiply.h" diff --git a/gm/encode-srgb.cpp b/gm/encode-srgb.cpp index bbaeaa7042..fef133212c 100644 --- a/gm/encode-srgb.cpp +++ b/gm/encode-srgb.cpp @@ -12,7 +12,6 @@ #include "SkCodec.h" #include "SkColorSpace_Base.h" #include "SkData.h" -#include "SkImage.h" #include "SkImageEncoderPriv.h" #include "SkJpegEncoder.h" #include "SkPM4f.h" diff --git a/gm/encode.cpp b/gm/encode.cpp index bf13d3dc09..1dae1bf042 100644 --- a/gm/encode.cpp +++ b/gm/encode.cpp @@ -8,7 +8,6 @@ #include "sk_tool_utils.h" #include "SkCanvas.h" #include "SkData.h" -#include "SkImage.h" #include "SkImageEncoder.h" #include "Resources.h" diff --git a/gm/gammaencodedpremul.cpp b/gm/gammaencodedpremul.cpp index d55498b235..327368f879 100644 --- a/gm/gammaencodedpremul.cpp +++ b/gm/gammaencodedpremul.cpp @@ -6,7 +6,6 @@ */ #include "gm.h" -#include "SkColorPriv.h" #include "SkColorSpaceXform.h" #include "SkColorSpaceXformPriv.h" #include "SkOpts.h" diff --git a/gm/subsetshader.cpp b/gm/subsetshader.cpp index a7029f481a..c4ef5f7a77 100644 --- a/gm/subsetshader.cpp +++ b/gm/subsetshader.cpp @@ -7,7 +7,6 @@ #include "Resources.h" #include "SkBitmap.h" -#include "SkShader.h" #include "gm.h" DEF_SIMPLE_GM(bitmap_subset_shader, canvas, 256, 256) { |