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>
2017-05-02 15:33:01 -04:00 · 2017-05-02 15:33:01 -04:00 · fed00319c9
commit fed00319c9
parent a1c50c6aac
45 changed files with 83 additions and 39 deletions
--- a/bench/ColorCanvasDrawBitmapBench.cpp
+++ b/bench/ColorCanvasDrawBitmapBench.cpp
@ -6,6 +6,7 @@
 */

 #include "Benchmark.h"
+#include "SkBitmap.h"
 #include "SkCanvas.h"
 #include "SkColorSpaceXformCanvas.h"
 #include "SkString.h"
--- a/bench/DrawBitmapAABench.cpp
+++ b/bench/DrawBitmapAABench.cpp
@ -5,6 +5,7 @@
 * found in the LICENSE file.
 */
 #include "Benchmark.h"
+#include "SkBitmap.h"
 #include "SkCanvas.h"
 #include "SkMatrix.h"
 #include "SkPaint.h"
--- a/bench/DrawLatticeBench.cpp
+++ b/bench/DrawLatticeBench.cpp
@ -6,6 +6,7 @@
 */

 #include "Benchmark.h"
+#include "SkBitmap.h"
 #include "SkCanvas.h"
 #include "SkRect.h"
 #include "SkString.h"
--- a/bench/ImageFilterDAGBench.cpp
+++ b/bench/ImageFilterDAGBench.cpp
@ -10,6 +10,7 @@
 #include "SkBlurImageFilter.h"
 #include "SkDisplacementMapEffect.h"
 #include "SkCanvas.h"
+#include "SkImage.h"
 #include "SkMergeImageFilter.h"


--- a/bench/MagnifierBench.cpp
+++ b/bench/MagnifierBench.cpp
@ -6,6 +6,7 @@
 */

 #include "Benchmark.h"
+#include "SkBitmap.h"
 #include "SkCanvas.h"
 #include "SkMagnifierImageFilter.h"
 #include "SkRandom.h"
--- a/bench/ReadPixBench.cpp
+++ b/bench/ReadPixBench.cpp
@ -6,6 +6,7 @@
 */

 #include "Benchmark.h"
+#include "SkBitmap.h"
 #include "SkCanvas.h"


--- a/bench/ShaderMaskBench.cpp
+++ b/bench/ShaderMaskBench.cpp
@ -9,6 +9,7 @@
 #include "SkCanvas.h"
 #include "SkPaint.h"
 #include "SkRandom.h"
+#include "SkShader.h"
 #include "SkString.h"
 #include "SkTemplates.h"

--- a/bench/WritePixelsBench.cpp
+++ b/bench/WritePixelsBench.cpp
@ -6,6 +6,7 @@
 */

 #include "Benchmark.h"
+#include "SkBitmap.h"
 #include "SkCanvas.h"
 #include "SkString.h"

