AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "Reland: Remove SkLights include from SkCanvas.h"

Browse Source 
This reverts commit fed00319c9.

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>
This commit is contained in:
Florin Malita 2017-05-03 15:41:00 +00:00 committed by Skia Commit-Bot
parent e188f8b14b
commit 9d5f66d9c2
45 changed files with 39 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
bench/ColorCanvasDrawBitmapBench.cpp
View File

@ -6,7 +6,6 @@
*/
#include "Benchmark.h"
#include "SkBitmap.h"
#include "SkCanvas.h"
#include "SkColorSpaceXformCanvas.h"
#include "SkString.h"

1
bench/DrawBitmapAABench.cpp
View File

@ -5,7 +5,6 @@
* found in the LICENSE file.
*/
#include "Benchmark.h"
#include "SkBitmap.h"
#include "SkCanvas.h"
#include "SkMatrix.h"
#include "SkPaint.h"

1
bench/DrawLatticeBench.cpp
View File

@ -6,7 +6,6 @@
*/
#include "Benchmark.h"
#include "SkBitmap.h"
#include "SkCanvas.h"
#include "SkRect.h"
#include "SkString.h"

1
bench/ImageFilterDAGBench.cpp
View File

@ -10,7 +10,6 @@
#include "SkBlurImageFilter.h"
#include "SkDisplacementMapEffect.h"
#include "SkCanvas.h"
#include "SkImage.h"
#include "SkMergeImageFilter.h"

1
bench/MagnifierBench.cpp
View File

@ -6,7 +6,6 @@
*/
#include "Benchmark.h"
#include "SkBitmap.h"
#include "SkCanvas.h"
#include "SkMagnifierImageFilter.h"
#include "SkRandom.h"

1
bench/ReadPixBench.cpp
View File

@ -6,7 +6,6 @@
*/
#include "Benchmark.h"
#include "SkBitmap.h"
#include "SkCanvas.h"

1
bench/ShaderMaskBench.cpp
View File

@ -9,7 +9,6 @@
#include "SkCanvas.h"
#include "SkPaint.h"
#include "SkRandom.h"
#include "SkShader.h"
#include "SkString.h"
#include "SkTemplates.h"

1
bench/WritePixelsBench.cpp
View File

@ -6,7 +6,6 @@
*/
#include "Benchmark.h"
#include "SkBitmap.h"
#include "SkCanvas.h"
#include "SkString.h"

1
gm/bitmapimage.cpp
View File

