aboutsummaryrefslogtreecommitdiffhomepage
path: root/dm
diff options
context:
space:
mode:
authorGravatar Mike Klein <mtklein@chromium.org>2017-11-27 16:00:46 -0500
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2017-11-27 21:31:26 +0000
commitaa73b96760c280629b9a765be387087d772fe242 (patch)
treeca08fb8fe8f711d07a57a7b7875088cbd0288696 /dm
parent3968ff9acaba9b5d18b052ff4e3a68c37769c6ce (diff)
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 <djsollen@google.com> Commit-Queue: Mike Klein <mtklein@chromium.org>
Diffstat (limited to 'dm')
-rw-r--r--dm/DM.cpp1
-rw-r--r--dm/DMSrcSink.cpp11
-rw-r--r--dm/DMSrcSink.h6
3 files changed, 0 insertions, 18 deletions
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*);