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>

diff --git a/bench/ColorCanvasDrawBitmapBench.cpp b/bench/ColorCanvasDrawBitmapBench.cpp
index c150e79..de13ba2 100644 (file)
--- a/bench/ColorCanvasDrawBitmapBench.cpp
+++ b/bench/ColorCanvasDrawBitmapBench.cpp
@@ -6,7 +6,6 @@
 */
 
 #include "Benchmark.h"
-#include "SkBitmap.h"
 #include "SkCanvas.h"
 #include "SkColorSpaceXformCanvas.h"
 #include "SkString.h"

diff --git a/bench/DrawBitmapAABench.cpp b/bench/DrawBitmapAABench.cpp
index f0ccd89..011c30a 100644 (file)
--- a/bench/DrawBitmapAABench.cpp
+++ b/bench/DrawBitmapAABench.cpp
@@ -5,7 +5,6 @@
  * found in the LICENSE file.
  */
 #include "Benchmark.h"
-#include "SkBitmap.h"
 #include "SkCanvas.h"
 #include "SkMatrix.h"
 #include "SkPaint.h"

diff --git a/bench/DrawLatticeBench.cpp b/bench/DrawLatticeBench.cpp
index 7a8cdf3..806815b 100644 (file)
--- a/bench/DrawLatticeBench.cpp
+++ b/bench/DrawLatticeBench.cpp
@@ -6,7 +6,6 @@
 */
 
 #include "Benchmark.h"
-#include "SkBitmap.h"
 #include "SkCanvas.h"
 #include "SkRect.h"
 #include "SkString.h"

diff --git a/bench/ImageFilterDAGBench.cpp b/bench/ImageFilterDAGBench.cpp
index 350510b..719e87b 100644 (file)
--- a/bench/ImageFilterDAGBench.cpp
+++ b/bench/ImageFilterDAGBench.cpp
@@ -10,7 +10,6 @@
 #include "SkBlurImageFilter.h"
 #include "SkDisplacementMapEffect.h"
 #include "SkCanvas.h"
-#include "SkImage.h"
 #include "SkMergeImageFilter.h"
 
 

diff --git a/bench/MagnifierBench.cpp b/bench/MagnifierBench.cpp
index 6403aa6..98deade 100644 (file)
--- a/bench/MagnifierBench.cpp
+++ b/bench/MagnifierBench.cpp
@@ -6,7 +6,6 @@
  */
 
 #include "Benchmark.h"
-#include "SkBitmap.h"
 #include "SkCanvas.h"
 #include "SkMagnifierImageFilter.h"
 #include "SkRandom.h"

diff --git a/bench/ReadPixBench.cpp b/bench/ReadPixBench.cpp
index 2a8e9c4..2efb19c 100644 (file)
--- a/bench/ReadPixBench.cpp
+++ b/bench/ReadPixBench.cpp
@@ -6,7 +6,6 @@
  */
 
 #include "Benchmark.h"
-#include "SkBitmap.h"
 #include "SkCanvas.h"
 
 

diff --git a/bench/ShaderMaskBench.cpp b/bench/ShaderMaskBench.cpp
index 1cc2347..8fd99b6 100644 (file)
--- a/bench/ShaderMaskBench.cpp
+++ b/bench/ShaderMaskBench.cpp
@@ -9,7 +9,6 @@
 #include "SkCanvas.h"
 #include "SkPaint.h"
 #include "SkRandom.h"
-#include "SkShader.h"
 #include "SkString.h"
 #include "SkTemplates.h"
 

diff --git a/bench/WritePixelsBench.cpp b/bench/WritePixelsBench.cpp
index 4e2dbeb..5d6787e 100644 (file)
--- a/bench/WritePixelsBench.cpp
+++ b/bench/WritePixelsBench.cpp
@@ -6,7 +6,6 @@
  */
 
 #include "Benchmark.h"
-#include "SkBitmap.h"
 #include "SkCanvas.h"
 #include "SkString.h"
 

