diff options
author | Florin Malita <fmalita@chromium.org> | 2017-05-02 15:33:01 -0400 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-05-03 13:22:28 +0000 |
commit | fed00319c9bafa41c8df658708030c072b301a41 (patch) | |
tree | 15bb74cab65d66f80cc1ab1f943f1fb36827b5af /gm | |
parent | a1c50c6aacc3e14053458cd89de64fade37269c4 (diff) |
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>
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, 9 insertions, 0 deletions
diff --git a/gm/bitmapimage.cpp b/gm/bitmapimage.cpp index 8c37d5da44..be17af8520 100644 --- a/gm/bitmapimage.cpp +++ b/gm/bitmapimage.cpp @@ -8,6 +8,7 @@ #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 4657f6ad11..eb98b010d7 100644 --- a/gm/colorspacexform.cpp +++ b/gm/colorspacexform.cpp @@ -10,6 +10,7 @@ #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 90fcedc970..a6210c9240 100644 --- a/gm/composeshader.cpp +++ b/gm/composeshader.cpp @@ -10,6 +10,7 @@ #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 c88b878ccb..9c1fe6a6f2 100644 --- a/gm/deferredtextureimage.cpp +++ b/gm/deferredtextureimage.cpp @@ -7,6 +7,7 @@ #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 f53ebc0d9a..b6e0c1c1c3 100644 --- a/gm/encode-platform.cpp +++ b/gm/encode-platform.cpp @@ -10,6 +10,7 @@ #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 fef133212c..bbaeaa7042 100644 --- a/gm/encode-srgb.cpp +++ b/gm/encode-srgb.cpp @@ -12,6 +12,7 @@ #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 1dae1bf042..bf13d3dc09 100644 --- a/gm/encode.cpp +++ b/gm/encode.cpp @@ -8,6 +8,7 @@ #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 327368f879..d55498b235 100644 --- a/gm/gammaencodedpremul.cpp +++ b/gm/gammaencodedpremul.cpp @@ -6,6 +6,7 @@ */ #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 c4ef5f7a77..a7029f481a 100644 --- a/gm/subsetshader.cpp +++ b/gm/subsetshader.cpp @@ -7,6 +7,7 @@ #include "Resources.h" #include "SkBitmap.h" +#include "SkShader.h" #include "gm.h" DEF_SIMPLE_GM(bitmap_subset_shader, canvas, 256, 256) { |