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 /tests | |
| 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 'tests')
| -rw-r--r-- | tests/CanvasStateTest.cpp | 1 | ||||
| -rw-r--r-- | tests/ClipCubicTest.cpp | 77 | ||||
| -rw-r--r-- | tests/ClipperTest.cpp | 1 | ||||
| -rw-r--r-- | tests/EmptyPathTest.cpp | 1 | ||||
| -rw-r--r-- | tests/HighContrastFilterTest.cpp | 1 | ||||
| -rw-r--r-- | tests/PictureBBHTest.cpp | 1 | ||||
| -rw-r--r-- | tests/SpecialSurfaceTest.cpp | 1 |
7 files changed, 45 insertions, 38 deletions
diff --git a/tests/CanvasStateTest.cpp b/tests/CanvasStateTest.cpp index 73c8a0e0b9..ae417d40b6 100644 --- 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" diff --git a/tests/ClipCubicTest.cpp b/tests/ClipCubicTest.cpp index 1d88eaeaf7..854ac32dd1 100644 --- 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); +} diff --git a/tests/ClipperTest.cpp b/tests/ClipperTest.cpp index 8ebd9b479f..641ed013be 100644 --- 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" diff --git a/tests/EmptyPathTest.cpp b/tests/EmptyPathTest.cpp index 060ef8d237..5b857a0119 100644 --- 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" diff --git a/tests/HighContrastFilterTest.cpp b/tests/HighContrastFilterTest.cpp index 26f1a7c1f4..7c3fc84c25 100644 --- 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" diff --git a/tests/PictureBBHTest.cpp b/tests/PictureBBHTest.cpp index 64b09b1e03..0bc81c2934 100644 --- 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" diff --git a/tests/SpecialSurfaceTest.cpp b/tests/SpecialSurfaceTest.cpp index 1867e2514a..a336cf669d 100644 --- 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" |