diff --git a/gm/bitmapimage.cpp b/gm/bitmapimage.cpp
index be17af8..8c37d5d 100644 (file)
--- 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 eb98b01..4657f6a 100644 (file)
--- 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 a6210c9..90fcedc 100644 (file)
--- 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 9c1fe6a..c88b878 100644 (file)
--- 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 b6e0c1c..f53ebc0 100644 (file)
--- 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 bbaeaa7..fef1332 100644 (file)
--- 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 bf13d3d..1dae1bf 100644 (file)
--- 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 d55498b..327368f 100644 (file)
--- 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 a7029f4..c4ef5f7 100644 (file)
--- 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) {

diff --git a/include/core/SkCanvas.h b/include/core/SkCanvas.h
index 87ae7f8..a259e53 100644 (file)
--- a/include/core/SkCanvas.h
+++ b/include/core/SkCanvas.h
@@ -14,6 +14,7 @@
 #include "SkPaint.h"
 #include "SkRasterHandleAllocator.h"
 #include "SkSurfaceProps.h"
+#include "SkLights.h"
 
 class GrContext;
 class GrRenderTargetContext;
@@ -26,7 +27,6 @@ class SkDrawable;
 class SkDrawFilter;
 class SkImage;
 class SkImageFilter;
-class SkLights;
 class SkMetaData;
 class SkPath;
 class SkPicture;

diff --git a/include/private/SkRecords.h b/include/private/SkRecords.h
index f26b6ba..02d2108 100644 (file)
--- a/include/private/SkRecords.h
+++ b/include/private/SkRecords.h
@@ -11,7 +11,6 @@
 #include "SkData.h"
 #include "SkCanvas.h"
 #include "SkDrawable.h"
-#include "SkImage.h"
 #include "SkImageFilter.h"
 #include "SkMatrix.h"
 #include "SkPath.h"

diff --git a/samplecode/SampleAAGeometry.cpp b/samplecode/SampleAAGeometry.cpp
index 69aa77f..6f6541b 100644 (file)
--- a/samplecode/SampleAAGeometry.cpp
+++ b/samplecode/SampleAAGeometry.cpp
@@ -6,7 +6,6 @@
  */
 
 #include "SampleCode.h"
-#include "SkBitmap.h"
 #include "SkCanvas.h"
 #include "SkGeometry.h"
 #include "SkIntersections.h"

diff --git a/samplecode/SampleAnimatedText.cpp b/samplecode/SampleAnimatedText.cpp
index 29bd192..e70530a 100644 (file)
--- a/samplecode/SampleAnimatedText.cpp
+++ b/samplecode/SampleAnimatedText.cpp
@@ -11,7 +11,6 @@
 #include "SkUtils.h"
 #include "SkColorPriv.h"
 #include "SkColorFilter.h"
-#include "SkImage.h"
 #include "SkRandom.h"
 #include "SkSystemEventTypes.h"
 #include "SkTime.h"

diff --git a/samplecode/SampleLayerMask.cpp b/samplecode/SampleLayerMask.cpp
index b039421..f0c6a40 100644 (file)
--- a/samplecode/SampleLayerMask.cpp
+++ b/samplecode/SampleLayerMask.cpp
@@ -6,7 +6,6 @@
  */
 
 #include "SampleCode.h"
-#include "SkBitmap.h"
 #include "SkCanvas.h"
 #include "SkPaint.h"
 #include "SkPath.h"

diff --git a/src/core/SkCanvas.cpp b/src/core/SkCanvas.cpp
index b890ead..5e33dbf 100644 (file)
--- 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 f2d5946..b142e7e 100644 (file)
--- 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 b3149a7..0162327 100644 (file)
--- 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 c5df350..270b2ef 100644 (file)
--- 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 a400264..6f6a9f1 100644 (file)
--- 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 3553ff5..4df4131 100644 (file)
--- 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 e668cc8..fbb7f7c 100644 (file)
--- 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 a38f695..3a292dc 100644 (file)
--- 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 c5cde3d..d946f48 100644 (file)
--- 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 05cabad..35b88de 100644 (file)
--- 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 279ca73..f3311cd 100644 (file)
--- 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"

diff --git a/tests/CanvasStateTest.cpp b/tests/CanvasStateTest.cpp
index ae417d4..73c8a0e 100644 (file)
--- a/tests/CanvasStateTest.cpp
+++ b/tests/CanvasStateTest.cpp
@@ -6,7 +6,6 @@
  */
 
 #include "CanvasStateHelpers.h"
-#include "SkBitmap.h"
 #include "SkCanvas.h"
 #include "SkClipOpPriv.h"
 #include "SkCanvasStateUtils.h"

diff --git a/tests/ClipCubicTest.cpp b/tests/ClipCubicTest.cpp
index 854ac32..1d88eae 100644 (file)
--- a/tests/ClipCubicTest.cpp
+++ b/tests/ClipCubicTest.cpp
@@ -5,7 +5,6 @@
  * found in the LICENSE file.
  */
 
-#include "SkBitmap.h"
 #include "SkCanvas.h"
 #include "SkCubicClipper.h"
 #include "SkGeometry.h"
@@ -166,41 +165,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) {\r
+    auto surface(SkSurface::MakeRasterN32Premul(500, 500));\r
+    SkCanvas* canvas = surface->getCanvas();\r
+    SkPaint paint;\r
+    paint.setAntiAlias(true);\r
+    SkPath path;\r
+    path.setFillType(SkPath::kWinding_FillType);\r
+    path.moveTo(SkBits2Float(0x00000000), SkBits2Float(0x00000000));  // 0,0\r
+    path.lineTo(SkBits2Float(0x43434343), SkBits2Float(0x43430143));  //195.263f, 195.005f\r
+    path.lineTo(SkBits2Float(0x43434343), SkBits2Float(0x43434343));  //195.263f, 195.263f\r
+    path.lineTo(SkBits2Float(0xb5434343), SkBits2Float(0x434300be));  //-7.2741e-07f, 195.003f\r
+    // 195.263f, 195.263f, -1.16387e-05f, 3.58641e-38f, 3.85088e-29f,1.86082e-39f\r
+    path.cubicTo(SkBits2Float(0x43434343), SkBits2Float(0x43434341),\r
+            SkBits2Float(0xb74343bd), SkBits2Float(0x01434343),\r
+            SkBits2Float(0x10434343), SkBits2Float(0x00144332));\r
+    // 4.11823e-38f, 195.263f, 195.263f, 195.263f, -7.2741e-07f, 195.263f\r
+    path.cubicTo(SkBits2Float(0x016037c0), SkBits2Float(0x43434343),\r
+            SkBits2Float(0x43434343), SkBits2Float(0x43434343),\r
+            SkBits2Float(0xb5434343), SkBits2Float(0x43434343));\r
+    // 195.263f, 195.263f, -1.16387e-05f, 3.58641e-38f, 195.263f, -2\r
+    path.cubicTo(SkBits2Float(0x43434344), SkBits2Float(0x43434341),\r
+            SkBits2Float(0xb74343bd), SkBits2Float(0x01434343),\r
+            SkBits2Float(0x43434343), SkBits2Float(0xc0000014));\r
+    // -5.87228e+06f, 3.7773e-07f, 3.60231e-13f, -6.64511e+06f,2.77692e-15f, 2.48803e-15f\r
+    path.cubicTo(SkBits2Float(0xcab33535), SkBits2Float(0x34cacaca),\r
+            SkBits2Float(0x2acacaca), SkBits2Float(0xcacacae3),\r
+            SkBits2Float(0x27481927), SkBits2Float(0x27334805));\r
+    path.lineTo(SkBits2Float(0xb5434343), SkBits2Float(0x43434343));  //-7.2741e-07f, 195.263f\r
+    // 195.263f, 195.263f, -1.16387e-05f, 195.212f, 195.263f, -2\r
+    path.cubicTo(SkBits2Float(0x43434343), SkBits2Float(0x43434341),\r
+            SkBits2Float(0xb74343b9), SkBits2Float(0x43433643),\r
+            SkBits2Float(0x43434343), SkBits2Float(0xc0000014));\r
+    path.lineTo(SkBits2Float(0xc7004343), SkBits2Float(0x27480527));  //-32835.3f, 2.77584e-15f\r
+    path.lineTo(SkBits2Float(0x00000000), SkBits2Float(0x00000000));  // 0,0\r
+    path.close();\r
+    canvas->clipRect({0, 0, 65, 202});\r
+    canvas->drawPath(path, paint);\r
+}\r

