aboutsummaryrefslogtreecommitdiffhomepage
path: root/dm
diff options
context:
space:
mode:
authorGravatar reed <reed@google.com>2016-01-08 06:30:14 -0800
committerGravatar Commit bot <commit-bot@chromium.org>2016-01-08 06:30:14 -0800
commit7c554222ddd03d3817ab197a0bd92badc6f1f7c9 (patch)
tree4eabf4a0e232abd8e83281d343753d0b7c880609 /dm
parent57fa241d6f43557e4243a46f8b5a4ed447ccb8d2 (diff)
remove SkGPipe
Diffstat (limited to 'dm')
-rw-r--r--dm/DM.cpp1
-rw-r--r--dm/DMSrcSink.cpp11
-rw-r--r--dm/DMSrcSink.h7
3 files changed, 0 insertions, 19 deletions
diff --git a/dm/DM.cpp b/dm/DM.cpp
index 2f1cd0bdee..057b7e1926 100644
--- a/dm/DM.cpp
+++ b/dm/DM.cpp
@@ -623,7 +623,6 @@ static Sink* create_sink(const SkCommandLineConfig* config) {
static Sink* create_via(const SkString& tag, Sink* wrapped) {
#define VIA(t, via, ...) if (tag.equals(t)) { return new via(__VA_ARGS__); }
VIA("twice", ViaTwice, wrapped);
- VIA("pipe", ViaPipe, wrapped);
VIA("serialize", ViaSerialization, wrapped);
VIA("2ndpic", ViaSecondPicture, wrapped);
VIA("sp", ViaSingletonPictures, wrapped);
diff --git a/dm/DMSrcSink.cpp b/dm/DMSrcSink.cpp
index 82962ff692..aca86968c9 100644
--- a/dm/DMSrcSink.cpp
+++ b/dm/DMSrcSink.cpp
@@ -6,7 +6,6 @@
*/
#include "DMSrcSink.h"
-#include "SamplePipeControllers.h"
#include "SkAndroidCodec.h"
#include "SkCodec.h"
#include "SkCommonFlags.h"
@@ -1060,16 +1059,6 @@ Error ViaUpright::draw(const Src& src, SkBitmap* bitmap, SkWStream* stream, SkSt
/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-Error ViaPipe::draw(const Src& src, SkBitmap* bitmap, SkWStream* stream, SkString* log) const {
- auto size = src.size();
- return draw_to_canvas(fSink, bitmap, stream, log, size, [&](SkCanvas* canvas) {
- PipeController controller(canvas, &SkImageDecoder::DecodeMemory);
- SkGPipeWriter pipe;
- const uint32_t kFlags = 0;
- return src.draw(pipe.startRecording(&controller, kFlags, size.width(), size.height()));
- });
-}
-
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));
diff --git a/dm/DMSrcSink.h b/dm/DMSrcSink.h
index 5e053b1155..4251808d6d 100644
--- a/dm/DMSrcSink.h
+++ b/dm/DMSrcSink.h
@@ -15,7 +15,6 @@
#include "SkBitmapRegionDecoder.h"
#include "SkCanvas.h"
#include "SkData.h"
-#include "SkGPipe.h"
#include "SkPicture.h"
#include "gm.h"
@@ -316,12 +315,6 @@ private:
const SkMatrix fMatrix;
};
-class ViaPipe : public Via {
-public:
- explicit ViaPipe(Sink* sink) : Via(sink) {}
- Error draw(const Src&, SkBitmap*, SkWStream*, SkString*) const override;
-};
-
class ViaRemote : public Via {
public:
ViaRemote(bool cache, Sink* sink) : Via(sink), fCache(cache) {}