--- 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 {

--- 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:
--- 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"
--- 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"

--- 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"
--- 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"
--- 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"

--- 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"
--- 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) {
--- a/include/core/SkCanvas.h
+++ b/include/core/SkCanvas.h
@ -14,7 +14,6 @@
 #include "SkPaint.h"
 #include "SkRasterHandleAllocator.h"
 #include "SkSurfaceProps.h"
-#include "SkLights.h"

 class GrContext;
 class GrRenderTargetContext;
@ -27,6 +26,7 @@ class SkDrawable;
 class SkDrawFilter;
 class SkImage;
 class SkImageFilter;
+class SkLights;
 class SkMetaData;
 class SkPath;
 class SkPicture;
--- a/include/private/SkRecords.h
+++ b/include/private/SkRecords.h
@ -11,6 +11,7 @@
 #include "SkData.h"
 #include "SkCanvas.h"
 #include "SkDrawable.h"
+#include "SkImage.h"
 #include "SkImageFilter.h"
 #include "SkMatrix.h"
 #include "SkPath.h"
--- a/samplecode/SampleAAGeometry.cpp
+++ b/samplecode/SampleAAGeometry.cpp
@ -6,6 +6,7 @@
 */

 #include "SampleCode.h"
+#include "SkBitmap.h"
 #include "SkCanvas.h"
 #include "SkGeometry.h"
 #include "SkIntersections.h"
--- a/samplecode/SampleAnimatedText.cpp
+++ b/samplecode/SampleAnimatedText.cpp
@ -11,6 +11,7 @@
 #include "SkUtils.h"
 #include "SkColorPriv.h"
 #include "SkColorFilter.h"
+#include "SkImage.h"
 #include "SkRandom.h"
 #include "SkSystemEventTypes.h"
 #include "SkTime.h"
--- a/samplecode/SampleLayerMask.cpp
+++ b/samplecode/SampleLayerMask.cpp
@ -6,6 +6,7 @@
 */

 #include "SampleCode.h"
+#include "SkBitmap.h"
 #include "SkCanvas.h"
 #include "SkPaint.h"
 #include "SkPath.h"
--- a/src/core/SkCanvas.cpp
+++ b/src/core/SkCanvas.cpp
@ -20,6 +20,7 @@
 #include "SkImageFilter.h"
 #include "SkImageFilterCache.h"
 #include "SkLatticeIter.h"
+#include "SkLights.h"
 #include "SkMakeUnique.h"
 #include "SkMatrixUtils.h"
 #include "SkMetaData.h"
--- a/src/core/SkDraw.h
+++ b/src/core/SkDraw.h
@ -13,6 +13,7 @@
 #include "SkCanvas.h"
 #include "SkMask.h"
 #include "SkPaint.h"
+#include "SkPixmap.h"
 #include "SkStrokeRec.h"
 #include "SkVertices.h"

--- a/src/core/SkLiteDL.cpp
+++ b/src/core/SkLiteDL.cpp
@ -8,6 +8,7 @@
 #include "SkCanvas.h"
 #include "SkData.h"
 #include "SkDrawFilter.h"
+#include "SkImage.h"
 #include "SkImageFilter.h"
 #include "SkLiteDL.h"
 #include "SkMath.h"
--- a/src/core/SkLiteDL.h
+++ b/src/core/SkLiteDL.h
@ -14,6 +14,7 @@
 #include "SkDrawable.h"
 #include "SkRect.h"
 #include "SkTDArray.h"
+#include "SkTemplates.h"

 class SkLiteDL final {
 public:
--- a/src/core/SkPictureCommon.h
+++ b/src/core/SkPictureCommon.h
@ -14,6 +14,7 @@

 #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.
--- a/src/core/SkRecord.cpp
+++ b/src/core/SkRecord.cpp
@ -6,6 +6,7 @@
 */

 #include "SkRecord.h"
+#include "SkImage.h"
 #include <algorithm>

 SkRecord::~SkRecord() {
--- a/src/core/SkRecordDraw.cpp
+++ b/src/core/SkRecordDraw.cpp
@ -6,6 +6,7 @@
 */

 #include "SkRecordDraw.h"
+#include "SkImage.h"
 #include "SkPatchUtils.h"

 void SkRecordDraw(const SkRecord& record,
--- a/src/fonts/SkRandomScalerContext.cpp
+++ b/src/fonts/SkRandomScalerContext.cpp
@ -5,6 +5,7 @@
 * found in the LICENSE file.
 */

+#include "SkBitmap.h"
 #include "SkCanvas.h"
 #include "SkGlyph.h"
 #include "SkMakeUnique.h"
--- a/src/pdf/SkPDFCanvas.cpp
+++ b/src/pdf/SkPDFCanvas.cpp
@ -5,6 +5,7 @@
 * found in the LICENSE file.
 */

+#include "SkImage.h"
 #include "SkLatticeIter.h"
 #include "SkPDFCanvas.h"
 #include "SkPDFDevice.h"
--- a/src/utils/SkDumpCanvas.cpp
+++ b/src/utils/SkDumpCanvas.cpp
@ -7,6 +7,7 @@

 #include "SkData.h"
 #include "SkDumpCanvas.h"
+#include "SkImage.h"
 #include "SkPatchUtils.h"
 #include "SkPicture.h"
 #include "SkPixelRef.h"
--- a/src/utils/SkShadowUtils.cpp
+++ b/src/utils/SkShadowUtils.cpp
@ -8,6 +8,7 @@
 #include "SkShadowUtils.h"
 #include "SkCanvas.h"
 #include "SkColorFilter.h"
+#include "SkColorPriv.h"
 #include "SkPath.h"
 #include "SkRandom.h"
 #include "SkResourceCache.h"
--- a/tests/CanvasStateTest.cpp
+++ b/tests/CanvasStateTest.cpp
@ -6,6 +6,7 @@
 */

 #include "CanvasStateHelpers.h"
+#include "SkBitmap.h"
 #include "SkCanvas.h"
 #include "SkClipOpPriv.h"
 #include "SkCanvasStateUtils.h"
--- a/tests/ClipCubicTest.cpp
+++ b/tests/ClipCubicTest.cpp
@ -5,6 +5,7 @@
 * found in the LICENSE file.
 */

+#include "SkBitmap.h"
 #include "SkCanvas.h"
 #include "SkCubicClipper.h"
 #include "SkGeometry.h"
@ -165,41 +166,41 @@ DEF_TEST(ClipCubic, reporter) {

 #include "SkSurface.h"

-DEF_TEST(test_fuzz_crbug_698714, reporter) {
-    auto surface(SkSurface::MakeRasterN32Premul(500, 500));
-    SkCanvas* canvas = surface->getCanvas();
-    SkPaint paint;
-    paint.setAntiAlias(true);
-    SkPath path;
-    path.setFillType(SkPath::kWinding_FillType);
-    path.moveTo(SkBits2Float(0x00000000), SkBits2Float(0x00000000));  // 0,0
-    path.lineTo(SkBits2Float(0x43434343), SkBits2Float(0x43430143));  //195.263f, 195.005f
-    path.lineTo(SkBits2Float(0x43434343), SkBits2Float(0x43434343));  //195.263f, 195.263f
-    path.lineTo(SkBits2Float(0xb5434343), SkBits2Float(0x434300be));  //-7.2741e-07f, 195.003f
-    // 195.263f, 195.263f, -1.16387e-05f, 3.58641e-38f, 3.85088e-29f,1.86082e-39f
-    path.cubicTo(SkBits2Float(0x43434343), SkBits2Float(0x43434341),
-            SkBits2Float(0xb74343bd), SkBits2Float(0x01434343),
-            SkBits2Float(0x10434343), SkBits2Float(0x00144332));
-    // 4.11823e-38f, 195.263f, 195.263f, 195.263f, -7.2741e-07f, 195.263f
-    path.cubicTo(SkBits2Float(0x016037c0), SkBits2Float(0x43434343),
-            SkBits2Float(0x43434343), SkBits2Float(0x43434343),
-            SkBits2Float(0xb5434343), SkBits2Float(0x43434343));
-    // 195.263f, 195.263f, -1.16387e-05f, 3.58641e-38f, 195.263f, -2
-    path.cubicTo(SkBits2Float(0x43434344), SkBits2Float(0x43434341),
-            SkBits2Float(0xb74343bd), SkBits2Float(0x01434343),
-            SkBits2Float(0x43434343), SkBits2Float(0xc0000014));
-    // -5.87228e+06f, 3.7773e-07f, 3.60231e-13f, -6.64511e+06f,2.77692e-15f, 2.48803e-15f
-    path.cubicTo(SkBits2Float(0xcab33535), SkBits2Float(0x34cacaca),
-            SkBits2Float(0x2acacaca), SkBits2Float(0xcacacae3),
-            SkBits2Float(0x27481927), SkBits2Float(0x27334805));
-    path.lineTo(SkBits2Float(0xb5434343), SkBits2Float(0x43434343));  //-7.2741e-07f, 195.263f
-    // 195.263f, 195.263f, -1.16387e-05f, 195.212f, 195.263f, -2
-    path.cubicTo(SkBits2Float(0x43434343), SkBits2Float(0x43434341),
-            SkBits2Float(0xb74343b9), SkBits2Float(0x43433643),
-            SkBits2Float(0x43434343), SkBits2Float(0xc0000014));
-    path.lineTo(SkBits2Float(0xc7004343), SkBits2Float(0x27480527));  //-32835.3f, 2.77584e-15f
-    path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0x00000000));  // 0,0
-    path.close();
-    canvas->clipRect({0, 0, 65, 202});
-    canvas->drawPath(path, paint);
-}
+DEF_TEST(test_fuzz_crbug_698714, reporter) {
+    auto surface(SkSurface::MakeRasterN32Premul(500, 500));
+    SkCanvas* canvas = surface->getCanvas();
+    SkPaint paint;
+    paint.setAntiAlias(true);
+    SkPath path;
+    path.setFillType(SkPath::kWinding_FillType);
+    path.moveTo(SkBits2Float(0x00000000), SkBits2Float(0x00000000));  // 0,0
+    path.lineTo(SkBits2Float(0x43434343), SkBits2Float(0x43430143));  //195.263f, 195.005f
+    path.lineTo(SkBits2Float(0x43434343), SkBits2Float(0x43434343));  //195.263f, 195.263f
+    path.lineTo(SkBits2Float(0xb5434343), SkBits2Float(0x434300be));  //-7.2741e-07f, 195.003f
+    // 195.263f, 195.263f, -1.16387e-05f, 3.58641e-38f, 3.85088e-29f,1.86082e-39f
+    path.cubicTo(SkBits2Float(0x43434343), SkBits2Float(0x43434341),
+            SkBits2Float(0xb74343bd), SkBits2Float(0x01434343),
+            SkBits2Float(0x10434343), SkBits2Float(0x00144332));
+    // 4.11823e-38f, 195.263f, 195.263f, 195.263f, -7.2741e-07f, 195.263f
+    path.cubicTo(SkBits2Float(0x016037c0), SkBits2Float(0x43434343),
+            SkBits2Float(0x43434343), SkBits2Float(0x43434343),
+            SkBits2Float(0xb5434343), SkBits2Float(0x43434343));
+    // 195.263f, 195.263f, -1.16387e-05f, 3.58641e-38f, 195.263f, -2
+    path.cubicTo(SkBits2Float(0x43434344), SkBits2Float(0x43434341),
+            SkBits2Float(0xb74343bd), SkBits2Float(0x01434343),
+            SkBits2Float(0x43434343), SkBits2Float(0xc0000014));
+    // -5.87228e+06f, 3.7773e-07f, 3.60231e-13f, -6.64511e+06f,2.77692e-15f, 2.48803e-15f
+    path.cubicTo(SkBits2Float(0xcab33535), SkBits2Float(0x34cacaca),
+            SkBits2Float(0x2acacaca), SkBits2Float(0xcacacae3),
+            SkBits2Float(0x27481927), SkBits2Float(0x27334805));
+    path.lineTo(SkBits2Float(0xb5434343), SkBits2Float(0x43434343));  //-7.2741e-07f, 195.263f
+    // 195.263f, 195.263f, -1.16387e-05f, 195.212f, 195.263f, -2
+    path.cubicTo(SkBits2Float(0x43434343), SkBits2Float(0x43434341),
+            SkBits2Float(0xb74343b9), SkBits2Float(0x43433643),
+            SkBits2Float(0x43434343), SkBits2Float(0xc0000014));
+    path.lineTo(SkBits2Float(0xc7004343), SkBits2Float(0x27480527));  //-32835.3f, 2.77584e-15f
+    path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0x00000000));  // 0,0
+    path.close();
+    canvas->clipRect({0, 0, 65, 202});
+    canvas->drawPath(path, paint);
+}
--- a/tests/ClipperTest.cpp
+++ b/tests/ClipperTest.cpp
@ -5,6 +5,7 @@
 * found in the LICENSE file.
 */

+#include "SkBitmap.h"
 #include "SkCanvas.h"
 #include "SkEdgeClipper.h"
 #include "SkLineClipper.h"
--- a/tests/EmptyPathTest.cpp
+++ b/tests/EmptyPathTest.cpp
@ -5,6 +5,7 @@
 * found in the LICENSE file.
 */

+#include "SkBitmap.h"
 #include "SkCanvas.h"
 #include "SkPath.h"
 #include "Test.h"
--- a/tests/HighContrastFilterTest.cpp
+++ b/tests/HighContrastFilterTest.cpp
@ -5,6 +5,7 @@
 * found in the LICENSE file.
 */

+#include "SkBitmap.h"
 #include "SkCanvas.h"
 #include "SkHighContrastFilter.h"
 #include "Test.h"
--- a/tests/PictureBBHTest.cpp
+++ b/tests/PictureBBHTest.cpp
@ -5,6 +5,7 @@
 * found in the LICENSE file.
 */

+#include "SkBitmap.h"
 #include "SkCanvas.h"
 #include "SkBBoxHierarchy.h"
 #include "SkPaint.h"
--- a/tests/SpecialSurfaceTest.cpp
+++ b/tests/SpecialSurfaceTest.cpp
@ -5,6 +5,7 @@
 * found in the LICENSE file
 */

+#include "SkBitmap.h"
 #include "SkCanvas.h"
 #include "SkSpecialImage.h"
 #include "SkSpecialSurface.h"
--- a/tools/debugger/SkDrawCommand.h
+++ b/tools/debugger/SkDrawCommand.h
@ -8,6 +8,7 @@
 #ifndef SKDRAWCOMMAND_H_
 #define SKDRAWCOMMAND_H_

+#include "SkBitmap.h"
 #include "SkCanvas.h"
 #include "SkTLazy.h"
 #include "SkPath.h"
--- a/tools/dump_record.cpp
+++ b/tools/dump_record.cpp
@ -6,6 +6,7 @@
 */

 #include "DumpRecord.h"
+#include "SkBitmap.h"
 #include "SkCommandLineFlags.h"
 #include "SkDeferredCanvas.h"
 #include "SkPicture.h"
--- a/tools/ok.cpp
+++ b/tools/ok.cpp
@ -10,6 +10,7 @@
 //   * ok is entirely opt-in.  No more maintaining huge --blacklists.

 #include "SkGraphics.h"
+#include "SkImage.h"
 #include "ok.h"
 #include <chrono>
 #include <future>
--- a/tools/ok_srcs.cpp
+++ b/tools/ok_srcs.cpp
@ -7,6 +7,7 @@

 #include "ok.h"
 #include "gm.h"
+#include "SkData.h"
 #include "SkOSFile.h"
 #include "SkPicture.h"
 #include <vector>
--- a/tools/ok_vias.cpp
+++ b/tools/ok_vias.cpp
@ -5,6 +5,7 @@
 * found in the LICENSE file.
 */

+#include "SkImage.h"
 #include "SkOSFile.h"
 #include "SkPictureRecorder.h"
 #include "ok.h"