diff --git a/tests/ClipperTest.cpp b/tests/ClipperTest.cpp
index 641ed01..8ebd9b4 100644 (file)
--- a/tests/ClipperTest.cpp
+++ b/tests/ClipperTest.cpp
@@ -5,7 +5,6 @@
  * found in the LICENSE file.
  */
 
-#include "SkBitmap.h"
 #include "SkCanvas.h"
 #include "SkEdgeClipper.h"
 #include "SkLineClipper.h"

diff --git a/tests/EmptyPathTest.cpp b/tests/EmptyPathTest.cpp
index 5b857a0..060ef8d 100644 (file)
--- a/tests/EmptyPathTest.cpp
+++ b/tests/EmptyPathTest.cpp
@@ -5,7 +5,6 @@
  * found in the LICENSE file.
  */
 
-#include "SkBitmap.h"
 #include "SkCanvas.h"
 #include "SkPath.h"
 #include "Test.h"

diff --git a/tests/HighContrastFilterTest.cpp b/tests/HighContrastFilterTest.cpp
index 7c3fc84..26f1a7c 100644 (file)
--- a/tests/HighContrastFilterTest.cpp
+++ b/tests/HighContrastFilterTest.cpp
@@ -5,7 +5,6 @@
  * found in the LICENSE file.
  */
 
