From aa73b96760c280629b9a765be387087d772fe242 Mon Sep 17 00:00:00 2001 From: Mike Klein Date: Mon, 27 Nov 2017 16:00:46 -0500 Subject: clean up SkDeferredCanvas To our knowledge it's not used. Its defer- mode in DM isn't even run on the bots. Change-Id: Ifebfa2a77bfed8370eb421d379697f04fa2c8608 Reviewed-on: https://skia-review.googlesource.com/76420 Reviewed-by: Derek Sollenberger Commit-Queue: Mike Klein --- dm/DM.cpp | 1 - dm/DMSrcSink.cpp | 11 ----------- dm/DMSrcSink.h | 6 ------ 3 files changed, 18 deletions(-) (limited to 'dm') diff --git a/dm/DM.cpp b/dm/DM.cpp index a4e70fe79f..aa9cc10543 100644 --- a/dm/DM.cpp +++ b/dm/DM.cpp @@ -936,7 +936,6 @@ static Sink* create_via(const SkString& tag, Sink* wrapped) { VIA("pic", ViaPicture, wrapped); VIA("2ndpic", ViaSecondPicture, wrapped); VIA("sp", ViaSingletonPictures, wrapped); - VIA("defer", ViaDefer, wrapped); VIA("tiles", ViaTiles, 256, 256, nullptr, wrapped); VIA("tiles_rt", ViaTiles, 256, 256, new SkRTreeFactory, wrapped); diff --git a/dm/DMSrcSink.cpp b/dm/DMSrcSink.cpp index fc535dcd59..89a4b531e2 100644 --- a/dm/DMSrcSink.cpp +++ b/dm/DMSrcSink.cpp @@ -19,7 +19,6 @@ #include "SkCommonFlags.h" #include "SkData.h" #include "SkDebugCanvas.h" -#include "SkDeferredCanvas.h" #include "SkDeferredDisplayListRecorder.h" #include "SkDocument.h" #include "SkExecutor.h" @@ -1961,16 +1960,6 @@ Error ViaPicture::draw(const Src& src, SkBitmap* bitmap, SkWStream* stream, SkSt /*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/ -Error ViaDefer::draw(const Src& src, SkBitmap* bitmap, SkWStream* stream, SkString* log) const { - auto size = src.size(); - return draw_to_canvas(fSink.get(), bitmap, stream, log, size, [&](SkCanvas* canvas) -> Error { - SkDeferredCanvas deferred(canvas, SkDeferredCanvas::kEager); - return src.draw(&deferred); - }); -} - -/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/ - Error ViaPipe::draw(const Src& src, SkBitmap* bitmap, SkWStream* stream, SkString* log) const { auto size = src.size(); return draw_to_canvas(fSink.get(), bitmap, stream, log, size, [&](SkCanvas* canvas) -> Error { diff --git a/dm/DMSrcSink.h b/dm/DMSrcSink.h index 26c32f59b7..3f3c8b2892 100644 --- a/dm/DMSrcSink.h +++ b/dm/DMSrcSink.h @@ -483,12 +483,6 @@ public: Error draw(const Src&, SkBitmap*, SkWStream*, SkString*) const override; }; -class ViaDefer : public Via { -public: - explicit ViaDefer(Sink* sink) : Via(sink) {} - Error draw(const Src&, SkBitmap*, SkWStream*, SkString*) const override; -}; - class ViaTiles : public Via { public: ViaTiles(int w, int h, SkBBHFactory*, Sink*); -- cgit v1.2.3