diff options
-rw-r--r-- | fuzz/FilterFuzz.cpp | 1 | ||||
-rw-r--r-- | fuzz/FuzzCanvas.cpp | 1 | ||||
-rw-r--r-- | gm/distantclip.cpp | 1 | ||||
-rw-r--r-- | gm/filterfastbounds.cpp | 1 | ||||
-rw-r--r-- | gm/multipicturedraw.cpp | 1 | ||||
-rw-r--r-- | gm/picture.cpp | 1 | ||||
-rw-r--r-- | gm/pictureimagegenerator.cpp | 1 | ||||
-rw-r--r-- | gn/core.gni | 4 | ||||
-rw-r--r-- | include/core/SkPictureRecorder.h | 4 | ||||
-rw-r--r-- | samplecode/GMSampleView.cpp | 1 | ||||
-rw-r--r-- | samplecode/SampleFilterFuzz.cpp | 1 | ||||
-rw-r--r-- | src/core/SkMiniRecorder.h (renamed from include/private/SkMiniRecorder.h) | 0 | ||||
-rw-r--r-- | src/core/SkPictureRecorder.cpp | 8 | ||||
-rw-r--r-- | src/core/SkRecords.h (renamed from include/private/SkRecords.h) | 0 | ||||
-rw-r--r-- | tests/ImageGeneratorTest.cpp | 1 | ||||
-rw-r--r-- | tests/ImageIsOpaqueTest.cpp | 1 | ||||
-rw-r--r-- | tests/RecordingXfermodeTest.cpp | 1 |
17 files changed, 21 insertions, 7 deletions
diff --git a/fuzz/FilterFuzz.cpp b/fuzz/FilterFuzz.cpp index cf65701d36..b2d99b771b 100644 --- a/fuzz/FilterFuzz.cpp +++ b/fuzz/FilterFuzz.cpp @@ -39,6 +39,7 @@ #include "SkPictureRecorder.h" #include "SkPoint3.h" #include "SkRandom.h" +#include "SkRegion.h" #include "SkTableColorFilter.h" #include "SkTileImageFilter.h" #include "SkTypeface.h" diff --git a/fuzz/FuzzCanvas.cpp b/fuzz/FuzzCanvas.cpp index 3796812012..aec9173a16 100644 --- a/fuzz/FuzzCanvas.cpp +++ b/fuzz/FuzzCanvas.cpp @@ -54,6 +54,7 @@ #include "SkPictureImageFilter.h" #include "SkRRectsGaussianEdgeMaskFilter.h" #include "SkTableColorFilter.h" +#include "SkTextBlob.h" #include "SkTileImageFilter.h" #include "SkXfermodeImageFilter.h" diff --git a/gm/distantclip.cpp b/gm/distantclip.cpp index 24fbacaf4d..fa752659a5 100644 --- a/gm/distantclip.cpp +++ b/gm/distantclip.cpp @@ -8,6 +8,7 @@ #include "gm.h" #include "SkCanvas.h" +#include "SkPath.h" #include "SkPicture.h" #include "SkPictureRecorder.h" diff --git a/gm/filterfastbounds.cpp b/gm/filterfastbounds.cpp index 5102b863c2..ad042aca49 100644 --- a/gm/filterfastbounds.cpp +++ b/gm/filterfastbounds.cpp @@ -11,6 +11,7 @@ #include "SkDropShadowImageFilter.h" #include "SkImageSource.h" #include "SkOffsetImageFilter.h" +#include "SkPath.h" #include "SkPictureImageFilter.h" #include "SkPictureRecorder.h" #include "SkRandom.h" diff --git a/gm/multipicturedraw.cpp b/gm/multipicturedraw.cpp index fe2281ae20..b18fb8a53b 100644 --- a/gm/multipicturedraw.cpp +++ b/gm/multipicturedraw.cpp @@ -10,6 +10,7 @@ #include "SkColorFilter.h" #include "SkMultiPictureDraw.h" +#include "SkPath.h" #include "SkPictureRecorder.h" #include "SkSurface.h" diff --git a/gm/picture.cpp b/gm/picture.cpp index 72d4159aa9..5b3cdfb66c 100644 --- a/gm/picture.cpp +++ b/gm/picture.cpp @@ -7,6 +7,7 @@ #include "gm.h" #include "SkPaint.h" +#include "SkPath.h" #include "SkPictureRecorder.h" static sk_sp<SkPicture> make_picture() { diff --git a/gm/pictureimagegenerator.cpp b/gm/pictureimagegenerator.cpp index a54fa643b9..4e465d157a 100644 --- a/gm/pictureimagegenerator.cpp +++ b/gm/pictureimagegenerator.cpp @@ -12,6 +12,7 @@ #include "SkGradientShader.h" #include "SkImageGenerator.h" #include "SkPaint.h" +#include "SkPath.h" #include "SkPathOps.h" #include "SkPicture.h" #include "SkPictureRecorder.h" diff --git a/gn/core.gni b/gn/core.gni index 1d88821f7d..5566ddebdd 100644 --- a/gn/core.gni +++ b/gn/core.gni @@ -207,6 +207,7 @@ skia_core_sources = [ "$_src/core/SkMipMap.cpp", "$_src/core/SkMipMap.h", "$_src/core/SkMiniRecorder.cpp", + "$_src/core/SkMiniRecorder.h", "$_src/core/SkModeColorFilter.cpp", "$_src/core/SkMultiPictureDraw.cpp", "$_src/core/SkNextID.h", @@ -271,6 +272,7 @@ skia_core_sources = [ "$_src/core/SkReader32.h", "$_src/core/SkRecord.cpp", "$_src/core/SkRecords.cpp", + "$_src/core/SkRecords.h", "$_src/core/SkRecordDraw.cpp", "$_src/core/SkRecordOpts.cpp", "$_src/core/SkRecordOpts.h", @@ -456,10 +458,8 @@ skia_core_sources = [ "$_include/private/SkFloatingPoint.h", "$_include/private/SkMalloc.h", "$_include/private/SkMessageBus.h", - "$_include/private/SkMiniRecorder.h", "$_include/private/SkMutex.h", "$_include/private/SkOnce.h", - "$_include/private/SkRecords.h", "$_include/private/SkSemaphore.h", "$_include/private/SkShadowFlags.h", "$_include/private/SkSpinlock.h", diff --git a/include/core/SkPictureRecorder.h b/include/core/SkPictureRecorder.h index d898b91cca..09839cba5e 100644 --- a/include/core/SkPictureRecorder.h +++ b/include/core/SkPictureRecorder.h @@ -8,7 +8,6 @@ #ifndef SkPictureRecorder_DEFINED #define SkPictureRecorder_DEFINED -#include "../private/SkMiniRecorder.h" #include "SkBBHFactory.h" #include "SkPicture.h" #include "SkRefCnt.h" @@ -22,6 +21,7 @@ namespace android { class GrContext; class SkCanvas; class SkDrawable; +class SkMiniRecorder; class SkPictureRecord; class SkRecord; class SkRecorder; @@ -116,7 +116,7 @@ private: sk_sp<SkBBoxHierarchy> fBBH; std::unique_ptr<SkRecorder> fRecorder; sk_sp<SkRecord> fRecord; - SkMiniRecorder fMiniRecorder; + std::unique_ptr<SkMiniRecorder> fMiniRecorder; typedef SkNoncopyable INHERITED; }; diff --git a/samplecode/GMSampleView.cpp b/samplecode/GMSampleView.cpp index 19cbcc8b57..ffa33cedfc 100644 --- a/samplecode/GMSampleView.cpp +++ b/samplecode/GMSampleView.cpp @@ -6,6 +6,7 @@ */ #include "GMSampleView.h" +#include "SkData.h" GMSampleView::GMSampleView(GM* gm) : fShowSize(false), fGM(gm) {} diff --git a/samplecode/SampleFilterFuzz.cpp b/samplecode/SampleFilterFuzz.cpp index 3690612870..7254192fe5 100644 --- a/samplecode/SampleFilterFuzz.cpp +++ b/samplecode/SampleFilterFuzz.cpp @@ -39,6 +39,7 @@ #include "SkPictureRecorder.h" #include "SkPoint3.h" #include "SkRandom.h" +#include "SkRegion.h" #include "SkTableColorFilter.h" #include "SkTileImageFilter.h" #include "SkTypeface.h" diff --git a/include/private/SkMiniRecorder.h b/src/core/SkMiniRecorder.h index fd1e8f624d..fd1e8f624d 100644 --- a/include/private/SkMiniRecorder.h +++ b/src/core/SkMiniRecorder.h diff --git a/src/core/SkPictureRecorder.cpp b/src/core/SkPictureRecorder.cpp index 7abb12bfa7..a37cd4826c 100644 --- a/src/core/SkPictureRecorder.cpp +++ b/src/core/SkPictureRecorder.cpp @@ -8,6 +8,7 @@ #include "SkBigPicture.h" #include "SkData.h" #include "SkDrawable.h" +#include "SkMiniRecorder.h" #include "SkPictureRecorder.h" #include "SkRecord.h" #include "SkRecordDraw.h" @@ -18,7 +19,8 @@ SkPictureRecorder::SkPictureRecorder() { fActivelyRecording = false; - fRecorder.reset(new SkRecorder(nullptr, SkRect::MakeEmpty(), &fMiniRecorder)); + fMiniRecorder.reset(new SkMiniRecorder); + fRecorder.reset(new SkRecorder(nullptr, SkRect::MakeEmpty(), fMiniRecorder.get())); } SkPictureRecorder::~SkPictureRecorder() {} @@ -42,7 +44,7 @@ SkCanvas* SkPictureRecorder::beginRecording(const SkRect& userCullRect, SkRecorder::DrawPictureMode dpm = (recordFlags & kPlaybackDrawPicture_RecordFlag) ? SkRecorder::Playback_DrawPictureMode : SkRecorder::Record_DrawPictureMode; - fRecorder->reset(fRecord.get(), cullRect, dpm, &fMiniRecorder); + fRecorder->reset(fRecord.get(), cullRect, dpm, fMiniRecorder.get()); fActivelyRecording = true; return this->getRecordingCanvas(); } @@ -56,7 +58,7 @@ sk_sp<SkPicture> SkPictureRecorder::finishRecordingAsPicture(uint32_t finishFlag fRecorder->restoreToCount(1); // If we were missing any restores, add them now. if (fRecord->count() == 0) { - auto pic = fMiniRecorder.detachAsPicture(fBBH ? nullptr : &fCullRect); + auto pic = fMiniRecorder->detachAsPicture(fBBH ? nullptr : &fCullRect); fBBH.reset(nullptr); return pic; } diff --git a/include/private/SkRecords.h b/src/core/SkRecords.h index 6af4aad3f5..6af4aad3f5 100644 --- a/include/private/SkRecords.h +++ b/src/core/SkRecords.h diff --git a/tests/ImageGeneratorTest.cpp b/tests/ImageGeneratorTest.cpp index d79b434e35..3d82534717 100644 --- a/tests/ImageGeneratorTest.cpp +++ b/tests/ImageGeneratorTest.cpp @@ -6,6 +6,7 @@ */ #include "SkData.h" +#include "SkCanvas.h" #include "SkGraphics.h" #include "SkImageGenerator.h" #include "Test.h" diff --git a/tests/ImageIsOpaqueTest.cpp b/tests/ImageIsOpaqueTest.cpp index 81f1d76609..bf3dea6334 100644 --- a/tests/ImageIsOpaqueTest.cpp +++ b/tests/ImageIsOpaqueTest.cpp @@ -12,6 +12,7 @@ #if SK_SUPPORT_GPU #include "GrContext.h" #endif +#include "SkCanvas.h" #include "SkColorSpace_Base.h" #include "SkImage.h" #include "SkSurface.h" diff --git a/tests/RecordingXfermodeTest.cpp b/tests/RecordingXfermodeTest.cpp index db4262c7e9..20dccc6cc2 100644 --- a/tests/RecordingXfermodeTest.cpp +++ b/tests/RecordingXfermodeTest.cpp @@ -7,6 +7,7 @@ #include "Test.h" +#include "../include/core/SkBitmap.h" #include "../include/core/SkCanvas.h" #include "../include/core/SkPicture.h" #include "../include/core/SkStream.h" |