-#include "SkBitmap.h"
 #include "SkCanvas.h"
 #include "SkHighContrastFilter.h"
 #include "Test.h"

diff --git a/tests/PictureBBHTest.cpp b/tests/PictureBBHTest.cpp
index 0bc81c2..64b09b1 100644 (file)
--- a/tests/PictureBBHTest.cpp
+++ b/tests/PictureBBHTest.cpp
@@ -5,7 +5,6 @@
  * found in the LICENSE file.
  */
 
-#include "SkBitmap.h"
 #include "SkCanvas.h"
 #include "SkBBoxHierarchy.h"
 #include "SkPaint.h"

diff --git a/tests/SpecialSurfaceTest.cpp b/tests/SpecialSurfaceTest.cpp
index a336cf6..1867e25 100644 (file)
--- a/tests/SpecialSurfaceTest.cpp
+++ b/tests/SpecialSurfaceTest.cpp
@@ -5,7 +5,6 @@
 * found in the LICENSE file
 */
 
-#include "SkBitmap.h"
 #include "SkCanvas.h"
 #include "SkSpecialImage.h"
 #include "SkSpecialSurface.h"

diff --git a/tools/debugger/SkDrawCommand.h b/tools/debugger/SkDrawCommand.h
index 1b3d9ab..fc2f45a 100644 (file)
--- a/tools/debugger/SkDrawCommand.h
+++ b/tools/debugger/SkDrawCommand.h
@@ -8,7 +8,6 @@
 #ifndef SKDRAWCOMMAND_H_
 #define SKDRAWCOMMAND_H_
 
-#include "SkBitmap.h"
 #include "SkCanvas.h"
 #include "SkTLazy.h"
 #include "SkPath.h"

diff --git a/tools/dump_record.cpp b/tools/dump_record.cpp
index 24017bd..c1b87e7 100644 (file)
--- a/tools/dump_record.cpp
+++ b/tools/dump_record.cpp
@@ -6,7 +6,6 @@
  */
 
 #include "DumpRecord.h"
-#include "SkBitmap.h"
 #include "SkCommandLineFlags.h"
 #include "SkDeferredCanvas.h"
 #include "SkPicture.h"

diff --git a/tools/ok.cpp b/tools/ok.cpp
index edda9be..10f9afd 100644 (file)
--- a/tools/ok.cpp
+++ b/tools/ok.cpp
@@ -10,7 +10,6 @@
 //   * ok is entirely opt-in.  No more maintaining huge --blacklists.
 
 #include "SkGraphics.h"
-#include "SkImage.h"
 #include "ok.h"
 #include <chrono>
 #include <future>

diff --git a/tools/ok_srcs.cpp b/tools/ok_srcs.cpp
index 5630a34..fd5f201 100644 (file)
--- a/tools/ok_srcs.cpp
+++ b/tools/ok_srcs.cpp
@@ -7,7 +7,6 @@
 
 #include "ok.h"
 #include "gm.h"
-#include "SkData.h"
 #include "SkOSFile.h"
 #include "SkPicture.h"
 #include <vector>

diff --git a/tools/ok_vias.cpp b/tools/ok_vias.cpp
index 20779cf..17e117a 100644 (file)
--- a/tools/ok_vias.cpp
+++ b/tools/ok_vias.cpp
@@ -5,7 +5,6 @@
  * found in the LICENSE file.
  */
 
-#include "SkImage.h"
 #include "SkOSFile.h"
 #include "SkPictureRecorder.h"
 #include "ok.h"