aboutsummaryrefslogtreecommitdiffhomepage
path: root/dm
diff options
context:
space:
mode:
authorGravatar mtklein <mtklein@chromium.org>2016-03-07 17:20:26 -0800
committerGravatar Commit bot <commit-bot@chromium.org>2016-03-07 17:20:26 -0800
commit46752200009f70d708e37b413a2144b7aaa09ce1 (patch)
tree892a4148914644c80fabe5fc3be502c714a26783 /dm
parent8d988b3a73a75e062bc139f19cc6966888c722e2 (diff)
Archive SkRemote-related code. I want to start fresh.
Diffstat (limited to 'dm')
-rw-r--r--dm/DM.cpp2
-rw-r--r--dm/DMSrcSink.cpp13
-rw-r--r--dm/DMSrcSink.h8
3 files changed, 0 insertions, 23 deletions
diff --git a/dm/DM.cpp b/dm/DM.cpp
index 6830ceeef7..d70914d0fd 100644
--- a/dm/DM.cpp
+++ b/dm/DM.cpp
@@ -775,8 +775,6 @@ static Sink* create_via(const SkString& tag, Sink* wrapped) {
VIA("sp", ViaSingletonPictures, wrapped);
VIA("tiles", ViaTiles, 256, 256, nullptr, wrapped);
VIA("tiles_rt", ViaTiles, 256, 256, new SkRTreeFactory, wrapped);
- VIA("remote", ViaRemote, false, wrapped);
- VIA("remote_cache", ViaRemote, true, wrapped);
VIA("mojo", ViaMojo, wrapped);
if (FLAGS_matrix.count() == 4) {
diff --git a/dm/DMSrcSink.cpp b/dm/DMSrcSink.cpp
index ead02c251e..9e45ce9b69 100644
--- a/dm/DMSrcSink.cpp
+++ b/dm/DMSrcSink.cpp
@@ -24,7 +24,6 @@
#include "SkRandom.h"
#include "SkRecordDraw.h"
#include "SkRecorder.h"
-#include "SkRemote.h"
#include "SkSVGCanvas.h"
#include "SkStream.h"
#include "SkTLogic.h"
@@ -1164,18 +1163,6 @@ Error ViaUpright::draw(const Src& src, SkBitmap* bitmap, SkWStream* stream, SkSt
/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-Error ViaRemote::draw(const Src& src, SkBitmap* bitmap, SkWStream* stream, SkString* log) const {
- return draw_to_canvas(fSink, bitmap, stream, log, src.size(), [&](SkCanvas* target) {
- SkAutoTDelete<SkRemote::Encoder> decoder(SkRemote::NewDecoder(target));
- SkAutoTDelete<SkRemote::Encoder> cache(fCache ? SkRemote::NewCachingEncoder(decoder)
- : nullptr);
- SkAutoTDelete<SkCanvas> canvas(SkRemote::NewCanvas(cache ? cache : decoder));
- return src.draw(canvas);
- });
-}
-
-/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-
Error ViaSerialization::draw(
const Src& src, SkBitmap* bitmap, SkWStream* stream, SkString* log) const {
// Record our Src into a picture.
diff --git a/dm/DMSrcSink.h b/dm/DMSrcSink.h
index bbf47cffd8..638d13824a 100644
--- a/dm/DMSrcSink.h
+++ b/dm/DMSrcSink.h
@@ -310,14 +310,6 @@ private:
const SkMatrix fMatrix;
};
-class ViaRemote : public Via {
-public:
- ViaRemote(bool cache, Sink* sink) : Via(sink), fCache(cache) {}
- Error draw(const Src&, SkBitmap*, SkWStream*, SkString*) const override;
-private:
- bool fCache;
-};
-
class ViaSerialization : public Via {
public:
explicit ViaSerialization(Sink* sink) : Via(sink) {}