Suggested version with 'undo'.

dm/DMSrcSink.h

Index: dm/DMSrcSink.h
diff --git a/dm/DMSrcSink.h b/dm/DMSrcSink.h
index 4c15c92cb6cc67fbaece5db6c6b08f40eebc7a5d..abf3ef8a2f256fa020d916a37e39be83875cfd7c 100644
--- a/dm/DMSrcSink.h
+++ b/dm/DMSrcSink.h
@@ -163,6 +163,18 @@ private:
     SkAutoTDelete<Sink> fSink;
 };
 
+class ViaUpright : public Sink {
+public:
+    ViaUpright(SkMatrix, Sink*);
+
+    Error draw(const Src&, SkBitmap*, SkWStream*, SkString*) const SK_OVERRIDE;
+    int enclave() const SK_OVERRIDE { return fSink->enclave(); }
+    const char* fileExtension() const SK_OVERRIDE { return fSink->fileExtension(); }
+private:
+    SkMatrix            fMatrix;
+    SkAutoTDelete<Sink> fSink;
+};
+
 class ViaPipe : public Sink {
 public:
     explicit ViaPipe(Sink*);