@ -8,7 +8,6 @@
#include "gm.h"
#include "Resources.h"
#include "SkCodec.h"
#include "SkImage.h"
namespace skiagm {

1
gm/colorspacexform.cpp
View File

@ -10,7 +10,6 @@
#include "SkColorSpace_Base.h"
#include "SkColorSpaceXform.h"
#include "SkRect.h"
#include "SkShader.h"
class ColorSpaceXformGM : public skiagm::GM {
public:

1
gm/composeshader.cpp
View File

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

1
gm/deferredtextureimage.cpp
View File

@ -7,7 +7,6 @@
#include <vector>
#include "gm.h"
#include "SkImage.h"
#include "SkMipMap.h"
#include "Resources.h"

1
gm/encode-platform.cpp
View File

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

1
gm/encode-srgb.cpp
View File

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

1
gm/encode.cpp
View File

@ -8,7 +8,6 @@
#include "sk_tool_utils.h"
#include "SkCanvas.h"
#include "SkData.h"
#include "SkImage.h"
#include "SkImageEncoder.h"
#include "Resources.h"

1
gm/gammaencodedpremul.cpp
View File

@ -6,7 +6,6 @@
*/
#include "gm.h"
#include "SkColorPriv.h"
#include "SkColorSpaceXform.h"
#include "SkColorSpaceXformPriv.h"
#include "SkOpts.h"

1
gm/subsetshader.cpp
View File

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

2
include/core/SkCanvas.h
View File

@ -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;

1
include/private/SkRecords.h
View File

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

1
samplecode/SampleAAGeometry.cpp
View File

@ -6,7 +6,6 @@
*/
#include "SampleCode.h"
#include "SkBitmap.h"
#include "SkCanvas.h"
#include "SkGeometry.h"
#include "SkIntersections.h"

1
samplecode/SampleAnimatedText.cpp
View File

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

1
samplecode/SampleLayerMask.cpp
View File

@ -6,7 +6,6 @@
*/
#include "SampleCode.h"
#include "SkBitmap.h"
#include "SkCanvas.h"
#include "SkPaint.h"
#include "SkPath.h"

1
src/core/SkCanvas.cpp
View File

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

1
src/core/SkDraw.h
View File

@ -13,7 +13,6 @@
#include "SkCanvas.h"
#include "SkMask.h"
#include "SkPaint.h"
#include "SkPixmap.h"
#include "SkStrokeRec.h"
#include "SkVertices.h"

1
src/core/SkLiteDL.cpp
View File

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

1
src/core/SkLiteDL.h
View File

@ -14,7 +14,6 @@
#include "SkDrawable.h"
#include "SkRect.h"
#include "SkTDArray.h"
#include "SkTemplates.h"
class SkLiteDL final {
public:

1
src/core/SkPictureCommon.h
View File

@ -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.

1
src/core/SkRecord.cpp
View File

@ -6,7 +6,6 @@
*/
#include "SkRecord.h"
#include "SkImage.h"
#include <algorithm>
SkRecord::~SkRecord() {

1
src/core/SkRecordDraw.cpp
View File

@ -6,7 +6,6 @@
*/
#include "SkRecordDraw.h"
#include "SkImage.h"
#include "SkPatchUtils.h"
void SkRecordDraw(const SkRecord& record,

1
src/fonts/SkRandomScalerContext.cpp
View File

@ -5,7 +5,6 @@
* found in the LICENSE file.
*/
#include "SkBitmap.h"
#include "SkCanvas.h"
#include "SkGlyph.h"
#include "SkMakeUnique.h"

1
src/pdf/SkPDFCanvas.cpp
View File

@ -5,7 +5,6 @@
* found in the LICENSE file.
*/
#include "SkImage.h"
#include "SkLatticeIter.h"
#include "SkPDFCanvas.h"
#include "SkPDFDevice.h"

1
src/utils/SkDumpCanvas.cpp
View File

@ -7,7 +7,6 @@
#include "SkData.h"
#include "SkDumpCanvas.h"
#include "SkImage.h"
#include "SkPatchUtils.h"
#include "SkPicture.h"
#include "SkPixelRef.h"

1
src/utils/SkShadowUtils.cpp
View File

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

1
tests/CanvasStateTest.cpp
View File

@ -6,7 +6,6 @@
*/
#include "CanvasStateHelpers.h"
#include "SkBitmap.h"
#include "SkCanvas.h"
#include "SkClipOpPriv.h"
#include "SkCanvasStateUtils.h"

77
tests/ClipCubicTest.cpp
View File

@ -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) {
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);
}

1
tests/ClipperTest.cpp
View File

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

1
tests/EmptyPathTest.cpp
View File

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

1
tests/HighContrastFilterTest.cpp
View File

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

1
tests/PictureBBHTest.cpp
View File

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

1
tests/SpecialSurfaceTest.cpp
View File

@ -5,7 +5,6 @@
* found in the LICENSE file
*/
#include "SkBitmap.h"
#include "SkCanvas.h"
#include "SkSpecialImage.h"
#include "SkSpecialSurface.h"

1
tools/debugger/SkDrawCommand.h
View File

@ -8,7 +8,6 @@
#ifndef SKDRAWCOMMAND_H_
#define SKDRAWCOMMAND_H_
#include "SkBitmap.h"
#include "SkCanvas.h"
#include "SkTLazy.h"
#include "SkPath.h"

1
tools/dump_record.cpp
View File

@ -6,7 +6,6 @@
*/
#include "DumpRecord.h"
#include "SkBitmap.h"
#include "SkCommandLineFlags.h"
#include "SkDeferredCanvas.h"
#include "SkPicture.h"

1
tools/ok.cpp
View File

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

1
tools/ok_srcs.cpp
View File

@ -7,7 +7,6 @@
#include "ok.h"
#include "gm.h"
#include "SkData.h"
#include "SkOSFile.h"
#include "SkPicture.h"
#include <vector>

1
tools/ok_vias.cpp
View File

@ -5,7 +5,6 @@
* found in the LICENSE file.
*/
#include "SkImage.h"
#include "SkOSFile.h"
#include "SkPictureRecorder.h"
#include "ok.h"