diff options
| author |  Florin Malita <fmalita@chromium.org> | 2017-05-02 15:41:57 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-05-02 15:42:07 +0000 |
| commit | 38aad81a542612a86c5765ec2bf9d2c164280e9e (patch) | |
| tree | 5c0963ae8b121813253f7757987f03ba0a1d2395 /gm | |
| parent | c3b10a3a785838afc6d8dec1b648123b0cb54120 (diff) | |
Revert "Remove SkLights include from SkCanvas.h"
This reverts commit 9ff301bf918cd85d9f67047f10631b7a74345a90.
Reason for revert: need to update G3, Flutter.
Original change's description:
> Remove SkLights include from SkCanvas.h
>
> SkLights.h pulls in a bunch of other headers and is not needed (fwdecl
> works fine).
>
> Change-Id: Id2d7176eb3bf4609f72f46d513eebf59318f542f
> Reviewed-on: https://skia-review.googlesource.com/14904
> Reviewed-by: Mike Reed <reed@google.com>
> Commit-Queue: Florin Malita <fmalita@chromium.org>
>
TBR=mtklein@google.com,fmalita@chromium.org,reed@google.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Change-Id: I4799ad5b31aaeaf529c8b912bbe09aa8869a5e6c
Reviewed-on: https://skia-review.googlesource.com/15107
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 17f27d54a7..f08da73ce8 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 "SkUnPreMultiply.h" diff --git a/gm/encode-srgb.cpp b/gm/encode-srgb.cpp index ab957572b8..3015baa4a0 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 "SkPM4f.h" #include "SkSRGB.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) { |